diff --git a/roles/nagios_server/files/nagios/hosts/pkgs01.cfg b/roles/nagios_server/files/nagios/hosts/pkgs01.cfg
deleted file mode 100644
index 6046770008..0000000000
--- a/roles/nagios_server/files/nagios/hosts/pkgs01.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-define host {
-  host_name                    pkgs01
-  alias                        pkgs01.phx2.fedoraproject.org
-  use                          defaulttemplate
-  address                      pkgs01.phx2.fedoraproject.org
-  parents		       bvirthost07
-}
diff --git a/roles/nagios_server/files/nagios/hosts/pkgs02.cfg b/roles/nagios_server/files/nagios/hosts/pkgs02.cfg
new file mode 100644
index 0000000000..76cd09a098
--- /dev/null
+++ b/roles/nagios_server/files/nagios/hosts/pkgs02.cfg
@@ -0,0 +1,7 @@
+define host {
+  host_name                    pkgs02
+  alias                        pkgs02.phx2.fedoraproject.org
+  use                          defaulttemplate
+  address                      pkgs02.phx2.fedoraproject.org
+  parents		       bvirthost07
+}
diff --git a/roles/nagios_server/files/nagios/services/disk.cfg b/roles/nagios_server/files/nagios/services/disk.cfg
index 289a6c152f..04ae68909f 100644
--- a/roles/nagios_server/files/nagios/services/disk.cfg
+++ b/roles/nagios_server/files/nagios/services/disk.cfg
@@ -49,14 +49,14 @@ define service {
 #}
 
 define service {
-  host_name             pkgs01
+  host_name             pkgs02
   service_description   Check read-only filesystem
   check_command         check_by_nrpe!check_readonly_fs
   use                   disktemplate
 }
 
 define service {
-  host_name             pkgs01
+  host_name             pkgs02
   service_description   Disk space /srv/cache/lookaside
   check_command         check_by_nrpe!check_disk_/srv/cache/lookaside
   use                   disktemplate
diff --git a/roles/nagios_server/files/nagios/services/fedmsg.cfg b/roles/nagios_server/files/nagios/services/fedmsg.cfg
index caed034bcc..b47e64ae89 100644
--- a/roles/nagios_server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios_server/files/nagios/services/fedmsg.cfg
@@ -60,7 +60,7 @@ define service {
 }
 
 define service {
-  host_name             pkgs01
+  host_name             pkgs02
   service_description   Check for fedmsg-hub proc
   check_command         check_by_nrpe!check_fedmsg_hub_proc
   use                   defaulttemplate
@@ -299,7 +299,7 @@ define service {
 }
 
 define service {
-  host_name             pkgs01
+  host_name             pkgs02
   service_description   Check fedmsg consumers and producers hub
   check_command         check_by_nrpe!check_fedmsg_cp_pkgs
   use                   defaulttemplate
@@ -385,7 +385,7 @@ define service {
 }
 
 define service {
-  host_name             pkgs01
+  host_name             pkgs02
   service_description   Check fedmsg-hub consumers exceptions
   check_command         check_by_nrpe!check_fedmsg_cexceptions_pkgs
   use                   defaulttemplate
@@ -471,7 +471,7 @@ define service {
 }
 
 define service {
-  host_name             pkgs01
+  host_name             pkgs02
   service_description   Check fedmsg-hub consumers backlog
   check_command         check_by_nrpe!check_fedmsg_cbacklog_pkgs
   use                   defaulttemplate
diff --git a/roles/nagios_server/files/nagios/services/ssl.cfg b/roles/nagios_server/files/nagios/services/ssl.cfg
index 448916ae73..1d9105112f 100644
--- a/roles/nagios_server/files/nagios/services/ssl.cfg
+++ b/roles/nagios_server/files/nagios/services/ssl.cfg
@@ -27,7 +27,7 @@ define service {
 }
 
 define service {
-  host_name             pkgs01
+  host_name             pkgs02
   service_description   Pkgs SSL Cert
   check_command         check_ssl_cert!pkgs.fedoraproject.org!60
   use                   defaulttemplate
diff --git a/roles/nagios_server/files/nagios/services/websites.cfg b/roles/nagios_server/files/nagios/services/websites.cfg
index 0e0bcbf0cc..4be7883b2c 100644
--- a/roles/nagios_server/files/nagios/services/websites.cfg
+++ b/roles/nagios_server/files/nagios/services/websites.cfg
@@ -238,9 +238,9 @@ define service {
 }
 
 define service {
-  host_name             pkgs01
-  service_description   Cgit on pkgs01
-  check_command         check_website!pkgs01.phx2.fedoraproject.org!/cgit/!Description
+  host_name             pkgs02
+  service_description   Cgit on pkgs02
+  check_command         check_website!pkgs02.phx2.fedoraproject.org!/cgit/!Description
   use                   websitetemplate
 }