diff --git a/inventory/inventory b/inventory/inventory
index 2973527942..fa91c0772d 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -68,9 +68,6 @@ badges-web02.phx2.fedoraproject.org
 [badges-web-stg]
 badges-web01.stg.phx2.fedoraproject.org
 
-[bapp]
-bapp02.phx2.fedoraproject.org
-
 [bastion]
 bastion01.phx2.fedoraproject.org
 bastion02.phx2.fedoraproject.org
@@ -888,7 +885,6 @@ packages
 koji
 releng
 dbserver
-bapp
 
 [groupa]
 secondary01.phx2.fedoraproject.org
diff --git a/roles/base/files/syncHttpLogs.sh b/roles/base/files/syncHttpLogs.sh
index 4744473cdd..83d6749c06 100644
--- a/roles/base/files/syncHttpLogs.sh
+++ b/roles/base/files/syncHttpLogs.sh
@@ -40,7 +40,6 @@ syncHttpLogs proxy09.vpn.fedoraproject.org
 syncHttpLogs proxy10.phx2.fedoraproject.org
 syncHttpLogs proxy11.vpn.fedoraproject.org
 syncHttpLogs proxy01.stg.phx2.fedoraproject.org
-syncHttpLogs bapp02.phx2.fedoraproject.org
 syncHttpLogs fas01.phx2.fedoraproject.org
 syncHttpLogs fas02.phx2.fedoraproject.org
 syncHttpLogs fas03.phx2.fedoraproject.org
diff --git a/roles/nagios_server/files/nagios/hosts/bapp02.cfg b/roles/nagios_server/files/nagios/hosts/bapp02.cfg
index 670b38bd07..3e8f2f53be 100644
--- a/roles/nagios_server/files/nagios/hosts/bapp02.cfg
+++ b/roles/nagios_server/files/nagios/hosts/bapp02.cfg
@@ -1,7 +1,7 @@
-define host {
-  host_name                    bapp02
-  alias                        bapp02.phx2.fedoraproject.org
-  use                          defaulttemplate
-  address                      bapp02.phx2.fedoraproject.org
-  parents		       virthost06
-}
+#define host {
+#  host_name                    bapp02
+#  alias                        bapp02.phx2.fedoraproject.org
+#  use                          defaulttemplate
+#  address                      bapp02.phx2.fedoraproject.org
+#  parents		       virthost06
+#}
diff --git a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
index 01e72f62a3..58f15e6adf 100644
--- a/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
+++ b/roles/nagios_server/files/nagios/servicedeps/nrpe.cfg
@@ -43,14 +43,14 @@ define servicedependency {
         execution_failure_criteria      w,c
 }
 
-define servicedependency {
-        host_name                      	bapp02
-        service_description            	nrpe 
-        dependent_host_name            	bapp02
-        dependent_service_description 	 Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes
-        notification_failure_criteria   w,c
-        execution_failure_criteria      w,c
-}
+#define servicedependency {
+#        host_name                      	bapp02
+#        service_description            	nrpe 
+#        dependent_host_name            	bapp02
+#        dependent_service_description 	 Check Raid, Cron Daemon, Disk Space /, Swap, Total Processes, Zombie Processes
+#        notification_failure_criteria   w,c
+#        execution_failure_criteria      w,c
+#}
 
 define servicedependency {
         host_name                      	bastion02
diff --git a/roles/nagios_server/files/nagios/services/nrpe.cfg b/roles/nagios_server/files/nagios/services/nrpe.cfg
index f7bdeee47c..53e47c9219 100644
--- a/roles/nagios_server/files/nagios/services/nrpe.cfg
+++ b/roles/nagios_server/files/nagios/services/nrpe.cfg
@@ -1,5 +1,5 @@
 define service {
-  host_name		hosted03, bapp02, bastion02, bastion01, bastion-vpn, bodhost01, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg
+  host_name		hosted03, bastion02, bastion01, bastion-vpn, bodhost01, sundries01, sundries01.stg, sundries02, wiki01, wiki01.stg, wiki02, pkgdb01, pkgdb02, pkgdb01.stg
   service_description   nrpe 
   check_command		test_nrpe
   max_check_attempts    2