diff --git a/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml b/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml
index e2d255e3c..ad17582eb 100644
--- a/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml
+++ b/kubernetes/apps/database/crunchy-postgres-operator/cluster/cluster.yaml
@@ -156,13 +156,14 @@ spec:
             differential: 0 1 * * 1-6 # Mon-Sat at 01:00
             incremental: 0 2-23 * * * # Every hour except 01:00
 
-  dataSource:
-    postgresCluster:
-      clusterName: postgres
-      repoName: repo1
-      options:
-      - --type=time
-      - --target="2025-04-03 14:00:00"
+  # dataSource:
+  #   pgbackrest:
+  #     stanza: "db"
+  #     configuration: *backupConfig
+  #     global: *backupFlag
+  #     repo:
+  #       name: "repo1"
+  #       s3: *minio
 
   monitoring:
     pgmonitor:
diff --git a/kubernetes/apps/default/jellyseerr/app/externalsecret.yaml b/kubernetes/apps/default/jellyseerr/app/externalsecret.yaml
index 866745245..5d724c443 100644
--- a/kubernetes/apps/default/jellyseerr/app/externalsecret.yaml
+++ b/kubernetes/apps/default/jellyseerr/app/externalsecret.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: onepassword
+    name: onepassword-connect
   target:
     name: jellyseerr-secret
     template:
diff --git a/kubernetes/apps/default/lidarr/app/helmrelease.yaml b/kubernetes/apps/default/lidarr/app/helmrelease.yaml
index f912a4c5c..5bea6fdf9 100644
--- a/kubernetes/apps/default/lidarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lidarr/app/helmrelease.yaml
@@ -46,6 +46,8 @@ spec:
             envFrom:
               - secretRef:
                   name: lidarr-secret
+              - secretRef:
+                  name: lidarr-db-secret
             resources:
               requests:
                 cpu: 10m
diff --git a/kubernetes/apps/flux-system/alerts/github-status/externalsecret.yaml b/kubernetes/apps/flux-system/alerts/github-status/externalsecret.yaml
index 9555c84a2..eb3ee501d 100644
--- a/kubernetes/apps/flux-system/alerts/github-status/externalsecret.yaml
+++ b/kubernetes/apps/flux-system/alerts/github-status/externalsecret.yaml
@@ -8,12 +8,12 @@ metadata:
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: onepassword
+    name: onepassword-connect
   target:
     name: github-status-token-secret
     template:
       data:
-        token: "{{ .FLUX_GITHUB_TOKEN }}"
+        token: "{{ .GITHUB_NOTIFICATION_TOKEN }}"
   dataFrom:
     - extract:
         key: flux
diff --git a/kubernetes/apps/flux-system/flux-instance/app/externalsecret.yaml b/kubernetes/apps/flux-system/flux-instance/app/externalsecret.yaml
index cba0aed65..fc33fcd58 100644
--- a/kubernetes/apps/flux-system/flux-instance/app/externalsecret.yaml
+++ b/kubernetes/apps/flux-system/flux-instance/app/externalsecret.yaml
@@ -7,12 +7,12 @@ metadata:
 spec:
   secretStoreRef:
     kind: ClusterSecretStore
-    name: onepassword
+    name: onepassword-connect
   target:
     name: github-webhook-token-secret
     template:
       data:
-        token: "{{ .FLUX_GITHUB_WEBHOOK_TOKEN }}"
+        token: "{{ .GITHUB_SYNC_WEBHOOK_TOKEN }}"
   dataFrom:
     - extract:
         key: flux