diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml
index e3c739ec99..7c8821a7a0 100644
--- a/playbooks/openshift-apps/koschei.yml
+++ b/playbooks/openshift-apps/koschei.yml
@@ -11,8 +11,13 @@
     - /srv/web/infra/ansible/roles/openshift-apps/koschei/vars/{{ env }}.yml
 
   roles:
-  - role: rabbit/user
+  - role: rabbit/queue
     username: "{{ app }}{{ env_suffix }}"
+    queue_name: "{{ app }}{{ env_suffix }}"
+    routing_keys:
+    - org.fedoraproject.stg.buildsys.tag
+    - org.fedoraproject.stg.buildsys.task.state.change
+    message_ttl: 60000
 
   - openshift/project
 
diff --git a/roles/rabbit/queue/defaults/main.yml b/roles/rabbit/queue/defaults/main.yml
index a9c7a8ff47..92b3d4c4c2 100644
--- a/roles/rabbit/queue/defaults/main.yml
+++ b/roles/rabbit/queue/defaults/main.yml
@@ -3,5 +3,6 @@ vhost: /pubsub
 default_exchange: amq.topic
 routing_keys:
   - "#"
+message_ttl: forever
 thresholds: false
 nagios_server: noc01.phx2.fedoraproject.org
diff --git a/roles/rabbit/queue/tasks/main.yml b/roles/rabbit/queue/tasks/main.yml
index 0ec927ab26..d2760c7e37 100644
--- a/roles/rabbit/queue/tasks/main.yml
+++ b/roles/rabbit/queue/tasks/main.yml
@@ -49,6 +49,7 @@
     vhost: "{{ vhost }}"
     auto_delete: no
     durable: yes
+    message_ttl: "{{ message_ttl }}"
     state: present
     login_user: admin
     login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
@@ -83,4 +84,4 @@
   template:
     src: nagios.cfg.j2
     dest: /etc/nagios/services/rabbitmq-queue-{{ queue_name }}.cfg
-  notify: restart nagios on noc
\ No newline at end of file
+  notify: restart nagios on noc