diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2
index 9b9b2272ae..827110cfc1 100644
--- a/roles/fedmsg/base/templates/endpoints.py.j2
+++ b/roles/fedmsg/base/templates/endpoints.py.j2
@@ -98,15 +98,12 @@ config = dict(
             for i in range(32)
         ],
 {% endif %}
-{% if env != 'staging' %}
-        "supybot.value03": [
-            "tcp://value03.%s:3000" % suffix,
-        ],
-{% else %}
+
+        # This used to be on value01 and value03.. but now we just have one
         "supybot.value01": [
             "tcp://value01.%s:3000" % suffix,
         ],
-{% endif %}
+
         # Askbot runs as 6 processes with 1 thread each.
         "askbot.ask01": [
             "tcp://ask01.%s:30%02i" % (suffix, i)
diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2
index d6bc86bbd3..22ee83d2e7 100644
--- a/roles/fedmsg/base/templates/policy.py.j2
+++ b/roles/fedmsg/base/templates/policy.py.j2
@@ -231,11 +231,7 @@ config = dict(
 
         # Supybot/meetbot
         topic_prefix + "meetbot.meeting.start": [
-{% if env == 'staging' %}
             "supybot-value01.%s" % suffix,
-{% else %}
-            "supybot-value03.%s" % suffix,
-{% endif %}
         ],
 
         # When implemented, only @spot and @mattdm can use this one
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index a075c0a1c0..d02ffbb8f4 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -94,9 +94,7 @@ config = dict(
         ("shell.busgateway01", "shell-busgateway01.%s" % suffix),
     ] + [
         ("shell.value01", "shell-value01.%s" % suffix),
-        ("shell.value03", "shell-value03.%s" % suffix),
         ("supybot.value01", "supybot-value01.%s" % suffix),
-        ("supybot.value03", "supybot-value03.%s" % suffix),
     ] + [
         ("koji.koji04", "koji-koji04.%s" % suffix),
         ("koji.koji01", "koji-koji01.%s" % suffix),