diff --git a/7project/charts/myapp-chart/templates/app-deployment.yaml b/7project/charts/myapp-chart/templates/app-deployment.yaml
index d804e08..3bb5288 100644
--- a/7project/charts/myapp-chart/templates/app-deployment.yaml
+++ b/7project/charts/myapp-chart/templates/app-deployment.yaml
@@ -40,11 +40,16 @@ spec:
             - name: RABBITMQ_USERNAME
               value: {{ .Values.rabbitmq.username | quote }}
             - name: RABBITMQ_PASSWORD
-              value: {{ required "Set .Values.rabbitmq.password" .Values.rabbitmq.password | quote }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
+                  key: password
             - name: RABBITMQ_HOST
               value: {{ .Values.rabbitmq.host | quote }}
             - name: RABBITMQ_PORT
               value: {{ .Values.rabbitmq.port | quote }}
+            - name: RABBITMQ_VHOST
+              value: {{ .Values.rabbitmq.vhost | default "/" | quote }}
             - name: MAIL_QUEUE
               value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }}
           livenessProbe:
diff --git a/7project/charts/myapp-chart/templates/worker-deployment.yaml b/7project/charts/myapp-chart/templates/worker-deployment.yaml
index c366575..cb01f9d 100644
--- a/7project/charts/myapp-chart/templates/worker-deployment.yaml
+++ b/7project/charts/myapp-chart/templates/worker-deployment.yaml
@@ -34,10 +34,15 @@ spec:
             - name: RABBITMQ_USERNAME
               value: {{ .Values.rabbitmq.username | quote }}
             - name: RABBITMQ_PASSWORD
-              value: {{ required "Set .Values.rabbitmq.password" .Values.rabbitmq.password | quote }}
+              valueFrom:
+                secretKeyRef:
+                  name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
+                  key: password
             - name: RABBITMQ_HOST
               value: {{ .Values.rabbitmq.host | quote }}
             - name: RABBITMQ_PORT
               value: {{ .Values.rabbitmq.port | quote }}
+            - name: RABBITMQ_VHOST
+              value: {{ .Values.rabbitmq.vhost | default "/" | quote }}
             - name: MAIL_QUEUE
               value: {{ .Values.worker.mailQueueName | default "mail_queue" | quote }}