diff --git a/roles/simple-koji-ci/templates/endpoints.py b/roles/simple-koji-ci/templates/endpoints.py
index 7a4082c77c..da1c5efdf5 100644
--- a/roles/simple-koji-ci/templates/endpoints.py
+++ b/roles/simple-koji-ci/templates/endpoints.py
@@ -25,15 +25,12 @@ config = dict(
         # These are here so your local box can listen to the upstream
         # infrastructure's bus.  Cool, right?  :)
         "fedora-infrastructure": [
-            #"tcp://hub.fedoraproject.org:9940",
+            {% if env == 'staging' %}
             "tcp://stg.fedoraproject.org:9940",
+            {% else %}
+            "tcp://hub.fedoraproject.org:9940",
+            {% endif %}
         ],
-        # "debian-infrastructure": [
-        #    "tcp://fedmsg.olasd.eu:9940",
-        # ],
-        # "anitya-public-relay": [
-        #    "tcp://release-monitoring.org:9940",
-        # ],
     },
 )