diff --git a/inventory/inventory b/inventory/inventory
index 5800ff8226..fffd51d129 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -5,9 +5,6 @@
 grobisplitter01.phx2.fedoraproject.org
 
 [rabbitmq]
-rabbitmq01.phx2.fedoraproject.org
-rabbitmq02.phx2.fedoraproject.org
-rabbitmq03.phx2.fedoraproject.org
 rabbitmq01.iad2.fedoraproject.org
 rabbitmq02.iad2.fedoraproject.org
 rabbitmq03.iad2.fedoraproject.org
diff --git a/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2 b/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2
index 6a67248166..b68a41adca 100644
--- a/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2
+++ b/roles/nagios_client/templates/check_rabbitmq_cluster.cfg.j2
@@ -1 +1 @@
-command[check_rabbitmq_cluster]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_cluster --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini -n rabbit@rabbitmq01.phx2.fedoraproject.org,rabbit@rabbitmq02.phx2.fedoraproject.org,rabbit@rabbitmq03.phx2.fedoraproject.org
\ No newline at end of file
+command[check_rabbitmq_cluster]=/usr/lib64/nagios/plugins-rabbitmq/check_rabbitmq_cluster --extra-opts=common@/etc/nrpe.d/rabbitmq_args.ini -n rabbit@rabbitmq01.iad2.fedoraproject.org,rabbit@rabbitmq02.iad2.fedoraproject.org,rabbit@rabbitmq03.iad2.fedoraproject.org
diff --git a/roles/nagios_server/files/nagios/services/phx2_internal/rabbitmq.cfg b/roles/nagios_server/files/nagios/services/phx2_internal/rabbitmq.cfg
deleted file mode 100644
index 2078d3e1b9..0000000000
--- a/roles/nagios_server/files/nagios/services/phx2_internal/rabbitmq.cfg
+++ /dev/null
@@ -1,96 +0,0 @@
-# RabbitMQ processes (for each host)
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus server processes
-  check_command         check_by_nrpe!check_rabbitmq_server
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq02.phx2.fedoraproject.org
-  service_description   Check bus server processes
-  check_command         check_by_nrpe!check_rabbitmq_server
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq03.phx2.fedoraproject.org
-  service_description   Check bus server processes
-  check_command         check_by_nrpe!check_rabbitmq_server
-  use                   defaulttemplate
-}
-
-# RabbitMQ alarms (for each host)
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus server alarms
-  check_command         check_by_nrpe!check_rabbitmq_watermark
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq02.phx2.fedoraproject.org
-  service_description   Check bus server alarms
-  check_command         check_by_nrpe!check_rabbitmq_watermark
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq03.phx2.fedoraproject.org
-  service_description   Check bus server alarms
-  check_command         check_by_nrpe!check_rabbitmq_watermark
-  use                   defaulttemplate
-}
-
-# The following results are cluster-wide, no need to run them on each cluster member
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus cluster
-  check_command         check_by_nrpe!check_rabbitmq_cluster
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus cluster connections
-  check_command         check_by_nrpe!check_rabbitmq_connections
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus cluster overview
-  check_command         check_by_nrpe!check_rabbitmq_overview
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus exchanges in /pubsub
-  check_command         check_by_nrpe!check_rabbitmq_exchange_pubsub
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus exchanges in /public_pubsub
-  check_command         check_by_nrpe!check_rabbitmq_exchange_public_pubsub
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus queues in /pubsub
-  check_command         check_by_nrpe!check_rabbitmq_queue_pubsub
-  use                   defaulttemplate
-}
-
-define service {
-  host_name             rabbitmq01.phx2.fedoraproject.org
-  service_description   Check bus queues in /public_pubsub
-  check_command         check_by_nrpe!check_rabbitmq_queue_public_pubsub
-  use                   defaulttemplate
-}
\ No newline at end of file
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index 5a7027bec3..bd606e8f02 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -189,7 +189,6 @@
     - nrpe.cfg
     - osbs.cfg
     - pgsql.cfg
-    - rabbitmq.cfg
   tags:
   - nagios_config
   - nagios_server
@@ -197,6 +196,30 @@
   when: env == "production" and nagios_location == 'phx2_internal'
   notify: restart nagios
 
+- name: Copy /etc/nagios/services (PHX2 specific files)
+  copy: src=nagios/services/phx2_internal/{{ item }} dest=/etc/nagios/services/{{ item }}
+  with_items:
+    - basset.cfg
+    - certgetter.cfg
+    - db_backups.cfg
+    - disk.cfg
+    - fedmsg.cfg
+    - file_age.cfg
+    - fmn.cfg
+    - koji.cfg
+    - locking.cfg
+    - mailman.cfg
+    - nrpe.cfg
+    - osbs.cfg
+    - pgsql.cfg
+    - rabbitmq.cfg
+  tags:
+  - nagios_config
+  - nagios_server
+  - nagios_hostgroups
+  when: env == "production" and nagios_location == 'iad2_internal'
+  notify: restart nagios
+
 - name: Copy /etc/nagios/services (internal files)
   copy: src=nagios/services/{{ item }} dest=/etc/nagios/services/{{ item }}
   with_items: