diff --git a/roles/queue/tasks/main.yml b/roles/queue/tasks/main.yml
index ae4e8d703842df5cb1d4e2c12b3ef953d37f4ce6..784b9b3a798878924fc28117affdad8b44357c7f 100644
--- a/roles/queue/tasks/main.yml
+++ b/roles/queue/tasks/main.yml
@@ -16,10 +16,18 @@
       - enq-server.service
       - enq-worker.service
 
+- name: Remove old configuration file
+  file:
+    path: "/etc/default/enq"
+    state: absent
+
 - name: Configure queuing system (enq)
   template:
-    src: "enq.default.j2"
-    dest: "/etc/default/enq"
+    src: "{{ item }}.default.j2"
+    dest: "/etc/default/{{ item }}"
+  loop:
+    - enq-worker
+    - enq-server
   notify: reload enq
 
 - name: Enable enq systemd units
diff --git a/roles/queue/templates/enq.default.j2 b/roles/queue/templates/enq-server.default.j2
similarity index 54%
rename from roles/queue/templates/enq.default.j2
rename to roles/queue/templates/enq-server.default.j2
index 22fc3135ba1350dd3ca91654fd7379c289eb8968..8016be7c3f068fe1d16e622c928d3468168efb1f 100644
--- a/roles/queue/templates/enq.default.j2
+++ b/roles/queue/templates/enq-server.default.j2
@@ -1,3 +1 @@
 SERVER_OPTIONS="--shard={{ shard_id }} --addr=:3733 --http-addr=:3734 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/server/cert.pem --ssl-key=/etc/credentials/x509/enq/server/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem --topology=dynamic:%s.queue.{{ domain }}:3733"
-
-WORKER_OPTIONS="--id={{ inventory_hostname }} --http-addr=:3735 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/client/cert.pem --ssl-key=/etc/credentials/x509/enq/client/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem"
diff --git a/roles/queue/templates/enq-worker.default.j2 b/roles/queue/templates/enq-worker.default.j2
new file mode 100644
index 0000000000000000000000000000000000000000..03e1284c610d279ba88d8e13859cfb59f41b8632
--- /dev/null
+++ b/roles/queue/templates/enq-worker.default.j2
@@ -0,0 +1 @@
+WORKER_OPTIONS="--id={{ inventory_hostname }} --http-addr=:3735 --auth-token={{ enq_shared_secret }} --ssl-cert=/etc/credentials/x509/enq/client/cert.pem --ssl-key=/etc/credentials/x509/enq/client/private_key.pem --ssl-ca=/etc/credentials/x509/enq/ca.pem"