diff --git a/inventory/inventory b/inventory/inventory
index 5c2b53c4d4..0e2534fc92 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -395,6 +395,9 @@ noc02.fedoraproject.org
 data-analysis01.phx2.fedoraproject.org
 batcave01.phx2.fedoraproject.org
 
+[logging]
+log01.phx2.fedoraproject.org
+
 [batcave]
 batcave01.phx2.fedoraproject.org
 
@@ -503,6 +506,18 @@ mm-crawler-stg
 [people]
 people02.fedoraproject.org
 
+[qahardware]
+qa02.qa.fedoraproject.org
+qa04.qa.fedoraproject.org
+qa05.qa.fedoraproject.org
+qa06.qa.fedoraproject.org
+qa08.qa.fedoraproject.org
+qa10.qa.fedoraproject.org
+qa11.qa.fedoraproject.org
+qa12.qa.fedoraproject.org
+qa13.qa.fedoraproject.org
+qa14.qa.fedoraproject.org
+
 [torrent]
 torrent02.fedoraproject.org
 
diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index cb84143f4b..12d9d3e71c 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -1,75 +1,75 @@
 define service {
-  hostgroup		servers
+  hostgroup_name	kvmServers
   service_description   Disk Space /
   check_command		check_by_nrpe!check_disk_/
   use                   disktemplate
 }
 
 define service {
-  host_name		noc01, proxy01, proxy02, rawhide-composer, db01
+  hostgroup_name	kvmServers,proxies
   service_description   Disk Space /boot
   check_command         check_by_nrpe!check_disk_/boot
   use                   disktemplate
 }
 
 define service {
-  hostgroup		hosted
+  hostgroup_name	hosted
   service_description   Disk Space /srv
   check_command		check_by_nrpe!check_disk_/srv
   use                   disktemplate
 }
 
 define service {
-  host_name            qa10.qa, qa11.qa, qa12.qa, qa13.qa
+  hostgroup_name        qahardware
   service_description   Disk Space /srv
-  check_command                check_by_nrpe!check_disk_/srv
+  check_command         check_by_nrpe!check_disk_/srv
   use                   disktemplate
 }
 
 define service {
-  host_name            taskotron01.qa, taskotron-stg01.qa, taskotron-dev01.qa
+  hostgroup_name        taskotron
   service_description   Disk Space /srv/buildmaster
-  check_command                check_by_nrpe!check_disk_/srv/buildmaster
+  check_command         check_by_nrpe!check_disk_/srv/buildmaster
   use                   disktemplate
 }
 
 define service {
-  host_name            taskotron01.qa, taskotron-stg01.qa, taskotron-dev01.qa
+  hostgroup_name        taskotron
   service_description   Disk Space /srv/taskotron
-  check_command                check_by_nrpe!check_disk_/srv/taskotron
+  check_command         check_by_nrpe!check_disk_/srv/taskotron
   use                   disktemplate
 }
 
 define service {
-  host_name             log01
+  hostgroup_name        log
   service_description   Disk space /var/log
   check_command         check_by_nrpe!check_disk_/var/log
   use                   disktemplate
 }
 
 define service {
-  host_name             pkgs02
+  hostgroup_name        pkgs
   service_description   Check read-only filesystem
   check_command         check_by_nrpe!check_readonly_fs
   use                   disktemplate
 }
 
 define service {
-  host_name             pkgs02
+  hostgroup_name        pkgs
   service_description   Disk space /srv/cache/lookaside
   check_command         check_by_nrpe!check_disk_/srv/cache/lookaside
   use                   disktemplate
 }
 
 define service {
-  host_name             ppc-hub
+  hostgroup_name        koji
   service_description   Disk space /
   check_command         check_by_nrpe!check_disk_/
   use                   ppc-secondarytemplate
 }
 
 define service {
-  host_name             retrace01.qa
+  hostgroup_name        retrace
   service_description   Disk space /
   check_command         check_by_nrpe!check_disk_/
   use                   retracetemplate
diff --git a/roles/nagios_server/files/nagios/services/procs.cfg b/roles/nagios_server/files/nagios/services/procs.cfg
index e588ce14f6..4cfae963db 100644
--- a/roles/nagios_server/files/nagios/services/procs.cfg
+++ b/roles/nagios_server/files/nagios/services/procs.cfg
@@ -6,14 +6,14 @@
 #}
 
 define service {
-  hostgroup             servers
+  hostgroup             kvmServers
   service_description   Total Processes
   check_command         check_by_nrpe!check_total_procs
   use                   defaulttemplate
 }
 
 define service {
-  hostgroup             servers
+  hostgroup             kvmServers
   service_description   Zombie Processes
   check_command         check_by_nrpe!check_zombie_procs
   use                   defaulttemplate
@@ -55,7 +55,7 @@ define service {
 #}
 
 define service {
-  hostgroup		servers
+  hostgroup		kvmServers
   service_description	Cron Daemon
   check_command		check_by_nrpe!check_cron
   use			defaulttemplate
diff --git a/roles/nagios_server/files/nagios/services/raid.cfg b/roles/nagios_server/files/nagios/services/raid.cfg
index 9ade9e651f..6d9891b8db 100644
--- a/roles/nagios_server/files/nagios/services/raid.cfg
+++ b/roles/nagios_server/files/nagios/services/raid.cfg
@@ -1,5 +1,5 @@
 define service {
-  hostgroup_name	servers
+  hostgroup_name	kvmServers
   service_description   Check Raid
   check_command         check_by_nrpe!check_raid
   use                   lighttemplate
diff --git a/roles/nagios_server/files/nagios/services/ssh.cfg b/roles/nagios_server/files/nagios/services/ssh.cfg
index 8b69554e81..30f08719b0 100644
--- a/roles/nagios_server/files/nagios/services/ssh.cfg
+++ b/roles/nagios_server/files/nagios/services/ssh.cfg
@@ -1,5 +1,12 @@
 define service {
-  hostgroup_name		servers
+  hostgroup_name		kvmServers
+  service_description		SSH
+  check_command			check_ssh
+  use				defaulttemplate
+}
+
+define service {
+  hostgroup_name		bastions
   service_description		SSH
   check_command			check_ssh
   use				defaulttemplate
diff --git a/roles/nagios_server/templates/nagios/hostgroups/qahardware.cfg b/roles/nagios_server/templates/nagios/hostgroups/qahardware.cfg
new file mode 100644
index 0000000000..fa204b16e6
--- /dev/null
+++ b/roles/nagios_server/templates/nagios/hostgroups/qahardware.cfg
@@ -0,0 +1,10 @@
+###############
+# KVM Servers
+###############
+
+define hostgroup {
+        hostgroup_name  qahardware
+        alias           qahardware
+        members         {% for host in groups['qahardware'] %}{{host}}{% if not loop.last %},{% endif %} {% endfor %}
+
+}