diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index cd40e1b25c..f9e2f5c99c 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -119,6 +119,10 @@
     when: "'releng_stg' in group_names"
 
   - fedmsg/base
+
+  - role: rabbit/user
+    username: "pungi{{ env_suffix }}"
+
   - role: releng
     tags:
     - releng
diff --git a/roles/releng/templates/fedora-messaging.toml.j2 b/roles/releng/templates/fedora-messaging.toml.j2
index 0e3854df21..9d936e7781 100644
--- a/roles/releng/templates/fedora-messaging.toml.j2
+++ b/roles/releng/templates/fedora-messaging.toml.j2
@@ -16,22 +16,3 @@ certfile = "/etc/pki/fedora-messaging/rabbitmq-pungi.crt"
 
 [client_properties]
 app = "pungi"
-
-[qos]
-prefetch_size = 0
-prefetch_count = 25
-
-[log_config]
-version = 1
-disable_existing_loggers = true
-[log_config.formatters.simple]
-format = "%(asctime)s [%(name)s %(levelname)s] %(message)s"
-datefmt = "%Y-%m-%d %H:%M:%S"
-[log_config.handlers.console]
-class = "logging.StreamHandler"
-formatter = "simple"
-stream = "ext://sys.stdout"
-[log_config.loggers.fedora_messaging]
-level = "INFO"
-propagate = false
-handlers = ["console"]