diff --git a/roles/nagios_server/files/nagios/hostgroups/web.cfg b/roles/nagios_server/files/nagios/hostgroups/web.cfg
index 4abb3eab19..31646079c6 100644
--- a/roles/nagios_server/files/nagios/hostgroups/web.cfg
+++ b/roles/nagios_server/files/nagios/hostgroups/web.cfg
@@ -5,5 +5,5 @@
 define hostgroup {
         hostgroup_name  webservers
         alias           webservers
-        members         proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy09, proxy10, proxy11, fas01, fas02, fas03, status-fedora2, fedoauth01, fedoauth02, proxy09
+        members         proxy01, proxy02, proxy03, proxy04, proxy05, proxy06, proxy07, proxy08, proxy09, proxy10, proxy11, fas01, fas02, fas03, status-fedora2, ipsilon01, ipsilon02, proxy09
 }
diff --git a/roles/nagios_server/files/nagios/hosts/fedoauth01.cfg b/roles/nagios_server/files/nagios/hosts/fedoauth01.cfg
deleted file mode 100644
index 8295007280..0000000000
--- a/roles/nagios_server/files/nagios/hosts/fedoauth01.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-define host {
-  host_name                    fedoauth01
-  alias                        fedoauth01.phx2.fedoraproject.org
-  use                          defaulttemplate
-  address                      fedoauth01.phx2.fedoraproject.org
-  parents                      virthost07
-}
diff --git a/roles/nagios_server/files/nagios/hosts/fedoauth02.cfg b/roles/nagios_server/files/nagios/hosts/fedoauth02.cfg
deleted file mode 100644
index 18f0b3060b..0000000000
--- a/roles/nagios_server/files/nagios/hosts/fedoauth02.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-define host {
-  host_name                    fedoauth02
-  alias                        fedoauth02.phx2.fedoraproject.org
-  use                          defaulttemplate
-  address                      fedoauth02.phx2.fedoraproject.org
-  parents                      virthost09
-}
diff --git a/roles/nagios_server/files/nagios/hosts/ipsilon01.cfg b/roles/nagios_server/files/nagios/hosts/ipsilon01.cfg
new file mode 100644
index 0000000000..5ebf4832a9
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/ipsilon01.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    ipsilon01
+  alias                        ipsilon01.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      ipsilon01.phx2.fedoraproject.org
+  parents                      virthost15
+}
diff --git a/roles/nagios_server/files/nagios/hosts/ipsilon02.cfg b/roles/nagios_server/files/nagios/hosts/ipsilon02.cfg
new file mode 100644
index 0000000000..d0b8c01ea6
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/ipsilon02.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    ipsilon02
+  alias                        ipsilon02.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      ipsilon02.phx2.fedoraproject.org
+  parents                      virthost17
+}
diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg
index 4c039b80e4..d7b9b2177b 100644
--- a/roles/nagios_server/files/nagios/services/websites.cfg
+++ b/roles/nagios_server/files/nagios/services/websites.cfg
@@ -153,8 +153,8 @@ define service {
 }
 
 define service {
-  host_name             fedoauth01,fedoauth02
-  service_description   fedoauth-internal
+  host_name             ipsilon01,ipsilon02
+  service_description   ipsilon-internal
   check_command         check_website!localhost!/!Federated Open Authentication
   max_check_attempts    8
   use                   internalwebsitetemplate