diff --git a/inventory/builders b/inventory/builders
index c9e9091587..1a23a42d86 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -201,7 +201,6 @@ bvmhost-a64-12.iad2.fedoraproject.org
 bvmhost-a64-13.iad2.fedoraproject.org
 bvmhost-a64-14.iad2.fedoraproject.org
 bvmhost-a64-15.iad2.fedoraproject.org
-bvmhost-a64-16.iad2.fedoraproject.org
 # These are lenovo emags in IAD2
 bvmhost-a64-01.stg.iad2.fedoraproject.org
 bvmhost-a64-osbs-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/bvmhost-a64-16.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-16.iad2.fedoraproject.org
deleted file mode 100644
index 1ede7bd57b..0000000000
--- a/inventory/host_vars/bvmhost-a64-16.iad2.fedoraproject.org
+++ /dev/null
@@ -1,36 +0,0 @@
----
-br0_ipv4: 10.3.170.27
-br0_ipv4_gw: 10.3.170.254
-br0_ipv4_nm: 24
-br0_port0_mac: "{{ mac2 }}"
-datacenter: iad2
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-has_ipv4: yes
-mac2: 0c:42:a1:5a:08:b0
-nbde: false
-network_connections:
-  - autoconnect: yes
-    ip:
-      address:
-        - "{{ br0_ipv4 }}/{{ br0_ipv4_nm }}"
-      dhcp4: no
-      dns:
-        - "{{ dns1 }}"
-        - "{{ dns2 }}"
-      dns_search:
-        - "{{ dns_search1 }}"
-        - "{{ dns_search2 }}"
-      gateway4: "{{ br0_ipv4_gw }}"
-    name: br0
-    state: up
-    type: bridge
-    mtu: 9000
-  - mac: "{{ br0_port0_mac }}"
-    master: br0
-    name: br0-port0
-    state: up
-    type: ethernet
-    mtu: 9000
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 4d176b5525..8ab16571de 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.iad2.fedoraproject.org
@@ -1774,13 +1774,13 @@ host bvmhost-a64-16-mgmt {
      option host-name "bvmhost-a64-16-mgmt";
 }
 
-host bvmhost-a64-16 {
+host openqa-a64-worker04 {
      hardware ethernet 0c:42:a1:5a:08:b0;
-     fixed-address 10.3.170.27;
-     option host-name "bvmhost-a64-16";
+     fixed-address 10.3.174.64;
+     option host-name "openqa-a64-worker04";
      filename "uefi/grubaa64.efi";
      next-server 10.3.163.10;
-     option routers 10.3.170.254;
+     option routers 10.3.174.254;
      option subnet-mask 255.255.255.0;
 }