diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2
index 827110cfc1..bd812f5c45 100644
--- a/roles/fedmsg/base/templates/endpoints.py.j2
+++ b/roles/fedmsg/base/templates/endpoints.py.j2
@@ -17,14 +17,6 @@ config = dict(
         # name of it's calling module to determine which endpoint definition
         # to use.  This can be overridden by explicitly providing the name in
         # the initial call to fedmsg.init(...).
-        "bodhi.app01": [
-            "tcp://app01.%s:300%i" % (suffix, i)
-            for i in range(8)
-        ],
-        "bodhi.app02": [
-            "tcp://app02.%s:300%i" % (suffix, i)
-            for i in range(8)
-        ],
         "bodhi.releng01": [
             "tcp://releng01.%s:3000" % suffix,
             "tcp://releng01.%s:3001" % suffix,
diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2
index 22ee83d2e7..80bc0e3bc7 100644
--- a/roles/fedmsg/base/templates/policy.py.j2
+++ b/roles/fedmsg/base/templates/policy.py.j2
@@ -5,8 +5,6 @@ app_hosts = [
     "app02.stg.phx2.fedoraproject.org",
 ]
 bodhi_hosts = [
-    "app01.stg.phx2.fedoraproject.org",
-    "app02.stg.phx2.fedoraproject.org",
     "bodhi01.stg.phx2.fedoraproject.org",
 ]
 topic_prefix = "org.fedoraproject.stg."
@@ -23,13 +21,6 @@ app_hosts = [
 ]
 # TODO -- think about using the ansible group for this.
 bodhi_hosts = [
-    "app01.phx2.fedoraproject.org",
-    "app02.phx2.fedoraproject.org",
-    "app03.phx2.fedoraproject.org",
-    "app04.phx2.fedoraproject.org",
-    "app05.fedoraproject.org",
-    "app07.phx2.fedoraproject.org",
-    "app08.fedoraproject.org",
     "bodhi01.phx2.fedoraproject.org",
     "bodhi02.phx2.fedoraproject.org",
 ]