diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index 92e18615cc..733ea98f86 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -378,8 +378,8 @@
       - vhost: /public_pubsub
         # Matches, for example, de23804a-304a-4228-b239-35099c98bd1e
         # Regex is Erlang flavored: http://erlang.org/doc/man/re.html
-        configure_priv: "^(\\w{8}(-\\w{4}){3}-\\w{12})$"
-        write_priv: "^(\\w{8}(-\\w{4}){3}-\\w{12})$"
+        configure_priv: "^((\\w{8}(-\\w{4}){3}-\\w{12})|amq\..*)$"
+        write_priv: "^((\\w{8}(-\\w{4}){3}-\\w{12})|amq\..*)$"
         read_priv: .*
     state: present
   tags: