diff --git a/applications/infisical/Infisical-secrets/zipline-infisicalsecret.yaml b/applications/infisical/Infisical-secrets/zipline-infisicalsecret.yaml
index 4d5022d..c801819 100644
--- a/applications/infisical/Infisical-secrets/zipline-infisicalsecret.yaml
+++ b/applications/infisical/Infisical-secrets/zipline-infisicalsecret.yaml
@@ -8,7 +8,7 @@ spec:
   resyncInterval: 30
   authentication:
     kubernetesAuth:
-      identityId: "9f65814e-bf4c-42fc-b382-26be15b11416"
+      identityId: "5458def7-7c63-40d2-95da-41c614d0933a"
       serviceAccountRef:
         name: infisical-auth
         namespace: infisical
@@ -17,7 +17,9 @@ spec:
         projectSlug: "kubernetes"
         envSlug: "prod"
         secretsPath: "/zipline"
-        recursive: true
+        # Root only: /zipline holds the SMB mount credentials (username, password)
+        # consumed by zipline-uploads-pv. Per-container env lives in subfolders.
+        recursive: false
   managedSecretReference:
     secretName: zipline-secrets
     secretNamespace: zipline
diff --git a/applications/zipline/postgres/infisicalsecret.yaml b/applications/zipline/postgres/infisicalsecret.yaml
new file mode 100644
index 0000000..88e681b
--- /dev/null
+++ b/applications/zipline/postgres/infisicalsecret.yaml
@@ -0,0 +1,25 @@
+apiVersion: secrets.infisical.com/v1alpha1
+kind: InfisicalSecret
+metadata:
+  name: zipline-postgres-secrets
+  namespace: infisical
+spec:
+  hostAPI: https://infisical.jsme.be
+  resyncInterval: 30
+  authentication:
+    kubernetesAuth:
+      identityId: "5458def7-7c63-40d2-95da-41c614d0933a"
+      serviceAccountRef:
+        name: infisical-auth
+        namespace: infisical
+      autoCreateServiceAccountToken: true
+      secretsScope:
+        projectSlug: "kubernetes"
+        envSlug: "prod"
+        secretsPath: "/zipline/postgres"
+        # Non-recursive: keys are already named as the container expects.
+        recursive: false
+  managedSecretReference:
+    secretName: zipline-postgres-secrets
+    secretNamespace: zipline
+    secretType: Opaque
diff --git a/applications/zipline/postgres/zipline-postgres-statefulset.yaml b/applications/zipline/postgres/zipline-postgres-statefulset.yaml
index 870bb12..477de29 100644
--- a/applications/zipline/postgres/zipline-postgres-statefulset.yaml
+++ b/applications/zipline/postgres/zipline-postgres-statefulset.yaml
@@ -31,22 +31,10 @@ spec:
           volumeMounts:
             - name: zipline-postgresql-database
               mountPath: /var/lib/postgres
+          envFrom:
+            - secretRef:
+                name: zipline-postgres-secrets
           env:
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: zipline-secrets
-                  key: db_password
-            - name: POSTGRES_USER
-              valueFrom:
-                secretKeyRef:
-                  name: zipline-secrets
-                  key: db_user
-            - name: POSTGRES_DB
-              valueFrom:
-                secretKeyRef:
-                  name: zipline-secrets
-                  key: db_name
             - name: PGDATA
               value: /var/lib/postgres/data
       volumes:
diff --git a/applications/zipline/zipline/infisicalsecret.yaml b/applications/zipline/zipline/infisicalsecret.yaml
new file mode 100644
index 0000000..230f73a
--- /dev/null
+++ b/applications/zipline/zipline/infisicalsecret.yaml
@@ -0,0 +1,25 @@
+apiVersion: secrets.infisical.com/v1alpha1
+kind: InfisicalSecret
+metadata:
+  name: zipline-app-secrets
+  namespace: infisical
+spec:
+  hostAPI: https://infisical.jsme.be
+  resyncInterval: 30
+  authentication:
+    kubernetesAuth:
+      identityId: "5458def7-7c63-40d2-95da-41c614d0933a"
+      serviceAccountRef:
+        name: infisical-auth
+        namespace: infisical
+      autoCreateServiceAccountToken: true
+      secretsScope:
+        projectSlug: "kubernetes"
+        envSlug: "prod"
+        secretsPath: "/zipline/zipline"
+        # Non-recursive: keys are already named as the container expects.
+        recursive: false
+  managedSecretReference:
+    secretName: zipline-app-secrets
+    secretNamespace: zipline
+    secretType: Opaque
diff --git a/applications/zipline/zipline/zipline-statefulset.yaml b/applications/zipline/zipline/zipline-statefulset.yaml
index 0148447..88f261d 100644
--- a/applications/zipline/zipline/zipline-statefulset.yaml
+++ b/applications/zipline/zipline/zipline-statefulset.yaml
@@ -35,17 +35,10 @@ spec:
               mountPath: /zipline/public
             - name: themes
               mountPath: /zipline/themes
+          envFrom:
+            - secretRef:
+                name: zipline-app-secrets
           env:
-            - name: DATABASE_URL
-              valueFrom:
-                secretKeyRef:
-                  name: zipline-secrets
-                  key: database_url
-            - name: CORE_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: zipline-secrets
-                  key: core_secret
             - name: CORE_TRUSTED_PROXIES
               value: "10.42.0.0/16"
       restartPolicy: Always