diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml
index 50779d5d12..7efa992333 100644
--- a/playbooks/openshift-apps/messaging-bridges.yml
+++ b/playbooks/openshift-apps/messaging-bridges.yml
@@ -26,7 +26,7 @@
       exchange_type: topic
       vhost: /pubsub
       login_user: admin
-      login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password, rabbitmq_admin_password_staging) }}"
+      login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
     with_items:
     - amq.topic
     - zmq.topic
@@ -37,7 +37,7 @@
       name: amqp_to_zmq
       vhost: /pubsub
       login_user: admin
-      login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password, rabbitmq_admin_password_staging) }}"
+      login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
     tags:
     - config
   - name: Create the RabbitMQ queue for verify-missing
@@ -48,7 +48,7 @@
       auto_delete: False
       message_ttl: 60000
       login_user: admin
-      login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password, rabbitmq_admin_password_staging) }}"
+      login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
     tags:
     - config
   # Do this manually until an Ansible bugfix is deployed
@@ -60,7 +60,7 @@
   #    destination_type: queue
   #    vhost: /pubsub
   #    login_user: admin
-  #    login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password, rabbitmq_admin_password_staging) }}"
+  #    login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
   #  tags:
   #  - config
   #- name: Create the verify-missing bindings
@@ -70,7 +70,7 @@
   #    destination_type: queue
   #    vhost: /pubsub
   #    login_user: admin
-  #    login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password, rabbitmq_admin_password_staging) }}"
+  #    login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
   #  with_items:
   #  - amq.topic
   #  - zmq.topic
diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 80f28d1d2d..59d8a50d0c 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -65,6 +65,8 @@
   copy: content="{{rabbitmq_cluster_cookie_staging}}" dest=/var/lib/rabbitmq/.erlang.cookie
         owner=rabbitmq group=rabbitmq mode=0600
   when: "env == 'staging'"
+  notify:
+    - restart rabbitmq
   tags:
   - rabbitmq_cluster
   - config
@@ -73,6 +75,8 @@
   copy: content="{{rabbitmq_cluster_cookie_production}}" dest=/var/lib/rabbitmq/.erlang.cookie
         owner=rabbitmq group=rabbitmq mode=0600
   when: "env == 'production'"
+  notify:
+    - restart rabbitmq
   tags:
   - rabbitmq_cluster
   - config