diff --git a/roles/nagios/server/files/nagios/hosts/autocloud-backend01.cfg b/roles/nagios/server/files/nagios/hosts/autocloud-backend01.cfg
index 9b3c6e9b36..ae696754ff 100644
--- a/roles/nagios/server/files/nagios/hosts/autocloud-backend01.cfg
+++ b/roles/nagios/server/files/nagios/hosts/autocloud-backend01.cfg
@@ -1,6 +1,6 @@
 define host {
-  host_name                    autocloud-backend-libvirt
-  alias                        autocloud-backend-libvirt.phx2.fedoraproject.org
+  host_name                    autocloud-backend-libvirt2
+  alias                        autocloud-backend-libvirt2.phx2.fedoraproject.org
   use                          defaulttemplate
-  address                      autocloud-backend-libvirt.phx2.fedoraproject.org
+  address                      autocloud-backend-libvirt2.phx2.fedoraproject.org
 }
diff --git a/roles/nagios/server/files/nagios/hosts/autocloud-backend02.cfg b/roles/nagios/server/files/nagios/hosts/autocloud-backend02.cfg
index 013dea6199..d7d0f5db2c 100644
--- a/roles/nagios/server/files/nagios/hosts/autocloud-backend02.cfg
+++ b/roles/nagios/server/files/nagios/hosts/autocloud-backend02.cfg
@@ -1,6 +1,6 @@
 define host {
-  host_name                    autocloud-backend-vbox
-  alias                        autocloud-backend-vbox.phx2.fedoraproject.org
+  host_name                    autocloud-backend-vbox2
+  alias                        autocloud-backend-vbox2.phx2.fedoraproject.org
   use                          defaulttemplate
-  address                      autocloud-backend-vbox.phx2.fedoraproject.org
+  address                      autocloud-backend-vbox2.phx2.fedoraproject.org
 }
diff --git a/roles/nagios/server/files/nagios/services/autocloud.cfg b/roles/nagios/server/files/nagios/services/autocloud.cfg
index dd99b3b4db..28dcb8f7fd 100644
--- a/roles/nagios/server/files/nagios/services/autocloud.cfg
+++ b/roles/nagios/server/files/nagios/services/autocloud.cfg
@@ -1,12 +1,12 @@
 define service {
-  host_name             autocloud-backend-libvirt,autocloud-backend-vbox
+  host_name             autocloud-backend-libvirt2,autocloud-backend-vbox2
   service_description   Check for autocloud proc
   check_command         check_by_nrpe!check_autocloud_proc
   use                   defaulttemplate
 }
 
 define service {
-  host_name             autocloud-backend-libvirt,autocloud-backend-vbox
+  host_name             autocloud-backend-libvirt2,autocloud-backend-vbox2
   service_description   Check for redis proc
   check_command         check_by_nrpe!check_redis_proc
   use                   defaulttemplate
diff --git a/roles/nagios/server/files/nagios/services/fedmsg.cfg b/roles/nagios/server/files/nagios/services/fedmsg.cfg
index f97bceab74..7012d87dc7 100644
--- a/roles/nagios/server/files/nagios/services/fedmsg.cfg
+++ b/roles/nagios/server/files/nagios/services/fedmsg.cfg
@@ -94,7 +94,7 @@ define service {
   use                   defaulttemplate
 }
 define service {
-  host_name             autocloud-backend-libvirt,autocloud-backend-vbox
+  host_name             autocloud-backend-libvirt2,autocloud-backend-vbox2
   service_description   Check for fedmsg-hub proc
   check_command         check_by_nrpe!check_fedmsg_hub_proc
   use                   defaulttemplate
@@ -416,7 +416,7 @@ define service {
 }
 
 define service {
-  host_name             autocloud-backend-libvirt,autocloud-backend-vbox
+  host_name             autocloud-backend-libvirt2,autocloud-backend-vbox2
   service_description   Check fedmsg consumers and producers hub
   check_command         check_by_nrpe!check_fedmsg_cp_autocloud_backend
   use                   defaulttemplate
@@ -548,7 +548,7 @@ define service {
 }
 
 define service {
-  host_name             autocloud-backend-libvirt,autocloud-backend-vbox
+  host_name             autocloud-backend-libvirt2,autocloud-backend-vbox2
   service_description   Check fedmsg-hub consumers exceptions
   check_command         check_by_nrpe!check_fedmsg_cexceptions_autocloud_backend
   use                   defaulttemplate
@@ -684,7 +684,7 @@ define service {
 }
 
 define service {
-  host_name             autocloud-backend-libvirt,autocloud-backend-vbox
+  host_name             autocloud-backend-libvirt2,autocloud-backend-vbox2
   service_description   Check fedmsg-hub consumers backlog
   check_command         check_by_nrpe!check_fedmsg_cbacklog_autocloud_backend
   use                   defaulttemplate