diff --git a/roles/fedmsg/base/templates/relay.py.j2 b/roles/fedmsg/base/templates/relay.py.j2
index 1671da6628..13862d7b42 100644
--- a/roles/fedmsg/base/templates/relay.py.j2
+++ b/roles/fedmsg/base/templates/relay.py.j2
@@ -24,7 +24,7 @@ config = dict(
     # It is also used by the mediawiki php plugin which, due to the oddities of
     # php, can't maintain a single passive-bind endpoint of it's own.
     relay_inbound=[
-        {% if 'persistent-cloud' in group_names or 'jenkins-cloud' in group_names %}
+        {% if 'persistent-cloud' in group_names or 'jenkins-master' in group_names %}
 
         # Stuff from the cloud has to go through our external proxy first..
         #"tcp://hub.fedoraproject.org:9941",
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index 7ea15f5a37..42bd30ad76 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -48,8 +48,8 @@ config = dict(
         ("copr.copr-be", "copr-copr-be.cloud.fedoraproject.org"),
 
         # Jenkins, also being a cloud node, is weird.  Like copr.
-        ("shell.jenkins-master-unknown", "shell-jenkins.cloud.fedoraproject.org"),
-        ("jenkins.jenkins-master-unknown", "jenkins-jenkins.cloud.fedoraproject.org"),
+        ("shell.jenkins-master-unknown", "shell-jenkins.fedorainfracloud.org"),
+        ("jenkins.jenkins-master-unknown", "jenkins-jenkins.fedorainfracloud.org"),
     ]),
 )