diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 419905e330..9a448d0580 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -159,7 +159,5 @@ exclude_hostgroups:
   - dbgserver_stg
   - retrace_stg
   - retrace_stg_aws
-  - copr_aws
-  - copr_dev_aws
   - virt_guest
   - virt_host
diff --git a/inventory/inventory b/inventory/inventory
index 7507da9535..edfc3d46e7 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1416,3 +1416,11 @@ os-proxy02.fedorainfracloud.org
 
 [ec2]
 proxy30.fedoraproject.org
+copr-be.aws.fedoraproject.org
+copr-be-dev.aws.fedoraproject.org
+copr-dist-git.aws.fedoraproject.org
+copr-dist-git-dev.aws.fedoraproject.org
+copr-fe.aws.fedoraproject.org
+copr-fe-dev.aws.fedoraproject.org
+copr-keygen.aws.fedoraproject.org
+copr-keygen-dev.aws.fedoraproject.org
diff --git a/roles/nagios_server/files/nagios/commands/ssh.cfg b/roles/nagios_server/files/nagios/commands/ssh.cfg
index 55128528f5..ecd5f30986 100644
--- a/roles/nagios_server/files/nagios/commands/ssh.cfg
+++ b/roles/nagios_server/files/nagios/commands/ssh.cfg
@@ -4,3 +4,7 @@ define command{
 	command_line	$USER1$/check_ssh -H $HOSTADDRESS$
 }
 
+define command{
+        command_name    check-host-alive-ssh
+	command_line	$USER1$/check_ssh -H $HOSTADDRESS$
+}
diff --git a/roles/nagios_server/files/nagios/hosts/templates.cfg b/roles/nagios_server/files/nagios/hosts/templates.cfg
index 8b85b96320..ce18a9107c 100644
--- a/roles/nagios_server/files/nagios/hosts/templates.cfg
+++ b/roles/nagios_server/files/nagios/hosts/templates.cfg
@@ -14,6 +14,20 @@ define host {
   register                      0
 }
 
+define host {
+    name                          aws
+    check_command                 check-host-alive-ssh
+    max_check_attempts            8
+    checks_enabled                1
+    retain_status_information     1
+    retain_nonstatus_information  1
+    notification_interval         15
+    notifications_enabled         1
+    notification_options          d,r
+    contact_groups                fedora-sysadmin-ircbot
+    register                      0
+}
+
 define host {
     name                          mincheck
     check_command                 check-host-alive4
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..413532228a 100644
--- a/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
+++ b/roles/nagios_server/templates/nagios/hosts/aws-hosts.cfg.j2
@@ -4,7 +4,7 @@ define host {
 {% if vars['nagios_location'] == 'internal' %}
    use                     defaulttemplate
 {% else %}
-  use                          mincheck
+  use                          aws
 {% endif %}
 
    host_name               {{ host }}