diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 16a21520bb..a0bfabcf7d 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -144,3 +144,4 @@ exclude_hostgroups:
   - virt_guest
   - virt_host
   - iad2
+  - download_iad2
diff --git a/roles/nagios_client/templates/check_disk.cfg.j2 b/roles/nagios_client/templates/check_disk.cfg.j2
index 2df06ec110..27dff827db 100644
--- a/roles/nagios_client/templates/check_disk.cfg.j2
+++ b/roles/nagios_client/templates/check_disk.cfg.j2
@@ -11,7 +11,6 @@ command[check_disk_/project/]=/usr/lib64/nagios/plugins/check_disk -w 5% -c 1% -
 command[check_disk_/srv/buildmaster]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/buildmaster
 command[check_disk_/srv/cache/lookaside]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/cache/lookaside
 command[check_disk_/srv/diskimages]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/diskimages
-command[check_disk_/srv/taskotron]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/taskotron
 command[check_disk_/srv]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv
 command[check_disk_huge_/srv]=/usr/lib64/nagios/plugins/check_disk -w 5% -c 1% -p /srv
 command[check_disk_/u01]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /u01
diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index a8d56a3037..75a7f2442a 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -19,20 +19,6 @@ define service {
   use                   disktemplate
 }
 
-define service {
-  hostgroup_name        taskotron
-  service_description   Disk Space /srv/buildmaster
-  check_command         check_by_nrpe!check_disk_/srv/buildmaster
-  use                   disktemplate
-}
-
-define service {
-  hostgroup_name        taskotron
-  service_description   Disk Space /srv/taskotron
-  check_command         check_by_nrpe!check_disk_/srv/taskotron
-  use                   disktemplate
-}
-
 define service {
   host_name             log01.phx2.fedoraproject.org
   service_description   Disk space /var/log
diff --git a/roles/nagios_server/files/nrpe/nrpe.cfg b/roles/nagios_server/files/nrpe/nrpe.cfg
index 259adadebd..c99360b3bf 100644
--- a/roles/nagios_server/files/nrpe/nrpe.cfg
+++ b/roles/nagios_server/files/nrpe/nrpe.cfg
@@ -298,7 +298,6 @@ command[check_disk_/srv]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /
 command[check_disk_huge_/srv]=/usr/lib64/nagios/plugins/check_disk -w 5% -c 1% -p /srv
 command[check_disk_/srv/diskimages]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/diskimages
 command[check_disk_/srv/buildmaster]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/buildmaster
-command[check_disk_/srv/taskotron]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/taskotron
 command[check_disk_/var/lib64/mock]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /var/lib/mock
 command[check_disk_/var/log]=/usr/lib64/nagios/plugins/check_disk -w 15% -c 10% -p /var/log
 command[check_disk_/srv/cache/lookaside]=/usr/lib64/nagios/plugins/check_disk -w 20% -c 10% -p /srv/cache/lookaside
diff --git a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
index 2ccfcfcfa5..d8bf1e395f 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/bodhi.cfg.j2
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   bodhi
     alias               Bodhi
-    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-bodhi2, {% endif %} {% endfor %}
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-bodhi2{% if not loop.last %}, {% endif %}{% endif %} {% endfor %}
 
 }
diff --git a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
index 34ed997606..fa211d0acc 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/fp-wiki.cfg.j2
@@ -1,14 +1,14 @@
 define servicegroup {
     servicegroup_name   fp-wiki
     alias               Fedora Project Wiki
-    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki, {% endif %}{% endfor %}
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}
 
 }
 
 define servicegroup {
     servicegroup_name   fp-wiki-non-cached
     alias               Fedora Project Wiki
-    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki-non-cached, {% endif %}{% endfor %}
+    members             {% for host in groups['proxies']|sort %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-fedoraproject.org-wiki-non-cached{% if not loop.last %}, {% endif %}{% endif %}{% endfor %}
 
 }
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
index 73454f745d..9bb9ccde98 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/freemedia.cfg.j2
@@ -1,7 +1,7 @@
 define servicegroup {
     servicegroup_name   freemedia
     alias               FreeMedia
-    members             {% for host in groups['sundries'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-freemedia-internal, {% endif %} {% endfor %}
+    members             {% for host in groups['sundries'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, http-freemedia-internal{% if not loop.last %}, {% endif %}{% endif %} {% endfor %}
 
 }
 
diff --git a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2 b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
index ccab9ee464..edbcb3b508 100644
--- a/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
+++ b/roles/nagios_server/templates/nagios/servicegroups/ipa.cfg.j2
@@ -1,6 +1,6 @@
 define servicegroup {
     servicegroup_name   ipa
     alias               IPA Servers
-    members             {% for host in groups['ipa'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, IPA Replication Status , {% endif%}{% endfor %}
+    members             {% for host in groups['ipa'] %}{% if hostvars[host].nagios_Can_Connect == true %}{{host}}, IPA Replication Status{% if not loop.last %}, {% endif %}{% endif%}{% endfor %}
 
 }