diff --git a/site.yml b/site.yml
index b350d14..9af9738 100644
--- a/site.yml
+++ b/site.yml
@@ -81,10 +81,9 @@
         ns1 IN A {{ ansible_default_ipv4.address }}
         ns1 IN AAAA {{ ansible_default_ipv6.address }}
         ; Automatic server addresses
-        ; TODO only if addresses not local
-        {% for fqdn, facts in hostvars.items() %}
-        {{ fqdn }}. IN A {{ facts.ansible_default_ipv4.address }}
-        {{ fqdn }}. IN AAAA {{ facts.ansible_default_ipv6.address }}
+        {% for fqdn in groups['public_available'] %}
+        {{ fqdn }}. IN A {{ hostvars[fqdn].ansible_default_ipv4.address }}
+        {{ fqdn }}. IN AAAA {{ hostvars[fqdn].ansible_default_ipv6.address }}
         {{ ssh_key_dns_fpr_map[fqdn] }}
         {% endfor %}
         ; Public use domains