diff --git a/roles/fedmsg/base/templates/endpoints-fedimg.py.j2 b/roles/fedmsg/base/templates/endpoints-fedimg.py.j2
index b13f3a78a2..5a4fb9d4af 100644
--- a/roles/fedmsg/base/templates/endpoints-fedimg.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-fedimg.py.j2
@@ -4,11 +4,15 @@ suffix  = 'stg.phx2.fedoraproject.org'
 suffix = 'phx2.fedoraproject.org'
 {% endif %}
 
+primary_threads = 4
+atomic_threads = 2
+NUM_FEDIMG_PORTS = 2 * ((primary_threads + atomic_threads) + 1)
+
 config = dict(
     endpoints={
         "fedimg.fedimg01": [
             "tcp://fedimg01.%s:30%0.2i" % (suffix, i)
-            for i in range(4)
+            for i in range(NUM_FEDIMG_PORTS)
         ],
     },
 )