diff --git a/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2 b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
new file mode 100644
index 0000000000..18cc54aff2
--- /dev/null
+++ b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
@@ -0,0 +1,32 @@
+{% for host in groups['all']|sort %}
+{% if hostvars[host].datacenter == 'ec2' and hostvars[host].nagios_Check_Services['ping'] == true %}
+define host {
+{% if vars['nagios_location'] == 'internal' %}
+   use                     defaulttemplate
+{% else %}
+  use                          mincheck
+{% endif %}
+
+   host_name               {{ host }}
+{% if hostvars[host].ansible_hostname is defined %}
+   alias                   {{ hostvars[host].ansible_hostname }}
+{% 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 %}
+{% if hostvars[host]['vmhost'] is defined %}
+   parents                 {{ hostvars[host]['vmhost'] }}
+{% elif hostvars[host].datacenter is defined %}
+   parents                 internetx-gw
+{% endif %}
+}
+{% endif %}
+{% endfor %}