diff --git a/roles/supybot/tasks/main.yml b/roles/supybot/tasks/main.yml
index 28777817a6..cfb5444ac2 100644
--- a/roles/supybot/tasks/main.yml
+++ b/roles/supybot/tasks/main.yml
@@ -88,10 +88,10 @@
 
   # Set up for fedora-messaging
 - name: Create the RabbitMQ user
-  include_role:
+  import_role:
     name: rabbit/user
   vars:
-    username: "{{ botname }}"
+    username: "{{ botnames[env] }}"
   when:
   - env == "staging"
   - inventory_hostname.startswith('value02')