diff --git a/charts/lunarfront/templates/deployment.yaml b/charts/lunarfront/templates/deployment.yaml
index 3d69abb..b53bde7 100644
--- a/charts/lunarfront/templates/deployment.yaml
+++ b/charts/lunarfront/templates/deployment.yaml
@@ -28,18 +28,92 @@ spec:
             - name: DATABASE_URL
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.database.secretName }}
-                  key: url
+                  name: lunarfront-secrets
+                  key: database-url
             - name: REDIS_URL
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.redis.secretName }}
-                  key: url
+                  name: lunarfront-secrets
+                  key: redis-url
+            - name: REDIS_KEY_PREFIX
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: redis-key-prefix
             - name: JWT_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: {{ .Values.auth.secretName }}
-                  key: secret
+                  name: lunarfront-secrets
+                  key: jwt-secret
+            - name: SPACES_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: spaces-key
+            - name: SPACES_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: spaces-secret
+            - name: SPACES_BUCKET
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: spaces-bucket
+            - name: SPACES_ENDPOINT
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: spaces-endpoint
+            - name: SPACES_PREFIX
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: spaces-prefix
+            - name: ENCRYPTION_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: encryption-key
+            - name: RESEND_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: resend-api-key
+            - name: MAIL_FROM
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: mail-from
+            - name: BUSINESS_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: business-name
+            - name: INITIAL_USER_EMAIL
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: initial-user-email
+                  optional: true
+            - name: INITIAL_USER_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: initial-user-password
+                  optional: true
+            - name: INITIAL_USER_FIRST_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: initial-user-first-name
+                  optional: true
+            - name: INITIAL_USER_LAST_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: lunarfront-secrets
+                  key: initial-user-last-name
+                  optional: true
           resources:
             {{- toYaml .Values.resources.backend | nindent 12 }}
           livenessProbe:
diff --git a/manager/deployment.yaml b/manager/deployment.yaml
index 0c85ab0..413fff7 100644
--- a/manager/deployment.yaml
+++ b/manager/deployment.yaml
@@ -81,6 +81,11 @@ spec:
                 secretKeyRef:
                   name: manager-secrets
                   key: cf-zone-id
+            - name: RESEND_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: manager-secrets
+                  key: resend-api-key
           resources:
             requests:
               cpu: 50m