diff --git a/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml b/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml
index 27c5a34..3533e1d 100644
--- a/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml
+++ b/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml
@@ -25,10 +25,17 @@ spec:
         - name: taiga-async-rabbitmq-data
           mountPath: /var/lib/rabbitmq
           readOnly: false
-        envFrom:
-        - secretRef:
-            name: taiga-rabbitmq-secret
         env:
+        - name: RABBITMQ_DEFAULT_USER
+          valueFrom:
+            secretKeyRef:
+              name: taiga-rabbitmq-secret
+              key: RABBITMQ_DEFAULT_USER
+        - name: RABBITMQ_DEFAULT_PASS
+          valueFrom:
+            secretKeyRef:
+              name: taiga-rabbitmq-secret
+              key: RABBITMQ_DEFAULT_PASS
         - name: RABBITMQ_ERLANG_COOKIE
           value: ERLANG_COOKIE_VALUE
         - name: RABBITMQ_DEFAULT_VHOST
diff --git a/src/main/resources/taiga/taiga-events-deployment.yaml b/src/main/resources/taiga/taiga-events-deployment.yaml
index 5a67f3c..4a486e0 100644
--- a/src/main/resources/taiga/taiga-events-deployment.yaml
+++ b/src/main/resources/taiga/taiga-events-deployment.yaml
@@ -24,7 +24,20 @@ spec:
         envFrom: # ToDo: check if all vars are needed
         - configMapRef:
           name: taiga-configmap
-        - secretRef:
-          name: taiga-secret
-        - secretRef:
-          name: taiga-rabbitmq-secret
+        env:
+        - name: RABBITMQ_USER
+          valueFrom:
+            secretKeyRef:
+              name: taiga-secret
+              key: RABBITMQ_USER
+        - name: RABBITMQ_PASS
+          valueFrom:
+            secretKeyRef:
+              name: taiga-secret
+              key: RABBITMQ_PASS
+        - name: SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              name: taiga-secret
+              key: TAIGA_SECRET_KEY
+
diff --git a/src/main/resources/taiga/taiga-events-rabbitmq-deployment.yaml b/src/main/resources/taiga/taiga-events-rabbitmq-deployment.yaml
index b855c35..d620633 100644
--- a/src/main/resources/taiga/taiga-events-rabbitmq-deployment.yaml
+++ b/src/main/resources/taiga/taiga-events-rabbitmq-deployment.yaml
@@ -25,14 +25,21 @@ spec:
         - name: taiga-events-rabbitmq-data
           mountPath: /var/lib/rabbitmq
           readOnly: false
-        envFrom:
-        - secretRef: # ToDo secret key ref
-          name: taiga-rabbitmq-secret
         env:
         - name: RABBITMQ_ERLANG_COOKIE
           value: ERLANG_COOKIE_VALUE
         - name: RABBITMQ_DEFAULT_VHOST
           value: RABBITMQ_VHOST
+        - name: RABBITMQ_USER
+          valueFrom:
+            secretKeyRef:
+              name: taiga-secret
+              key: RABBITMQ_USER
+        - name: RABBITMQ_PASS
+          valueFrom:
+            secretKeyRef:
+              name: taiga-secret
+              key: RABBITMQ_PASS
       
       volumes:
         - name: taiga-events-rabbitmq-data
diff --git a/src/main/resources/taiga/taiga-protected-deployment.yaml b/src/main/resources/taiga/taiga-protected-deployment.yaml
index 6574290..a0cf74f 100644
--- a/src/main/resources/taiga/taiga-protected-deployment.yaml
+++ b/src/main/resources/taiga/taiga-protected-deployment.yaml
@@ -21,9 +21,11 @@ spec:
         ports:
         - name: http
           containerPort: 8003
-        envFrom: # ToDo secret key ref - secret_key
-        - secretRef:
-          name: taiga-secret
         env:
         - name: MAX_AGE
           value: ATTACHMENTS_MAX_AGE
+        - name: SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              name: taiga-secret
+              key: TAIGA_SECRET_KEY