diff --git a/ansible/celery.service b/ansible/celery.service
index 87e2fdf8756fe1e2e2d3f76dbca236f365853f1e..e6dbfc08e77c67071505181bb7d7fca67f22b2e6 100644
--- a/ansible/celery.service
+++ b/ansible/celery.service
@@ -9,11 +9,13 @@ Group=ippidb
 EnvironmentFile=-/etc/default/ippidb-{{ http_port }}-celeryd
 WorkingDirectory=/home/ippidb/ippidb-web-{{ http_port }}/ippisite
 ExecStart=/bin/sh -c '${CELERY_BIN} multi start ${CELERYD_NODES} \
+  -Q ${CELERYD_QUEUE}
   -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \
   --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
 ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait ${CELERYD_NODES} \
   --pidfile=${CELERYD_PID_FILE}'
 ExecReload=/bin/sh -c '${CELERY_BIN} multi restart ${CELERYD_NODES} \
+  -Q ${CELERYD_QUEUE}
   -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \
   --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
 
diff --git a/ansible/celeryd b/ansible/celeryd
index d52518e3251993578d8fdb398d86aa8cab37f47f..1ce118adaf50ca45fb3b116eb7a2f314d492a201 100644
--- a/ansible/celeryd
+++ b/ansible/celeryd
@@ -8,6 +8,7 @@ CELERYD_PID_FILE="/var/ippidb-{{ http_port }}-celery/celery%n.pid"
 CELERYD_LOG_LEVEL="DEBUG"
 CELERYD_USER="celery-{{ http_port }}"
 CELERYD_GROUP="ippidb"
+CELERYD_QUEUE="celery-{{ http_port }}"
 CELERY_CREATE_DIRS=1
 SYSTEMD_LOG_LEVEL=debug
 DJANGO_SETTINGS_MODULE=ippisite.{{ ansible_hostname }}_settings
diff --git a/ansible/deploy.yaml b/ansible/deploy.yaml
index a7b9b33ced94eba8c1c5e73e7b1b5d0ad6ea4e06..346a6d21bfc032a9ef37451742a3e7b04ea133f9 100644
--- a/ansible/deploy.yaml
+++ b/ansible/deploy.yaml
@@ -214,6 +214,12 @@
               }
           }
         marker: "# {mark} ANSIBLE MANAGED DATABASE SETTINGS"
+    - name: Configure the CELERY QUEUE to submit tasks to from Django
+      blockinfile:
+        path: "{{ checkout_path }}/ippisite/ippisite/{{ ansible_hostname }}_settings.py"
+        block: |
+          CELERY_TASK_DEFAULT_QUEUE = "celery-{{ http_port }}"
+        marker: "# {mark} ANSIBLE MANAGED CELERY DEFAULT TASK QUEUE"
     - name: Add database settings to iPPI-DB settings
       blockinfile:
         path: "{{ checkout_path }}/ippisite/ippisite/{{ ansible_hostname }}_settings.py"