diff --git a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg
index 9a877efaed..a5f24caeae 100644
--- a/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg
+++ b/roles/nagios_server/files/nagios/services/iad2_internal/fedmsg.cfg
@@ -80,12 +80,14 @@ define service {
   use                   defaulttemplate
 }
 
-define service {
-  host_name             packages03.iad2.fedoraproject.org
-  service_description   Check for fedmsg-hub proc
-  check_command         check_by_nrpe!check_fedmsg_hub_proc
-  use                   defaulttemplate
-}
+# TODO: Uncomment this if it comes back in iad
+#define service {
+#  host_name             packages03.iad2.fedoraproject.org
+#  service_description   Check for fedmsg-hub proc
+#  check_command         check_by_nrpe!check_fedmsg_hub_proc
+#  use                   defaulttemplate
+#}
+
 define service {
   host_name             pdc-backend01.iad2.fedoraproject.org
   service_description   Check for fedmsg-hub proc
@@ -310,12 +312,14 @@ define service {
   use                   defaulttemplate
 }
 
-define service {
-  host_name             packages03.iad2.fedoraproject.org
-  service_description   Check fedmsg consumers and producers hub
-  check_command         check_by_nrpe!check_fedmsg_cp_packages_backend
-  use                   defaulttemplate
-}
+# TODO: Uncomment this if it comes back in iad
+#define service {
+#  host_name             packages03.iad2.fedoraproject.org
+#  service_description   Check fedmsg consumers and producers hub
+#  check_command         check_by_nrpe!check_fedmsg_cp_packages_backend
+#  use                   defaulttemplate
+#}
+
 define service {
   host_name             pdc-backend01.iad2.fedoraproject.org
   service_description   Check fedmsg consumers and producers hub
@@ -387,12 +391,14 @@ define service {
   use                   defaulttemplate
 }
 
-define service {
-  host_name             packages03.iad2.fedoraproject.org
-  service_description   Check fedmsg-hub consumers exceptions
-  check_command         check_by_nrpe!check_fedmsg_cexceptions_packages_backend
-  use                   defaulttemplate
-}
+# TODO: Uncomment this if it comes back in iad
+#define service {
+#  host_name             packages03.iad2.fedoraproject.org
+#  service_description   Check fedmsg-hub consumers exceptions
+#  check_command         check_by_nrpe!check_fedmsg_cexceptions_packages_backend
+#  use                   defaulttemplate
+#}
+
 define service {
   host_name             pdc-backend01.iad2.fedoraproject.org
   service_description   Check fedmsg-hub consumers exceptions
@@ -465,12 +471,13 @@ define service {
   use                   defaulttemplate
 }
 
-define service {
-  host_name             packages03.iad2.fedoraproject.org
-  service_description   Check fedmsg-hub consumers backlog
-  check_command         check_by_nrpe!check_fedmsg_cbacklog_packages_backend
-  use                   defaulttemplate
-}
+# TODO: Uncomment this if it comes back in iad
+#define service {
+#  host_name             packages03.iad2.fedoraproject.org
+#  service_description   Check fedmsg-hub consumers backlog
+#  check_command         check_by_nrpe!check_fedmsg_cbacklog_packages_backend
+#  use                   defaulttemplate
+#}
 
 define service {
   host_name             pdc-backend01.iad2.fedoraproject.org