diff --git a/roles/setupKnownHosts/templates/known_hosts.j2 b/roles/setupKnownHosts/templates/known_hosts.j2
index 35ef30e14ad83e4dca79e68fe0d161576a1e28cd..326660a1d7799932062e79ce44b9bc3a560c9207 100644
--- a/roles/setupKnownHosts/templates/known_hosts.j2
+++ b/roles/setupKnownHosts/templates/known_hosts.j2
@@ -1,8 +1,8 @@
 {% set nodelist = [] %}
-{% for desktop in desktopNodeList %}
-{% for node in groups[desktop.name] %}
-{% if hostvars[node]['ansible_'+desktop.interface] is defined %}
-{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+desktop.interface]['ipv4']['address'], 'rsa': hostvars[node]['ansible_ssh_host_key_rsa_public']} %}
+{% for node in groups['all'] %}
+{% for interface in hostvars[node]['ansible_interfaces'] %}
+{% if interface != "lo" %}
+{% set host = {'name': node, 'ip': hostvars[node]['ansible_'+interface]['ipv4']['address'], 'rsa': hostvars[node]['ansible_ssh_host_key_rsa_public']} %}
 {% if nodelist.append(host) %}
 {% endif %}
 {% endif %}