diff --git a/roles/fedmsg/base/templates/pkgdb.py.j2 b/roles/fedmsg/base/templates/pkgdb.py.j2
index ce8ffe7673..f28ccfe663 100644
--- a/roles/fedmsg/base/templates/pkgdb.py.j2
+++ b/roles/fedmsg/base/templates/pkgdb.py.j2
@@ -9,13 +9,13 @@ non_phx_suffix = 'fedoraproject.org'
 config = dict(
     endpoints={
         "pkgdb2.pkgdb01": [
-            "tcp://pkgdb01.%s:301%i" % (suffix, i)
-            for i in range(10)
+            "tcp://pkgdb01.%s:30%0.2i" % (suffix, i)
+            for i in range(16)
         ],
 {% if not env == 'staging' %}
         "pkgdb2.pkgdb02": [
-            "tcp://pkgdb02.%s:301%i" % (suffix, i)
-            for i in range(10)
+            "tcp://pkgdb02.%s:30%0.2i" % (suffix, i)
+            for i in range(16)
         ],
 {% endif %}
     },