diff --git a/config.py b/config.py
index 4813eebe0..f5cbe9851 100644
--- a/config.py
+++ b/config.py
@@ -1,3 +1,4 @@
+from kombu import Exchange, Queue
 import os
 
 
@@ -48,6 +49,16 @@ class Config(object):
     TWILIO_NUMBER = os.getenv('TWILIO_NUMBER')
     FIRETEXT_NUMBER = os.getenv('FIRETEXT_NUMBER')
     FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY")
+    CELERY_QUEUES = [
+        Queue('sms', Exchange('default'), routing_key='default'),
+        Queue('email', Exchange('default'), routing_key='default'),
+        Queue('sms-code', Exchange('default'), routing_key='default'),
+        Queue('email-code', Exchange('default'), routing_key='default'),
+        Queue('process-job', Exchange('default'), routing_key='default'),
+        Queue('bulk-sms', Exchange('default'), routing_key='default'),
+        Queue('bulk-email', Exchange('default'), routing_key='default'),
+        Queue('email-invited-user', Exchange('default'), routing_key='default')
+    ]
 
 
 class Development(Config):
diff --git a/scripts/run_celery.sh b/scripts/run_celery.sh
index 1d2abbc8b..8b2a1dec2 100755
--- a/scripts/run_celery.sh
+++ b/scripts/run_celery.sh
@@ -3,4 +3,4 @@
 set -e
 
 source environment.sh
-celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=4 -Q sms,sms-code,email-code,email,process-job,bulk-sms,bulk-email,email-invited-user
+celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=4