diff --git a/roles/nagios_server/files/nagios/hostgroups/taskotron.cfg b/roles/nagios_server/files/nagios/hostgroups/taskotron.cfg
index bd33609a84..572c5808de 100644
--- a/roles/nagios_server/files/nagios/hostgroups/taskotron.cfg
+++ b/roles/nagios_server/files/nagios/hostgroups/taskotron.cfg
@@ -1,5 +1,11 @@
 define hostgroup {
         hostgroup_name  taskotron
-        alias           Taskotron Hosts
-        members         taskotron01.qa, resultsdb01.qa, taskotron-client22.qa,  taskotron-client23.qa,  taskotron-client24.qa,  taskotron-client25.qa
+        alias           Taskotron Production Hosts
+        members         taskotron01.qa, qa12.qa, qa13.qa
+}
+
+define hostgroup {
+        hostgroup_name  taskotron-stg
+        alias           Taskotron Staging Hosts
+        members         taskotron-stg01.qa, qa10.qa
 }
diff --git a/roles/nagios_server/files/nagios/hosts/taskotron-dev01.qa.fedoraproject.org.cfg b/roles/nagios_server/files/nagios/hosts/taskotron-dev01.qa.fedoraproject.org.cfg
new file mode 100644
index 0000000000..4c6c7c4120
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/taskotron-dev01.qa.fedoraproject.org.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    taskotron-dev01.qa
+  alias                        taskotron-dev01.qa.fedoraproject.org
+  use                          defaulttemplate
+  address                      taskotron-dev01.qa.fedoraproject.org
+  parents                      virthost-comm04
+}
diff --git a/roles/nagios_server/files/nagios/hosts/taskotron-stg01.qa.fedoraproject.org.cfg b/roles/nagios_server/files/nagios/hosts/taskotron-stg01.qa.fedoraproject.org.cfg
new file mode 100644
index 0000000000..32e5bf582b
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/taskotron-stg01.qa.fedoraproject.org.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    taskotron-stg01.qa
+  alias                        taskotron-stg01.qa.fedoraproject.org
+  use                          defaulttemplate
+  address                      taskotron-stg01.qa.fedoraproject.org
+  parents                      virthost-comm04
+}
diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index 211b82b5ba..4ae5fe090c 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -35,14 +35,14 @@ define service {
 }
 
 define service {
-  host_name            qa10.qa, qa11.qa, qa12.qa, qa13.qa
+  host_name            taskotron01.qa, taskotron-stg01.qa, taskotron-dev01.qa
   service_description   Disk Space /srv/buildmaster
   check_command                check_by_nrpe!check_disk_/srv/buildmaster
   use                   disktemplate
 }
 
 define service {
-  host_name            qa10.qa, qa11.qa, qa12.qa, qa13.qa
+  host_name            taskotron01.qa, taskotron-stg01.qa, taskotron-dev01.qa
   service_description   Disk Space /srv/taskotron
   check_command                check_by_nrpe!check_disk_/srv/taskotron
   use                   disktemplate