diff --git a/roles/etcd/tasks/gen_certs_script.yml b/roles/etcd/tasks/gen_certs_script.yml
index ab820fdfd..9c4c15980 100644
--- a/roles/etcd/tasks/gen_certs_script.yml
+++ b/roles/etcd/tasks/gen_certs_script.yml
@@ -65,16 +65,9 @@
   with_items:
     - "{{ etcd_cert_dir }}/ca.pem"
     - "{{ etcd_cert_dir }}/ca-key.pem"
-    - "[{% for node in groups['etcd'] %}
-        '{{ etcd_cert_dir }}/admin-{{ node }}.pem',
-        '{{ etcd_cert_dir }}/admin-{{ node }}-key.pem',
-        '{{ etcd_cert_dir }}/member-{{ node }}.pem',
-        '{{ etcd_cert_dir }}/member-{{ node }}-key.pem',
-        {% endfor %}]"
-    - "[{% for node in (groups['kube_control_plane']) %}
-        '{{ etcd_cert_dir }}/node-{{ node }}.pem',
-        '{{ etcd_cert_dir }}/node-{{ node }}-key.pem',
-        {% endfor %}]"
+    - "{{ [etcd_cert_dir + '/admin-'] | product(groups['etcd'], ['.pem', '-key.pem']) | map('join') }}"
+    - "{{ [etcd_cert_dir + '/member-'] | product(groups['etcd'], ['.pem', '-key.pem']) | map('join') }}"
+    - "{{ [etcd_cert_dir + '/node-'] | product(groups['kube_control_plane'], ['.pem', '-key.pem']) | map('join') }}"
   delegate_to: "{{ groups['etcd'][0] }}"
   when:
     - ('etcd' in group_names)
@@ -102,10 +95,7 @@
     src: "{{ item }}"
   register: etcd_master_node_certs
   with_items:
-    - "[{% for node in groups['k8s_cluster'] %}
-        '{{ etcd_cert_dir }}/node-{{ node }}.pem',
-        '{{ etcd_cert_dir }}/node-{{ node }}-key.pem',
-        {% endfor %}]"
+    - "{{ [etcd_cert_dir + '/node-'] | product(groups['k8s_cluster'], ['.pem', '-key.pem']) | map('join') }}"
   delegate_to: "{{ groups['etcd'][0] }}"
   when:
     - ('etcd' in group_names)