diff --git a/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2
index 4be8ac300f..550272b25f 100644
--- a/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2
@@ -7,11 +7,11 @@ suffix = 'phx2.fedoraproject.org'
 config = dict(
     endpoints={
         "fmn.notifs-web01": [
-            "tcp://notifs-web01.%s:30%0.2i" % suffix
+            "tcp://notifs-web01.%s:30%0.2i" % (suffix, i)
             for i in range(16)
         ],
         "fmn.notifs-web02": [
-            "tcp://notifs-web02.%s:30%0.2i" % suffix
+            "tcp://notifs-web02.%s:30%0.2i" % (suffix, i)
             for i in range(16)
         ],
     },
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index e37c071a37..b5b906c9f7 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -28,7 +28,7 @@ config = dict(
         ("shell.notifs-web0%i" % i, "shell-notifs-web0%i.%s" % (i, suffix))
         for i in range(1, 3)
     ] + [
-        ("fmn.notifs-web0%i" % i, "pkgdb-notifs-web0%i.%s" % (i, suffix))
+        ("fmn.notifs-web0%i" % i, "fmn-notifs-web0%i.%s" % (i, suffix))
         for i in range(1, 3)
     ] + [
         ("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix))