diff --git a/master.yml b/master.yml
index 808f9be68c..d068b18d94 100644
--- a/master.yml
+++ b/master.yml
@@ -1,101 +1,101 @@
----
+#---
+##
+## This is the master playbook. It includes all the other playbooks.
+## Usually you would call it with a -t tagname to only run a specific tag
+## over all machines.
+##
+## some common ones:
+## -t fedmsgconfig -> runs fedmsg/base config over all playbooks
+## -t apache -> run when tasks/apache.yml changes.
+##
 #
-# This is the master playbook. It includes all the other playbooks.
-# Usually you would call it with a -t tagname to only run a specific tag
-# over all machines.
-#
-# some common ones:
-# -t fedmsgconfig -> runs fedmsg/base config over all playbooks
-# -t apache -> run when tasks/apache.yml changes.
-#
-
-#
-# group playbooks
-#
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml
-#- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/certgetter.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend-cloud.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/dbgserver.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/oci-registry.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/logserver.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/loopabull.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mbs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/memcached.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/modernpaste.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/noc.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-web.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/nuancier.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/odcs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-proxies.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pdc.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/people.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgs.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server-bdr.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/proxies.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/rabbitmq.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/retrace.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/releng-compose.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/repospanner.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/secondary.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/sign-bridge.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/simple-koji-ci.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/sundries.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/tang.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/torrent.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/unbound.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml
-- import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml
+##
+## group playbooks
+##
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/arm-qa.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/autocloud-web.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/backup-server.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/badges-web.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/basset.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bastion.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/batcave.yml
+##- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bodhi-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/bugzilla2fedmsg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildhw.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/buildvm.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/busgateway.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/certgetter.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ci.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-dist-git.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-frontend-cloud.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/copr-keygen.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/datagrepper.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/dbgserver.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/oci-registry.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/dns.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/download.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/elections.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedimg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/fedocal.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/ipa.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/kerneltest.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/keyserver.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/koji-hub.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/kojipkgs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/logserver.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/loopabull.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mbs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mailman.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/maintainer-test.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mariadb-server.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/mirrormanager.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/memcached.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/modernpaste.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/noc.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-backend.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/notifs-web.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/nuancier.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/odcs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/openqa-workers.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/openstack-compute-nodes.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/osbs-cluster.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-cluster.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/os-proxies.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/packages.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pagure.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pdc.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/people.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/pkgs.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/postgresql-server-bdr.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/proxies.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/resultsdb.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/rabbitmq.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/retrace.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/releng-compose.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/repospanner.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/secondary.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/smtp-mm.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/sign-bridge.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/simple-koji-ci.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/sundries.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/tang.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/taskotron-client-hosts.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/torrent.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/unbound.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/value.yml
+#- import_playbook: /srv/web/infra/ansible/playbooks/groups/virthost.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/wiki.yml
 - import_playbook: /srv/web/infra/ansible/playbooks/groups/zanata2fedmsg.yml
 ####
diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml
index f8e9d8c5e2..15401f9db5 100644
--- a/playbooks/groups/wiki.yml
+++ b/playbooks/groups/wiki.yml
@@ -29,11 +29,8 @@
   - { role: fedmsg/base,
       when: deployment_type == "prod" }
   # Set up for fedora-messaging
-  - { role: rabbit/user,
-      username: "wiki{{ env_suffix }}"}
-  - { role: rabbit/queue
-    username: "wiki{{ env_suffix }}"
-    queue_name: "wiki{{ env_suffix }}"}
+  - { role: rabbit/user, username: "wiki{{ env_suffix }}"}
+  - { role: rabbit/queue, username: "wiki{{ env_suffix }}", queue_name: "wiki{{ env_suffix }}"}
   - { role: nfs/client, when: env == "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app_staging/app/attachments' }
   - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments',  nfs_src_dir: 'fedora_app/app/attachments' }
   - mediawiki