diff --git a/Ansible/Playbooks/RKE2/roles/add-server/templates/rke2-server-config.j2 b/Ansible/Playbooks/RKE2/roles/add-server/templates/rke2-server-config.j2
index d7a51e8c..f6b3b36a 100644
--- a/Ansible/Playbooks/RKE2/roles/add-server/templates/rke2-server-config.j2
+++ b/Ansible/Playbooks/RKE2/roles/add-server/templates/rke2-server-config.j2
@@ -3,8 +3,8 @@ token: {{ hostvars['server1']['token'] }}
 server: https://{{ hostvars['server1']['ansible_host'] }}:9345
 tls-san:
   - {{ vip }}
-  - {{ hostvars['server1']['ansible_host'] }}
-  - {{ hostvars['server2']['ansible_host'] }}
-  - {{ hostvars['server3']['ansible_host'] }}
+{% for host in groups['servers'] %}
+  - {{ hostvars[host]['ansible_host'] }}
+{% endfor %}
 node-label:
   - server=true
\ No newline at end of file
diff --git a/Ansible/Playbooks/RKE2/roles/rke2-prepare/templates/rke2-server-config.j2 b/Ansible/Playbooks/RKE2/roles/rke2-prepare/templates/rke2-server-config.j2
index a3131f1e..d01a93eb 100644
--- a/Ansible/Playbooks/RKE2/roles/rke2-prepare/templates/rke2-server-config.j2
+++ b/Ansible/Playbooks/RKE2/roles/rke2-prepare/templates/rke2-server-config.j2
@@ -1,9 +1,9 @@
 write-kubeconfig-mode: "0644"
 tls-san:
   - {{ vip }}
-  - {{ hostvars['server1']['ansible_host'] }}
-  - {{ hostvars['server2']['ansible_host'] }}
-  - {{ hostvars['server3']['ansible_host'] }}
+{% for host in groups['servers'] %}
+  - {{ hostvars[host]['ansible_host'] }}
+{% endfor %}
 node-label:
   - server=true
 disable: