diff --git a/argocd/manifests/immich/values.yaml b/argocd/manifests/immich/values.yaml
index 90ae4fb..3c09cfe 100644
--- a/argocd/manifests/immich/values.yaml
+++ b/argocd/manifests/immich/values.yaml
@@ -10,20 +10,25 @@
 image:
   tag: v1.125.7
 
-# Environment variables for all components
+# Shared environment variables for all controllers
 env:
   TZ: "America/Los_Angeles"
-  # Database connection - uses immich-pg cluster
-  DB_HOSTNAME: "immich-pg-rw.databases.svc.cluster.local"
-  DB_PORT: "5432"
-  DB_DATABASE_NAME: "immich"
-  DB_USERNAME: "immich"
-  # Password injected from secret
-  DB_PASSWORD:
-    valueFrom:
-      secretKeyRef:
-        name: immich-db
-        key: password
+
+# Database connection settings - applied to server and microservices
+controllers:
+  main:
+    containers:
+      main:
+        env:
+          DB_HOSTNAME: "immich-pg-rw.databases.svc.cluster.local"
+          DB_PORT: "5432"
+          DB_DATABASE_NAME: "immich"
+          DB_USERNAME: "immich"
+          DB_PASSWORD:
+            valueFrom:
+              secretKeyRef:
+                name: immich-db
+                key: password
 
 # Immich server configuration
 immich: