diff --git a/deploy/aws/provision/templates/qed-config.yml.j2 b/deploy/aws/provision/templates/qed-config.yml.j2
index 423112fa7..3b375a1d3 100644
--- a/deploy/aws/provision/templates/qed-config.yml.j2
+++ b/deploy/aws/provision/templates/qed-config.yml.j2
@@ -44,9 +44,7 @@ agent:
     - "{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8400"
 {% endfor %}
   server_urls:
-{% for host in groups['name_qed-1'] %}
-    - "http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800"
-{% endfor %}
+    - "{% for host in groups['role_qed'] %}http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800{% if not loop.last %},{% endif %}{% endfor %}"
 {% for host in groups['role_storage'] %}
   alerts_urls:
     - "http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8888"
@@ -65,14 +63,10 @@ agent:
 {% endfor %}
 {% if 'role_auditor' in group_names %}
   pub_urls:
-{% for host in groups['name_qed-0'] %}
-    - "{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800"
-{% endfor %}
+    - "{% for host in groups['role_qed'] %}http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800{% if not loop.last %},{% endif %}{% endfor %}"
 {% endif %}
   server_urls:
-{% for host in groups['name_qed-1'] %}
-    - "http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800"
-{% endfor %}
+    - "{% for host in groups['role_qed'] %}http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800{% if not loop.last %},{% endif %}{% endfor %}"
 {% for host in groups['role_storage'] %}
   alerts_urls:
     - "http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8888"
@@ -90,9 +84,7 @@ agent:
     - "{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8400"
 {% endfor %}
   server_urls:
-{% for host in groups['name_qed-1'] %}
-    - "http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800"
-{% endfor %}
+    - "{% for host in groups['role_qed'] %}http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8800{% if not loop.last %},{% endif %}{% endfor %}"
 {% for host in groups['role_storage'] %}
   alerts_urls:
     - "http://{{ hostvars[host]['ansible_eth0']['ipv4']['address'] }}:8888"