diff --git a/templates/deployment-app.yaml b/templates/deployment-app.yaml
index ed22cc3..45353c3 100644
--- a/templates/deployment-app.yaml
+++ b/templates/deployment-app.yaml
@@ -17,11 +17,18 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           ports:
             - containerPort: 80
-          envFrom:
-            - configMapRef:
-                name: {{ include "solidtime.fullname" . }}-env
           env:
             {{- range $key, $value := .Values.env }}
             - name: {{ $key }}
               value: {{ $value | quote }}
-            {{- end }}
\ No newline at end of file
+            {{- end }}
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.secret.existingSecret | default (printf "%s-secret" (include "solidtime.fullname" .)) }}
+                  key: DB_PASSWORD
+            - name: APP_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.secret.existingSecret | default (printf "%s-secret" (include "solidtime.fullname" .)) }}
+                  key: APP_KEY
\ No newline at end of file
diff --git a/templates/deployment-worker.yaml b/templates/deployment-worker.yaml
index 0bf06b6..55acfe9 100644
--- a/templates/deployment-worker.yaml
+++ b/templates/deployment-worker.yaml
@@ -17,17 +17,18 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           # Override the default command to run the queue worker
           command: ["php", "/var/www/html/artisan", "queue:work"]
-          envFrom:
-            - configMapRef:
-                name: {{ include "solidtime.fullname" . }}-env
           env:
+            {{- range $key, $value := .Values.env }}
+            - name: {{ $key }}
+              value: {{ $value | quote }}
+            {{- end }}
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "solidtime.fullname" . }}-secret
+                  name: {{ .Values.secret.existingSecret | default (printf "%s-secret" (include "solidtime.fullname" .)) }}
                   key: DB_PASSWORD
             - name: APP_KEY
               valueFrom:
                 secretKeyRef:
-                  name: {{ include "solidtime.fullname" . }}-secret
+                  name: {{ .Values.secret.existingSecret | default (printf "%s-secret" (include "solidtime.fullname" .)) }}
                   key: APP_KEY
\ No newline at end of file