diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 475b6a7864..960924955b 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -34,7 +34,7 @@
 
 - name: install tag2distrepo on fedora bodhi backends
   package: name=python3-tag2distrepo state=present
-  when: inventory_hostname.startswith('bodhi-backend02') or inventory_hostname.startswith('bodhi-backend01.stg')
+  when: inventory_hostname.startswith('bodhi-backend01.stg')
   tags:
   - packages
   - bodhi
@@ -287,7 +287,7 @@
   cron: name="bodhi-approve-testing" hour="*/6" minute=0 user="apache"
         job="/usr/bin/bodhi-approve-testing /etc/bodhi/production.ini > /dev/null"
         cron_file=bodhi-approve-testing-job
-  when: (inventory_hostname.startswith('bodhi-backend02') and env == "production") or (inventory_hostname.startswith('bodhi-backend01') and env == "staging")
+  when: (inventory_hostname.startswith('bodhi-backend01') and env == "staging")
   tags:
   - config
   - bodhi
@@ -297,7 +297,7 @@
   cron: name="bodhi-check-policies" hour="*/1" minute=0 user="apache"
         job="/usr/bin/bodhi-check-policies >& /dev/null"
         cron_file=bodhi-check-policies-job
-  when: (inventory_hostname.startswith('bodhi-backend01') and env == "staging") or (inventory_hostname.startswith('bodhi-backend02') and env == "production")
+  when: (inventory_hostname.startswith('bodhi-backend01') and env == "staging")
   tags:
   - config
   - bodhi
@@ -450,7 +450,7 @@
   template: >
     src=tag2distrepo.py.j2
     dest=/etc/fedmsg.d/tag2distrepo.py
-  when: inventory_hostname.startswith('bodhi-backend02') or inventory_hostname.startswith('bodhi-backend01.stg')
+  when: inventory_hostname.startswith('bodhi-backend01.stg')
   tags:
   - config
   - bodhi
@@ -463,7 +463,7 @@
     mode: 0755
     owner: apache
     group: apache
-  when: inventory_hostname.startswith('bodhi-backend02') or inventory_hostname.startswith('bodhi-backend01.stg')
+  when: inventory_hostname.startswith('bodhi-backend01.stg')
   tags:
   - bodhi
   - tag2distrepo
@@ -475,7 +475,7 @@
     job: /usr/local/bin/dist-repo-regen.py
     user: apache
     minute: 42
-  when: inventory_hostname.startswith('bodhi-backend02') or inventory_hostname.startswith('bodhi-backend01.stg')
+  when: inventory_hostname.startswith('bodhi-backend01.stg')
   tags:
   - bodhi
   - cron
@@ -488,7 +488,7 @@
     value: mizdebsk
     env: yes
     user: apache
-  when: inventory_hostname.startswith('bodhi-backend02') or inventory_hostname.startswith('bodhi-backend01.stg')
+  when: inventory_hostname.startswith('bodhi-backend01.stg')
   tags:
   - bodhi
   - cron
diff --git a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2 b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
index 2cffd714a8..98bd02e1e3 100644
--- a/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-bodhi.py.j2
@@ -11,15 +11,5 @@ config = dict(
             "tcp://bodhi-backend01.%s:30%0.2i" % (suffix, i)
             for i in range(20)
         ],
-        {% if env != 'staging' %}
-        "bodhi.bodhi-backend02": [
-            "tcp://bodhi-backend02.%s:30%0.2i" % (suffix, i)
-            for i in range(20)
-        ],
-        "bodhi.bodhi-backend03": [
-            "tcp://bodhi-backend03.%s:30%0.2i" % (suffix, i)
-            for i in range(20)
-        ],
-        {% endif %}
     }
 )