diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml
index 404f01e138..92de01e71e 100644
--- a/roles/fedmsg/base/tasks/main.yml
+++ b/roles/fedmsg/base/tasks/main.yml
@@ -42,6 +42,7 @@
   - endpoints-mailman.py
   - endpoints-summershum.py
   - endpoints-kerneltest.py
+  - endpoints-fedimg.py
   - endpoints-github2fedmsg.py
   - endpoints-bugzilla2fedmsg.py
   - relay.py
diff --git a/roles/fedmsg/base/templates/endpoints-fedimg.py.j2 b/roles/fedmsg/base/templates/endpoints-fedimg.py.j2
new file mode 100644
index 0000000000..b13f3a78a2
--- /dev/null
+++ b/roles/fedmsg/base/templates/endpoints-fedimg.py.j2
@@ -0,0 +1,14 @@
+{% if env == 'staging' %}
+suffix  = 'stg.phx2.fedoraproject.org'
+{% else %}
+suffix = 'phx2.fedoraproject.org'
+{% endif %}
+
+config = dict(
+    endpoints={
+        "fedimg.fedimg01": [
+            "tcp://fedimg01.%s:30%0.2i" % (suffix, i)
+            for i in range(4)
+        ],
+    },
+)
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index 8ce36986d3..e37d6c93ca 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -34,6 +34,9 @@ config = dict(
     ] + [
         ("shell.github2fedmsg0%i" % i, "shell-github2fedmsg0%i.%s" % (i, suffix))
         for i in range(1, 3)
+    ] + [
+        ("fedimg.fedimg01", "fedimg-fedimg01.%s" % suffix),
+        ("shell.fedimg01", "shell-fedimg01.%s" % suffix),
     ] + [
         ("kerneltest.kerneltest0%i" % i, "kerneltest-kerneltest0%i.%s" % (i, suffix))
         for i in range(1, 3)