diff --git a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml
index aca09999f..2a2f4cafc 100644
--- a/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml
+++ b/kubernetes/apps/flux-system/weave-gitops/app/helmrelease.yaml
@@ -46,6 +46,6 @@ spec:
             - *host
   valuesFrom:
     - kind: Secret
-      name: weave-gitops
+      name: weave-gitops-secret
       valuesKey: adminPassword
       targetPath: adminUser.passwordHash
diff --git a/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml b/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml
index a0e33d1d5..62a3bf64f 100644
--- a/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml
+++ b/kubernetes/apps/monitoring/gatus/app/externalsecret.yaml
@@ -3,28 +3,30 @@
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-    name: gatus
-    namespace: monitoring
+  name: gatus
+  namespace: monitoring
 spec:
-    secretStoreRef:
-        kind: ClusterSecretStore
-        name: onepassword-connect
-    target:
-        name: gatus-secret
-        creationPolicy: Owner
-        template:
-            data:
-                # App
-                CUSTOM_PUSHOVER_APP_TOKEN: '{{ .PUSHOVER_API_TOKEN }}'
-                CUSTOM_PUSHOVER_USER_KEY: '{{ .PUSHOVER_USER_KEY }}'
-                # Postgres Init
-                INIT_POSTGRES_DBNAME: gatus
-                INIT_POSTGRES_HOST: postgres-rw.default.svc.cluster.local
-                INIT_POSTGRES_USER: '{{ .POSTGRES_USER }}'
-                INIT_POSTGRES_PASS: '{{ .POSTGRES_PASS }}'
-                INIT_POSTGRES_SUPER_PASS: '{{ .POSTGRES_SUPER_PASS }}'
-    dataFrom:
-        - extract:
-            key: pushover
-        - extract:
-            key: gatus
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: onepassword-connect
+  target:
+    name: gatus-secret
+    creationPolicy: Owner
+    template:
+      data:
+        # App
+        CUSTOM_PUSHOVER_APP_TOKEN: '{{ .PUSHOVER_API_TOKEN }}'
+        CUSTOM_PUSHOVER_USER_KEY: '{{ .PUSHOVER_USER_KEY }}'
+        # Postgres Init
+        INIT_POSTGRES_DBNAME: gatus
+        INIT_POSTGRES_HOST: postgres-rw.default.svc.cluster.local
+        INIT_POSTGRES_USER: '{{ .POSTGRES_USER }}'
+        INIT_POSTGRES_PASS: '{{ .POSTGRES_PASS }}'
+        INIT_POSTGRES_SUPER_PASS: '{{ .POSTGRES_SUPER_PASS }}'
+  dataFrom:
+    - extract:
+        key: cloudnative-pg
+    - extract:
+        key: pushover
+    - extract:
+        key: gatus