diff --git a/inventory/group_vars/os_control b/inventory/group_vars/os_control
index da402b2866..ed97d539c0 100644
--- a/inventory/group_vars/os_control
+++ b/inventory/group_vars/os_control
@@ -1,4 +1 @@
 ---
-# Set the Bodhi variables
-bodhi_version: "7.2.2"
-bodhi_openshift_pods: 1
diff --git a/inventory/group_vars/os_control_stg b/inventory/group_vars/os_control_stg
index da402b2866..ed97d539c0 100644
--- a/inventory/group_vars/os_control_stg
+++ b/inventory/group_vars/os_control_stg
@@ -1,4 +1 @@
 ---
-# Set the Bodhi variables
-bodhi_version: "7.2.2"
-bodhi_openshift_pods: 1
diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index 3fe5da8040..5c0a024913 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -28,6 +28,7 @@
 
   pre_tasks:
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
+  - include_vars: /srv/web/infra/ansible/vars/apps/bodhi.yml
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
   roles:
@@ -99,7 +100,7 @@
     thresholds:
       warning: 10
       critical: 100
-    sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*
+    sent_topics: "{{ bodhi_sent_topics }}"
 
   - role: rabbit/queue
     username: "bodhi{{ env_suffix }}"
@@ -110,7 +111,7 @@
       warning: 10
       critical: 100
     # We have to repeat this line for now (only the last one counts)
-    sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*
+    sent_topics: "{{ bodhi_sent_topics }}"
 
   tasks:
   - name: create secondary volume dir for stg bodhi
diff --git a/playbooks/manual/upgrade/bodhi.yml b/playbooks/manual/upgrade/bodhi.yml
index 98d1115ab1..0855383c04 100644
--- a/playbooks/manual/upgrade/bodhi.yml
+++ b/playbooks/manual/upgrade/bodhi.yml
@@ -8,6 +8,7 @@
 
   tasks:
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
+  - include_vars: /srv/web/infra/ansible/vars/apps/bodhi.yml
   - name: Check for running composes
     shell: "curl https://bodhi{{env_suffix}}.fedoraproject.org/composes/"
     register: composes
diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index a94384ade5..d3117f11ea 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -20,6 +20,7 @@
 
   pre_tasks:
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
+  - include_vars: /srv/web/infra/ansible/vars/apps/bodhi.yml
   - set_fact:
     args:
       bodhi_version: "{{ bodhi_version }}"
@@ -32,7 +33,7 @@
     thresholds:
       warning: 10
       critical: 100
-    sent_topics: ^org\.fedoraproject\.{{ env_short }}\.bodhi\..*
+    sent_topics: "{{ bodhi_sent_topics }}"
 
   - role: openshift/project
     app: bodhi
diff --git a/roles/bodhi2/base/tasks/main.yml b/roles/bodhi2/base/tasks/main.yml
index 7f8fae8973..ad3b0f2db3 100644
--- a/roles/bodhi2/base/tasks/main.yml
+++ b/roles/bodhi2/base/tasks/main.yml
@@ -124,7 +124,7 @@
     topic_permissions:
       - vhost: /pubsub
         read_priv: .*
-        write_priv: ^org\.fedoraproject\.{{ env_short }}\.bodhi\..*
+        write_priv: "{{ bodhi_sent_topics }}"
   tags:
   - rabbitmq_cluster
   - config
diff --git a/vars/apps/bodhi.yml b/vars/apps/bodhi.yml
new file mode 100644
index 0000000000..90fd25d6b0
--- /dev/null
+++ b/vars/apps/bodhi.yml
@@ -0,0 +1,5 @@
+---
+# Set the Bodhi variables
+bodhi_version: "{{ (env == 'production')|ternary('7.2.2', '7.2.2') }}"
+bodhi_openshift_pods: 1
+bodhi_sent_topics: ^org\.fedoraproject\.{{ env_short }}\.(bodhi|pungi)\..*