diff --git a/Makefile b/Makefile
index cc695282a..0dfdb8804 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ run-celery: ## Run celery, TODO remove purge for staging/prod
 		--pidfile="/tmp/celery.pid" \
 		--loglevel=INFO \
 		--pool=eventlet
-		--concurrency=100
+		--concurrency=20
 
 
 .PHONY: dead-code
diff --git a/gunicorn_config.py b/gunicorn_config.py
index 135d2d9cb..d111efd67 100644
--- a/gunicorn_config.py
+++ b/gunicorn_config.py
@@ -10,8 +10,8 @@ import traceback  # noqa
 import eventlet.debug as debug  # noqa
 import gunicorn  # noqa
 
-# This will give us a better stack trace if blocking occurs
-debug.hub_blocking_detection(True)
+# This will give us a better stack trace if blocking occurs (if True)
+debug.hub_blocking_detection(False)
 workers = 4
 worker_class = "eventlet"
 worker_connections = 256
diff --git a/manifest.yml b/manifest.yml
index 59e50949c..22c6965ff 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -26,7 +26,7 @@ applications:
       - type: worker
         instances: ((worker_instances))
         memory: ((worker_memory))
-        command: newrelic-admin run-program celery -A run_celery.notify_celery worker --loglevel=INFO --pool=eventlet --concurrency=100 --prefetch-multiplier=2
+        command: newrelic-admin run-program celery -A run_celery.notify_celery worker --loglevel=INFO --pool=eventlet --concurrency=20 --prefetch-multiplier=2
       - type: scheduler
         instances: 1
         memory: ((scheduler_memory))