diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 1b278f85e2..6e191f870e 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -228,11 +228,19 @@
   rabbitmq_user:
     user: admin
     password: "{{ rabbitmq_admin_password_staging }}"
-    vhost: /
-    configure_priv: .*
-    read_priv: .*
-    write_priv: .*
-    state: present
+    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 == "staging" and inventory_hostname.startswith('rabbitmq01')
   tags:
@@ -243,11 +251,19 @@
   rabbitmq_user:
     user: admin
     password: "{{ rabbitmq_admin_password_production }}"
-    vhost: /
-    configure_priv: .*
-    read_priv: .*
-    write_priv: .*
-    state: present
+    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')
   tags: