diff --git a/apps/fireflyiii/firefly-cm.yaml b/apps/fireflyiii/configmap.yaml
similarity index 100%
rename from apps/fireflyiii/firefly-cm.yaml
rename to apps/fireflyiii/configmap.yaml
diff --git a/apps/fireflyiii/firefly-app.yaml b/apps/fireflyiii/deployment.yaml
similarity index 74%
rename from apps/fireflyiii/firefly-app.yaml
rename to apps/fireflyiii/deployment.yaml
index 98107e6..e589adc 100644
--- a/apps/fireflyiii/firefly-app.yaml
+++ b/apps/fireflyiii/deployment.yaml
@@ -42,28 +42,3 @@ spec:
         - name: firefly-data
           persistentVolumeClaim:
             claimName: firefly-data
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: firefly-data
-  namespace: firefly
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: ceph-rbd
-  resources:
-    requests:
-      storage: 5Gi
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: firefly
-  namespace: firefly
-spec:
-  ports:
-    - port: 80
-      targetPort: 8080
-  selector:
-    app: firefly
diff --git a/apps/fireflyiii/firefly-app.yaml.old b/apps/fireflyiii/firefly-app.yaml.old
deleted file mode 100644
index 573b3bb..0000000
--- a/apps/fireflyiii/firefly-app.yaml.old
+++ /dev/null
@@ -1,83 +0,0 @@
-***REMOVED***
-***REMOVED***
-***REMOVED***
-  name: firefly-secret
-  namespace: firefly
-***REMOVED***
-***REMOVED***
-  APP_KEY: RIJCNjIgmM+46tFaOznt00MadL0O0SrJnp1MzPPz/lo=
----
-apiVersion: apps/v1
-kind: Deployment
-***REMOVED***
-  name: firefly
-  namespace: firefly
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: firefly
-  template:
-    ***REMOVED***
-      labels:
-        app: firefly
-    spec:
-      containers:
-        - name: firefly
-          image: fireflyiii/core:latest
-          ports:
-            - containerPort: 8080
-          env:
-            - name: DB_CONNECTION
-              value: pgsql
-            - name: DB_HOST
-              value: postgres
-            - name: DB_PORT
-              value: "5432"
-            - name: DB_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: POSTGRES_DB
-            - name: DB_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: POSTGRES_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: POSTGRES_PASSWORD
-          volumeMounts:
-            - name: firefly-data
-              mountPath: /var/www/html/storage
-      volumes:
-        - name: firefly-data
-          persistentVolumeClaim:
-            claimName: firefly-data
----
-***REMOVED***
-kind: PersistentVolumeClaim
-***REMOVED***
-  name: firefly-data
-  namespace: firefly
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: ceph-rbd
-  resources:
-    requests:
-      storage: 5Gi
----
-***REMOVED***
-kind: Service
-***REMOVED***
-  name: firefly
-  namespace: firefly
-spec:
-  ports:
-    - port: 80
-      targetPort: 8080
-  selector:
-    app: firefly
diff --git a/apps/fireflyiii/firefly-app.yaml.old.new b/apps/fireflyiii/firefly-app.yaml.old.new
deleted file mode 100644
index fa09de7..0000000
--- a/apps/fireflyiii/firefly-app.yaml.old.new
+++ /dev/null
@@ -1,100 +0,0 @@
-***REMOVED***
-***REMOVED***
-***REMOVED***
-  name: firefly-secret
-  namespace: firefly
-***REMOVED***
-***REMOVED***
-  APP_KEY: mGZYm25jttwFptoskC+qcprTY23iHArM
----
-apiVersion: apps/v1
-kind: Deployment
-***REMOVED***
-  name: firefly
-  namespace: firefly
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: firefly
-  template:
-    ***REMOVED***
-      labels:
-        app: firefly
-    spec:
-      # InitContainer to fix permissions on the storage directory
-      initContainers:
-        - name: init-storage
-          image: busybox
-          command:
-            - sh
-            - -c
-            - |
-              mkdir -p /var/www/html/storage && chown -R 33:33 /var/www/html/storage
-          volumeMounts:
-            - name: firefly-data
-              mountPath: /var/www/html/storage
-      containers:
-        - name: firefly
-          image: fireflyiii/core:latest
-          ports:
-            - containerPort: 8080
-          env:
-            - name: DB_CONNECTION
-              value: pgsql
-            - name: DB_HOST
-              value: postgres
-            - name: DB_PORT
-              value: "5432"
-            - name: DB_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: POSTGRES_DB
-            - name: DB_USERNAME
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: POSTGRES_USER
-            - name: DB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: postgres-secret
-                  key: POSTGRES_PASSWORD
-            - name: APP_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: firefly-secret
-                  key: APP_KEY
-          volumeMounts:
-            - name: firefly-data
-              mountPath: /var/www/html/storage
-      volumes:
-        - name: firefly-data
-          persistentVolumeClaim:
-            claimName: firefly-data
----
-***REMOVED***
-kind: PersistentVolumeClaim
-***REMOVED***
-  name: firefly-data
-  namespace: firefly
-spec:
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: ceph-rbd
-  resources:
-    requests:
-      storage: 5Gi
----
-***REMOVED***
-kind: Service
-***REMOVED***
-  name: firefly
-  namespace: firefly
-spec:
-  ports:
-    - port: 80
-      targetPort: 8080
-  selector:
-    app: firefly
diff --git a/apps/fireflyiii/firefly-ingress.yaml b/apps/fireflyiii/ingress.yaml
similarity index 100%
rename from apps/fireflyiii/firefly-ingress.yaml
rename to apps/fireflyiii/ingress.yaml
diff --git a/apps/fireflyiii/kustomization.yaml b/apps/fireflyiii/kustomization.yaml
index ce0e0d7..5cbb86e 100644
--- a/apps/fireflyiii/kustomization.yaml
+++ b/apps/fireflyiii/kustomization.yaml
@@ -1,9 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- firefly-ingress.yaml
-- firefly-app.yaml
-- firefly-secret.yaml
-- firefly-postgres.yaml
-- firefly-namespace.yaml
-- firefly-cm.yaml
+- ingress.yaml
+- deployment.yaml
+- secret.yaml
+- postgres.yaml
+- namespace.yaml
+- configmap.yaml
+- pvc.yaml
+- service.yaml
diff --git a/apps/fireflyiii/firefly-namespace.yaml b/apps/fireflyiii/namespace.yaml
similarity index 67%
rename from apps/fireflyiii/firefly-namespace.yaml
rename to apps/fireflyiii/namespace.yaml
index 78817b9..c9610a3 100644
--- a/apps/fireflyiii/firefly-namespace.yaml
+++ b/apps/fireflyiii/namespace.yaml
@@ -2,3 +2,5 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: firefly
+  labels:
+    backup: true
diff --git a/apps/fireflyiii/pvc.yaml b/apps/fireflyiii/pvc.yaml
new file mode 100644
index 0000000..f586587
--- /dev/null
+++ b/apps/fireflyiii/pvc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: firefly-data
+  namespace: firefly
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: ceph-rbd
+  resources:
+    requests:
+      storage: 5Gi
diff --git a/apps/fireflyiii/service.yaml b/apps/fireflyiii/service.yaml
new file mode 100644
index 0000000..023a017
--- /dev/null
+++ b/apps/fireflyiii/service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: firefly
+  namespace: firefly
+spec:
+  ports:
+    - port: 80
+      targetPort: 8080
+  selector:
+    app: firefly