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 971db041bc..2543a8dd3d 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
@@ -262,17 +262,17 @@ shared-network cloud {
 		option host-name "fed-cloud09-int";
            }
 
-	   host fed-cloud10-int {
-	        hardware ethernet f0:1f:af:e2:69:16;
-		fixed-address 172.24.0.10;
-		option host-name "fed-cloud10-int";
-           }
+#	   host fed-cloud10-int {
+#	        hardware ethernet f0:1f:af:e2:69:16;
+#		fixed-address 172.24.0.10;
+#		option host-name "fed-cloud10-int";
+#           }
 
-	   host fed-cloud11-int {
-	        hardware ethernet f0:1f:af:e2:6d:1e;
-		fixed-address 172.24.0.11;
-		option host-name "fed-cloud11-int";
-           }
+#	   host fed-cloud11-int {
+#	        hardware ethernet f0:1f:af:e2:6d:1e;
+#		fixed-address 172.24.0.11;
+#		option host-name "fed-cloud11-int";
+#           }
 
 	   host fed-cloud12-int {
 	        hardware ethernet ec:f4:bb:d2:25:6d;
@@ -286,11 +286,11 @@ shared-network cloud {
 		option host-name "fed-cloud13-int";
            }
 
-	   host fed-cloud14-int {
-	        hardware ethernet ec:f4:bb:d2:97:7d;
-		fixed-address 172.24.0.14;
-		option host-name "fed-cloud14-int";
-           }
+#	   host fed-cloud14-int {
+#	        hardware ethernet ec:f4:bb:d2:97:7d;
+#		fixed-address 172.24.0.14;
+#		option host-name "fed-cloud14-int";
+#           }
 
 	   host fed-cloud15-int {
 	        hardware ethernet ec:f4:bb:d2:85:4d;
@@ -397,21 +397,21 @@ shared-network pubcloud {
          filename "pxelinux.0";
     }
 
-    host fed-cloud10 {
-         hardware ethernet f0:1f:af:e2:69:15;
-         fixed-address 209.132.184.10;
-         option host-name "fed-cloud10.cloud.fedoraproject.org";
-         next-server 209.132.184.17;
-         filename "pxelinux.0";
-    }
-
-    host fed-cloud11 {
-         hardware ethernet f0:1f:af:e2:6d:1d;
-         fixed-address 209.132.184.11;
-         option host-name "fed-cloud11.cloud.fedoraproject.org";
-         next-server 209.132.184.17;
-         filename "pxelinux.0";
-    }
+#    host fed-cloud10 {
+#         hardware ethernet f0:1f:af:e2:69:15;
+#         fixed-address 209.132.184.10;
+#         option host-name "fed-cloud10.cloud.fedoraproject.org";
+#         next-server 209.132.184.17;
+#         filename "pxelinux.0";
+#    }
+#
+#    host fed-cloud11 {
+#         hardware ethernet f0:1f:af:e2:6d:1d;
+#         fixed-address 209.132.184.11;
+#         option host-name "fed-cloud11.cloud.fedoraproject.org";
+#         next-server 209.132.184.17;
+#         filename "pxelinux.0";
+#    }
 
     host fed-cloud12 {
          hardware ethernet ec:f4:bb:d2:25:6c;
@@ -428,13 +428,13 @@ shared-network pubcloud {
          filename "pxelinux.0";
     }
 
-    host fed-cloud14 {
-         hardware ethernet ec:f4:bb:d2:97:7c;
-         fixed-address 209.132.184.14;
-         option host-name "fed-cloud14.cloud.fedoraproject.org";
-         next-server 209.132.184.17;
-         filename "pxelinux.0";
-    }
+#    host fed-cloud14 {
+#         hardware ethernet ec:f4:bb:d2:97:7c;
+#         fixed-address 209.132.184.14;
+#         option host-name "fed-cloud14.cloud.fedoraproject.org";
+#         next-server 209.132.184.17;
+#         filename "pxelinux.0";
+#    }
 
     host fed-cloud15 {
          hardware ethernet ec:f4:bb:d2:85:4c;
@@ -705,29 +705,29 @@ shared-network pubcloud {
           filename "pxelinux.0";
       }
 
-#      host os-storage-node12 {
-#          hardware ethernet TODO;
-#          fixed-address 38.145.48.22;
-#          option host-name "os-storage-node12.fedorainfracloud.org";
-#          next-server 38.145.48.10;
-#          filename "pxelinux.0";
-#      }
+      host os-storage-node12 {
+          hardware ethernet f0:1f:af:e2:6d:1d;
+          fixed-address 38.145.48.22;
+          option host-name "os-storage-node12.fedorainfracloud.org";
+          next-server 38.145.48.10;
+          filename "pxelinux.0";
+      }
 
-#      host os-storage-node13 {
-#          hardware ethernet TODO;
-#          fixed-address 38.145.48.23;
-#          option host-name "os-storage-node13.fedorainfracloud.org";
-#          next-server 38.145.48.10;
-#          filename "pxelinux.0";
-#      }
+      host os-storage-node13 {
+          hardware ethernet f0:1f:af:e2:69:15;
+          fixed-address 38.145.48.23;
+          option host-name "os-storage-node13.fedorainfracloud.org";
+          next-server 38.145.48.10;
+          filename "pxelinux.0";
+      }
 
-#      host os-storage-node14 {
-#          hardware ethernet TODO;
-#          fixed-address 38.145.48.24;
-#          option host-name "os-storage-node14.fedorainfracloud.org";
-#          next-server 38.145.48.10;
-#          filename "pxelinux.0";
-#      }
+      host os-storage-node14 {
+          hardware ethernet ec:f4:bb:d2:97:7c;
+          fixed-address 38.145.48.24;
+          option host-name "os-storage-node14.fedorainfracloud.org";
+          next-server 38.145.48.10;
+          filename "pxelinux.0";
+      }
 
 #      host virthost-ppc64le-os01 {
 #          hardware ethernet TODO;