diff --git a/7project/charts/myapp-chart/templates/app-deployment.yaml b/7project/charts/myapp-chart/templates/app-deployment.yaml
index 1eeb7df..3a516f3 100644
--- a/7project/charts/myapp-chart/templates/app-deployment.yaml
+++ b/7project/charts/myapp-chart/templates/app-deployment.yaml
@@ -29,21 +29,27 @@ spec:
             - name: MARIADB_PORT
               value: '3306'
             - name: MARIADB_DB
-              value: {{ required "Set .Values.deployment" .Values.deployment | quote }}
+              valueFrom:
+                secretKeyRef:
+                  name: prod
+                  key: MARIADB_DB
             - name: MARIADB_USER
-              value: {{ required "Set .Values.deployment" .Values.deployment | quote }}
+              valueFrom:
+                secretKeyRef:
+                  name: prod
+                  key: MARIADB_USER
             - name: MARIADB_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ required "Set .Values.database.secretName" .Values.database.secretName }}
-                  key: password
+                  name: prod
+                  key: MARIADB_PASSWORD
             - name: RABBITMQ_USERNAME
               value: {{ .Values.rabbitmq.username | quote }}
             - name: RABBITMQ_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
-                  key: password
+                  name: prod
+                  key: RABBITMQ_PASSWORD
             - name: RABBITMQ_HOST
               value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
             - name: RABBITMQ_PORT
diff --git a/7project/charts/myapp-chart/templates/prod.yaml b/7project/charts/myapp-chart/templates/prod.yaml
index 43147b0..7ebf596 100644
--- a/7project/charts/myapp-chart/templates/prod.yaml
+++ b/7project/charts/myapp-chart/templates/prod.yaml
@@ -7,4 +7,11 @@ stringData:
   MOJEID_CLIENT_ID: {{ .Values.oauth.mojeid.clientId | quote }}
   MOJEID_CLIENT_SECRET: {{ .Values.oauth.mojeid.clientSecret | quote }}
   BANKID_CLIENT_ID: {{ .Values.oauth.bankid.clientId | quote }}
-  BANKID_CLIENT_SECRET: {{ .Values.oauth.bankid.clientSecret | quote }}
\ No newline at end of file
+  BANKID_CLIENT_SECRET: {{ .Values.oauth.bankid.clientSecret | quote }}
+  # Database credentials
+  MARIADB_DB: {{ .Values.database.name | default "app_db" | quote }}
+  MARIADB_USER: {{ .Values.database.user | default "app_user" | quote }}
+  MARIADB_PASSWORD: {{ .Values.database.password | default "" | quote }}
+  # RabbitMQ credentials
+  RABBITMQ_PASSWORD: {{ .Values.rabbitmq.password | default "" | quote }}
+  RABBITMQ_USERNAME: {{ .Values.rabbitmq.username | quote }}
diff --git a/7project/charts/myapp-chart/templates/worker-deployment.yaml b/7project/charts/myapp-chart/templates/worker-deployment.yaml
index e4457fe..501c6fa 100644
--- a/7project/charts/myapp-chart/templates/worker-deployment.yaml
+++ b/7project/charts/myapp-chart/templates/worker-deployment.yaml
@@ -31,13 +31,32 @@ spec:
             - --loglevel
             - INFO
           env:
+            - name: MARIADB_HOST
+              value: "mariadb-repl-maxscale-internal.mariadb-operator.svc.cluster.local"
+            - name: MARIADB_PORT
+              value: '3306'
+            - name: MARIADB_DB
+              valueFrom:
+                secretKeyRef:
+                  name: prod
+                  key: MARIADB_DB
+            - name: MARIADB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: prod
+                  key: MARIADB_USER
+            - name: MARIADB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: prod
+                  key: MARIADB_PASSWORD
             - name: RABBITMQ_USERNAME
               value: {{ .Values.rabbitmq.username | quote }}
             - name: RABBITMQ_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
-                  key: password
+                  name: prod
+                  key: RABBITMQ_PASSWORD
             - name: RABBITMQ_HOST
               value: {{ printf "%s.%s.svc.cluster.local" "rabbitmq-cluster" .Release.Namespace | quote }}
             - name: RABBITMQ_PORT