diff --git a/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
index 9db8882cc6..84671335c8 100644
--- a/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
@@ -13,12 +13,8 @@ define host {
 {% else %}
    alias                   {{ host }}
 {% endif %}
-{% if hostvars[host].eth0_ip is defined %}
-   address                 {{ hostvars[host].eth0_ip }}
-{% elif hostvars[host].ansible_default_ipv4 is defined %}
-{% if hostvars[host].ansible_default_ipv4.address is defined %}
-   address                 {{ hostvars[host].ansible_default_ipv4.address }}
-{% endif %}
+{% if hostvars[host].tun0_ip is defined %}
+   address                 {{ hostvars[host].tun0_ip }}
 {% else %}
    address                 {{ host }}
 {% endif %}