diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2
index 6fffebe29b..9b9b2272ae 100644
--- a/roles/fedmsg/base/templates/endpoints.py.j2
+++ b/roles/fedmsg/base/templates/endpoints.py.j2
@@ -102,6 +102,10 @@ config = dict(
         "supybot.value03": [
             "tcp://value03.%s:3000" % suffix,
         ],
+{% else %}
+        "supybot.value01": [
+            "tcp://value01.%s:3000" % suffix,
+        ],
 {% endif %}
         # Askbot runs as 6 processes with 1 thread each.
         "askbot.ask01": [
diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2
index 32fb30f73b..d6bc86bbd3 100644
--- a/roles/fedmsg/base/templates/policy.py.j2
+++ b/roles/fedmsg/base/templates/policy.py.j2
@@ -231,7 +231,11 @@ 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 47fcc96eb0..a075c0a1c0 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -95,6 +95,7 @@ config = dict(
     ] + [
         ("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),