diff --git a/vars/rabbitmq_users.yml b/vars/rabbitmq_users.yml
index da1a2bf..3143887 100644
--- a/vars/rabbitmq_users.yml
+++ b/vars/rabbitmq_users.yml
@@ -30,6 +30,18 @@ rabbitmq_users:
         configure_priv: ".*"
         read_priv: ".*"
         write_priv: ".*"
+      - vhost: '/pubsub'
+        configure_priv: ".*"
+        read_priv: ".*"
+        write_priv: ".*"
+      - vhost: '/public_pubsub'
+        configure_priv: ".*"
+        read_priv: ".*"
+        write_priv: ".*"
+      - vhost: '/mbs'
+        configure_priv: ".*"
+        read_priv: ".*"
+        write_priv: ".*"
   - user: mbs
     state: present
     configure_priv: ".*"
@@ -57,5 +69,13 @@ rabbitmq_users:
         configure_priv: "^$"
         read_priv: "^$"
         write_priv: "^$"
+      - vhost: '/pubsub'
+        configure_priv: "^$"
+        read_priv: "^$"
+        write_priv: "^$"
+      - vhost: '/public_pubsub'
+        configure_priv: "^$"
+        read_priv: "^$"
+        write_priv: "^$"
     tags: "monitoring"
 ...
diff --git a/vars/rabbitmq_vhost.yml b/vars/rabbitmq_vhost.yml
index e87bb63..a32e14b 100644
--- a/vars/rabbitmq_vhost.yml
+++ b/vars/rabbitmq_vhost.yml
@@ -1,6 +1,6 @@
 ---
 rabbitmq_vhosts:
-  - vhost: pubsub
+  - vhost: '/pubsub'
     state: present
     policy:
       - name: HA
@@ -18,7 +18,7 @@ rabbitmq_vhosts:
         tags:
           expires: '111600000'
           max-length-bytes: '1073741824'
-  - vhost: public_pubsub
+  - vhost: '/public_pubsub'
     state: present
     policy:
       - name: sweeper
@@ -68,4 +68,44 @@ rabbitmq_vhosts:
         tags:
           expires: '111600000'
           max-length-bytes: '1073741824'
+  # Legacy entries
+  - vhost: pubsub
+    state: present
+    policy:
+      - name: HA
+        apply_to: queues
+        state: present
+        pattern: ".*"
+        tags:
+          ha-mode: 'all'
+          ha-sync-mode: 'automatic'
+          ha-sync-batch-size: '10000'
+      - name: pubsub_sweeper
+        apply_to: queues
+        state: present
+        pattern: ".*"
+        tags:
+          expires: '111600000'
+          max-length-bytes: '1073741824'
+  - vhost: public_pubsub
+    state: present
+    policy:
+      - name: sweeper
+        apply_to: queues
+        state: present
+        pattern: ".*"
+        tags:
+          expires: '3600000'
+          max-length-bytes: '52428800'
+  - vhost: '/mbs'
+    state: present
+    policy:
+      - name: HA
+        apply_to: queues
+        state: present
+        pattern: ".*"
+        tags:
+          ha-mode: 'all'
+          ha-sync-mode: 'automatic'
+          ha-sync-batch-size: '10000'
 ...