diff --git a/inventory/group_vars/nagios b/inventory/group_vars/nagios
index 894faa6315..2e6b8275ed 100644
--- a/inventory/group_vars/nagios
+++ b/inventory/group_vars/nagios
@@ -59,9 +59,18 @@ phx2_management_hosts:
   - dell-fx02-07.mgmt.fedoraproject.org
   - dell-fx02-08.mgmt.fedoraproject.org
   - dell-fx02.mgmt.fedoraproject.org
-  - cloud-fx02-01.mgmt.fedoraproject.org
-  - cloud-fx02-02.mgmt.fedoraproject.org
-  - cloud-fx02-03.mgmt.fedoraproject.org
+  - cloud-fx01.mgmt.fedoraproject.org
+  - control01.mgmt.fedoraproject.org
+  - control02.mgmt.fedoraproject.org
+  - cn-x86-64-01-03.mgmt.fedoraproject.org
+  - cn-x86-64-01-04.mgmt.fedoraproject.org
+  - cn-x86-64-01-05.mgmt.fedoraproject.org
+  - cn-x86-64-01-06.mgmt.fedoraproject.org
+  - cn-x86-64-01-07.mgmt.fedoraproject.org
+  - cn-x86-64-01-08.mgmt.fedoraproject.org
+  - cn-x86-64-02-01.mgmt.fedoraproject.org
+  - cn-x86-64-02-02.mgmt.fedoraproject.org
+  - cn-x86-64-02-03.mgmt.fedoraproject.org
   - cloud-fx02.mgmt.fedoraproject.org
   - download01.mgmt.fedoraproject.org
   - download02.mgmt.fedoraproject.org
diff --git a/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org
index 2b64fcade8..123fa04c23 100644
--- a/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.cloud-noc01.cloud.fedoraproject.org
@@ -47,6 +47,79 @@ shared-network cloud {
                filename "pxelinux.0";
            }
 
+           host cn-x86-64-01-03 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.11;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-01-04 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.12;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-01-05 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.13;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-01-06 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.14;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-01-07 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.15;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-01-08 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.16;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-02-01 {
+               hardware ethernet 48:4D:7E:05:4E:F4;
+               fixed-address 172.23.1.17;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-02-02 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.18;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+           host cn-x86-64-02-03 {
+               hardware ethernet aa:aa:aa:aa:aa:aa;
+               fixed-address 172.23.1.19;
+               option host-name "cn-x86-64-01-03.cloud.fedoraproject.org";
+               next-server 172.23.1.1;
+               filename "pxelinux.0";
+           }
+
+
 
            # Transitional
     	   host arm03-packager00-mgmt {