diff --git a/roles/odcs/backend/tasks/main.yml b/roles/odcs/backend/tasks/main.yml
index 2199c1c808..b2d1d65d16 100644
--- a/roles/odcs/backend/tasks/main.yml
+++ b/roles/odcs/backend/tasks/main.yml
@@ -108,38 +108,17 @@
   - odcs
   - odcs/backend
 
-- name: Create the admin user for the odcs vhost
-  run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org"
-  rabbitmq_user:
-    user: admin
-    password: "{{ rabbitmq_odcs_admin_password_staging }}"
-    permissions:
-      - vhost: /odcs
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
-    tags: management
-  when: env == "staging"
-  tags:
-  - rabbitmq_cluster
-  - config
-  - odcs
-  - odcs/backend
-
 - name: Create the admin user for the odcs vhost (prod)
   run_once: true
   delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org"
   rabbitmq_user:
     user: admin
-    password: "{{ rabbitmq_odcs_admin_password_production }}"
-    permissions:
-      - vhost: /odcs
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
+    password: "{{ (env == 'production')|ternary(rabbitmq_odcs_admin_password_production, rabbitmq_odcs_admin_password_staging) }}"
+    vhost: /odcs
+    configure_priv: .*
+    read_priv: .*
+    write_priv: .*
     tags: management
-  when: env != "staging"
   tags:
   - rabbitmq_cluster
   - config
@@ -167,11 +146,10 @@
   delegate_to: "rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org"
   rabbitmq_user:
     user: "odcs-private-queue{{ env_suffix }}"
-    permissions:
-      - vhost: /odcs
-        configure_priv: .*
-        write_priv: .*
-        read_priv: .*
+    vhost: /odcs
+    configure_priv: .*
+    write_priv: .*
+    read_priv: .*
     state: present
   tags:
   - rabbitmq_cluster
diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 6e191f870e..a14f3eae58 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -224,48 +224,20 @@
   - rabbitmq_cluster
   - config
 
-- name: Create the admin user for the pubsub vhost
+- name: Create the admin user for the {{ item }} vhost
   rabbitmq_user:
     user: admin
-    password: "{{ rabbitmq_admin_password_staging }}"
-    permissions:
-      - vhost: /
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
-      - vhost: /pubsub
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
-      - vhost: /public_pubsub
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
+    password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
+    vhost: "{{ item }}"
+    configure_priv: .*
+    read_priv: .*
+    write_priv: .*
     tags: management
-  when: env == "staging" and inventory_hostname.startswith('rabbitmq01')
-  tags:
-  - rabbitmq_cluster
-  - config
-
-- name: Create the admin user for the pubsub vhost
-  rabbitmq_user:
-    user: admin
-    password: "{{ rabbitmq_admin_password_production }}"
-    permissions:
-      - vhost: /
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
-      - vhost: /pubsub
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
-      - vhost: /public_pubsub
-        configure_priv: .*
-        read_priv: .*
-        write_priv: .*
-    tags: management
-  when: env == "production" and inventory_hostname.startswith('rabbitmq01')
+  with_items:
+  - /
+  - /pubsub
+  - /public_pubsub
+  when: inventory_hostname.startswith('rabbitmq01')
   tags:
   - rabbitmq_cluster
   - config