diff --git a/apps/fireflyiii/db/firefly-db.yaml b/apps/fireflyiii/db/firefly-db.yaml
deleted file mode 100644
index 83975bb..0000000
--- a/apps/fireflyiii/db/firefly-db.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: firefly-db
-  namespace: firefly
-spec:
-  instances: 3
-
-  storage:
-    size: 10Gi
-
-  bootstrap:
-    initdb:
-      database: firefly
-      owner: firefly
-      secret:
-        name: firefly-secrets
diff --git a/apps/fireflyiii/db/fireflysecrets.yaml b/apps/fireflyiii/db/fireflysecrets.yaml
index d7a6eb1..7859d17 100644
--- a/apps/fireflyiii/db/fireflysecrets.yaml
+++ b/apps/fireflyiii/db/fireflysecrets.yaml
@@ -16,7 +16,7 @@ spec:
       engineVersion: v2
       mergePolicy: Merge
       data:
-        username: firefly
+        username: '{{ index . "firefly-db-username" }}'
         DB_PASSWORD: '{{ index . "firefly-db-password" }}'
         APP_KEY: '{{ index . "firefly-app-key" }}'
         STATIC_CRON_TOKEN: '{{ index . "firefly-cron-token" }}'
@@ -34,3 +34,6 @@ spec:
     - secretKey: gmail-app-password
       remoteRef:
         key: gmail-app-password
+    - secretKey: firefly-db-username
+      remoteRef:
+        key: firefly-db-username
diff --git a/apps/fireflyiii/deployment.yaml b/apps/fireflyiii/deployment.yaml
index 2bebde3..26f0a04 100644
--- a/apps/fireflyiii/deployment.yaml
+++ b/apps/fireflyiii/deployment.yaml
@@ -42,8 +42,8 @@ spec:
           persistentVolumeClaim:
             claimName: firefly-data
 
-envFrom:
-  - configMapRef:
-      name: firefly-config
-  - secretRef:
-      name: firefly-secrets
+#envFrom:
+#  - configMapRef:
+#      name: firefly-config
+#  - secretRef:
+#      name: firefly-secrets
diff --git a/infrastructure/modules/postgres-app/job.yaml b/infrastructure/modules/postgres-app/job.yaml
index d114f24..f27ae36 100644
--- a/infrastructure/modules/postgres-app/job.yaml
+++ b/infrastructure/modules/postgres-app/job.yaml
@@ -17,7 +17,7 @@ spec:
         - name: PGPASSWORD
           valueFrom:
             secretKeyRef:
-              name: pg-superuser-secret
+              name: pg-cluster-root-password
               key: password
 
         - name: APP_DB