diff --git a/inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org
index b1213d641b..30572a6cdd 100644
--- a/inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/ocp01.ocp.stg.iad2.fedoraproject.org
@@ -25,7 +25,7 @@ nm: 255.255.255.0
 gw: "{{ eth0_ipv4_gw }}"
 dns: "{{ dns1 }}"
  
-mac0: "52:54:00:CE:A2:AC"
+mac0: "{{ ansible_default_ipv4.macaddress }}"
 
 rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign"
 rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz"
diff --git a/inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org
index 0736c80629..9055eda7a3 100644
--- a/inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/ocp02.ocp.stg.iad2.fedoraproject.org
@@ -25,7 +25,7 @@ nm: 255.255.255.0
 gw: "{{ eth0_ipv4_gw }}"
 dns: "{{ dns1 }}"
  
-mac0: "52:54:00:CE:A3:24"
+mac0: "{{ ansible_default_ipv4.macaddress }}"
 
 rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign"
 rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz"
diff --git a/inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org b/inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org
index 4fb1fdc918..8d44be51b4 100644
--- a/inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/ocp03.ocp.stg.iad2.fedoraproject.org
@@ -25,7 +25,7 @@ nm: 255.255.255.0
 gw: "{{ eth0_ipv4_gw }}"
 dns: "{{ dns1 }}"
  
-mac0: "52:54:00:CE:A5:10"
+mac0: "{{ ansible_default_ipv4.macaddress }}"
 
 rhcos_ignition_file_url: "http://10.3.166.50/rhcos/controlplane.ign"
 rhcos_install_img_url: "http://10.3.166.50/rhcos/rhcos-{{ rhcos_version }}-x86_64-metal.x86_64.raw.gz"
diff --git a/playbooks/manual/ocp4-place-ignitionfiles.yml b/playbooks/manual/ocp4-place-ignitionfiles.yml
index 9353e8cdf3..e34e8a289d 100644
--- a/playbooks/manual/ocp4-place-ignitionfiles.yml
+++ b/playbooks/manual/ocp4-place-ignitionfiles.yml
@@ -18,7 +18,6 @@
 #  deploy_host: # http server serving ignition files
 - hosts: os_control_stg:ocp_controlplane_stg:ocp_workers_stg:ocp_boostrap_stg:ocp_vms_stg
   user: root
-  gather_facts: false
 
   tasks:
     - block:
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
index 427f9fae05..6e66310056 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -549,27 +549,6 @@ host centos01 {
 }
 
 # Staging network
-host ocp01-ocp-stg {
-     hardware ethernet 52:54:00:CE:A2:AC;
-     fixed-address 10.3.166.115;
-     next-server 10.3.163.10;
-     option routers 10.3.166.254;
-     option subnet-mask 255.255.255.0;
-}
-host ocp02-ocp-stg {
-     hardware ethernet 52:54:00:CE:A3:24;
-     fixed-address 10.3.166.116;
-     next-server 10.3.163.10;
-     option routers 10.3.166.254;
-     option subnet-mask 255.255.255.0;
-}
-host ocp03-ocp-stg {
-     hardware ethernet 52:54:00:CE:A5:10;
-     fixed-address 10.3.166.117;
-     next-server 10.3.163.10;
-     option routers 10.3.166.254;
-     option subnet-mask 255.255.255.0;
-}
 host worker01-ocp-stg {
      hardware ethernet 68:05:CA:CE:A2:AC;
      fixed-address 10.3.166.118;