diff --git a/config.py b/config.py
index cd98ed4ff..7237a2c07 100644
--- a/config.py
+++ b/config.py
@@ -43,6 +43,16 @@ class Config(object):
     #         'schedule': timedelta(seconds=5)
     #     }
     # }
+    CELERY_QUEUES = [
+        Queue('sms', Exchange('default'), routing_key='sms'),
+        Queue('email', Exchange('default'), routing_key='email'),
+        Queue('sms-code', Exchange('default'), routing_key='sms-code'),
+        Queue('email-code', Exchange('default'), routing_key='email-code'),
+        Queue('process-job', Exchange('default'), routing_key='process-job'),
+        Queue('bulk-sms', Exchange('default'), routing_key='bulk-sms'),
+        Queue('bulk-email', Exchange('default'), routing_key='bulk-email'),
+        Queue('email-invited-user', Exchange('default'), routing_key='email-invited-user')
+    ]
     CELERY_IMPORTS = ('app.celery.tasks',)
     TWILIO_ACCOUNT_SID = os.getenv('TWILIO_ACCOUNT_SID')
     TWILIO_AUTH_TOKEN = os.getenv('TWILIO_AUTH_TOKEN')
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