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 7b58737675..9db8882cc6 100644
--- a/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
@@ -13,7 +13,15 @@ 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 %}
+{% else %}
    address                 {{ host }}
+{% endif %}
 }
 {% endif %}
 {% endfor %}