diff --git a/roles/badges/backend/templates/badges-awarder.py b/roles/badges/backend/templates/badges-awarder.py
index 1c6ae21b65..57b65695b2 100644
--- a/roles/badges/backend/templates/badges-awarder.py
+++ b/roles/badges/backend/templates/badges-awarder.py
@@ -5,8 +5,8 @@ config = {
     # This sets up four threads to handle incoming messages.  At the time of
     # this commit, all of our fedmsg daemons are running in single-threaded
     # mode.  If we turn it on globally, we should remove this setting.
-    "moksha.workers_per_consumer": 8,
-    "moksha.threadpool_size": 20,
+    "moksha.workers_per_consumer": 4,
+    "moksha.threadpool_size": 12,
 
     # This tells the consumer where to look for its BadgeRule definitions.  It
     # may be a relative or an absolute path on the file system.
diff --git a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2 b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2
index f424d72db5..a9a69b7c6e 100644
--- a/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2
+++ b/roles/fedmsg/base/templates/endpoints-fedbadges.py.j2
@@ -11,10 +11,6 @@ config = dict(
             "tcp://badges-backend01.%s:3001" % suffix,
             "tcp://badges-backend01.%s:3002" % suffix,
             "tcp://badges-backend01.%s:3003" % suffix,
-            "tcp://badges-backend01.%s:3004" % suffix,
-            "tcp://badges-backend01.%s:3005" % suffix,
-            "tcp://badges-backend01.%s:3006" % suffix,
-            "tcp://badges-backend01.%s:3007" % suffix,
         ],
 
         "tahrir.badges-web01": [