diff --git a/charts/hipster/manifests/bindings.yaml b/charts/hipster/manifests/bindings.yaml
index 39196cdd..0991fe78 100644
--- a/charts/hipster/manifests/bindings.yaml
+++ b/charts/hipster/manifests/bindings.yaml
@@ -10,10 +10,19 @@ spec:
   type: bindings.rabbitmq
   version: v1
   metadata:
+  - name: hostname
+    value: prod-rabbitmq.rabbitmq.svc
+  - name: protocol
+    value: amqp
+  - name: username
+    value: user
+  - name: password
+    value:
+     secretKeyRef:
+      name: rabbitmq-secret
+      key:  rabbitmq-password
   - name: queueName
     value: <x>-slurm-job-events
-  - name: host
-    value: amqp://user:bunny@prod-rabbitmq.rabbitmq.svc:6572
   - name: durable
     value: true
   - name: contentType
diff --git a/charts/hipster/manifests/pubsub-rabbitmq.yaml b/charts/hipster/manifests/pubsub-rabbitmq.yaml
index 1564864a..242bb592 100644
--- a/charts/hipster/manifests/pubsub-rabbitmq.yaml
+++ b/charts/hipster/manifests/pubsub-rabbitmq.yaml
@@ -6,8 +6,17 @@ spec:
   type: pubsub.rabbitmq
   version: v1
   metadata:
-  - name: host
-    value: "amqp://user:bunny@prod-rabbitmq.rabbitmq.svc:5672"
+  - name: hostname
+    value: prod-rabbitmq.rabbitmq.svc
+  - name: protocol
+    value: amqp
+  - name: username
+    value: user
+  - name: password
+    value:
+     secretKeyRef:
+      name: rabbitmq-secret
+      key:  rabbitmq-password
   - name: durable
     value: true
   - name: deletedWhenUnused
diff --git a/charts/hipster/manifests/pubsub-redis.yaml b/charts/hipster/manifests/pubsub-redis.yaml
index 6d18d6d9..631bec1e 100644
--- a/charts/hipster/manifests/pubsub-redis.yaml
+++ b/charts/hipster/manifests/pubsub-redis.yaml
@@ -11,7 +11,10 @@ spec:
   - name: redisUsername
     value: default
   - name: redisPassword
-    value: JICkoUKD0Y
+    value:
+     secretKeyRef:
+      name: redis-secret
+      key:  redis-password
   - name: consumerID
     value: oceanbox
 
diff --git a/charts/hipster/manifests/state-redis.yaml b/charts/hipster/manifests/state-redis.yaml
index 09a6b987..5262a327 100644
--- a/charts/hipster/manifests/state-redis.yaml
+++ b/charts/hipster/manifests/state-redis.yaml
@@ -11,6 +11,9 @@ spec:
   - name: redisUsername
     value: default
   - name: redisPassword
-    value: JICkoUKD0Y
+    value:
+     secretKeyRef:
+      name: redis-secret
+      key:  redis-password
   - name: actorStateStore
     value: "true"