diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml
index 2ab6a1731b..d2b1d2229d 100644
--- a/playbooks/groups/value.yml
+++ b/playbooks/groups/value.yml
@@ -32,9 +32,6 @@
   - apache
   - { role: fedmsg/base,
       when: inventory_hostname.startswith('value01') }
-  # Set up for fedora-messaging
-  - { role: rabbit/user,
-      username: "value{{ env_suffix }}"}
   - { role: fedmsg/irc,
       when: inventory_hostname.startswith('value01') }
   - supybot
diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml
index 12c51960a5..3e3f807aa9 100644
--- a/roles/supybot/tasks/main.yml
+++ b/roles/supybot/tasks/main.yml
@@ -86,6 +86,15 @@
   - meetbot
   - supybot
 
+  # Set up for fedora-messaging
+- name: Create the RabbitMQ user
+  import_role:
+    name: rabbit/user
+    username: "{{ botname }}"
+  when:
+  - env == "staging"
+  - inventory_hostname.startswith('value02')
+
 - name: Create /etc/pki/fedora-messaging (stg)
   file:
     dest: /etc/pki/fedora-messaging