diff --git a/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org
new file mode 100644
index 0000000000..630904f95f
--- /dev/null
+++ b/inventory/host_vars/buildvm-aarch64-21.arm.fedoraproject.org
@@ -0,0 +1,4 @@
+---
+vmhost: aarch64-c21n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.171
+eth1_ip: 10.5.127.95
diff --git a/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org
new file mode 100644
index 0000000000..c21d81b2df
--- /dev/null
+++ b/inventory/host_vars/buildvm-aarch64-22.arm.fedoraproject.org
@@ -0,0 +1,4 @@
+---
+vmhost: aarch64-c22n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.172
+eth1_ip: 10.5.127.95
diff --git a/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org
new file mode 100644
index 0000000000..795fd9d955
--- /dev/null
+++ b/inventory/host_vars/buildvm-aarch64-23.arm.fedoraproject.org
@@ -0,0 +1,4 @@
+---
+vmhost: aarch64-c23n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.173
+eth1_ip: 10.5.127.95
diff --git a/inventory/host_vars/buildvm-aarch64-24.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-24.arm.fedoraproject.org
new file mode 100644
index 0000000000..7cc9edfa2e
--- /dev/null
+++ b/inventory/host_vars/buildvm-aarch64-24.arm.fedoraproject.org
@@ -0,0 +1,4 @@
+---
+vmhost: aarch64-c40n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.174
+eth1_ip: 10.5.127.95
diff --git a/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org
new file mode 100644
index 0000000000..4205b1faf2
--- /dev/null
+++ b/inventory/host_vars/buildvm-armv7-21.arm.fedoraproject.org
@@ -0,0 +1,3 @@
+---
+vmhost: aarch64-c21n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.175
diff --git a/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org
new file mode 100644
index 0000000000..ce7c5ceb35
--- /dev/null
+++ b/inventory/host_vars/buildvm-armv7-22.arm.fedoraproject.org
@@ -0,0 +1,3 @@
+---
+vmhost: aarch64-c22n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.176
diff --git a/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org
new file mode 100644
index 0000000000..ad8f634e6f
--- /dev/null
+++ b/inventory/host_vars/buildvm-armv7-23.arm.fedoraproject.org
@@ -0,0 +1,3 @@
+---
+vmhost: aarch64-c23n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.177
diff --git a/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org
new file mode 100644
index 0000000000..05798cbae6
--- /dev/null
+++ b/inventory/host_vars/buildvm-armv7-24.arm.fedoraproject.org
@@ -0,0 +1,3 @@
+---
+vmhost: aarch64-c24n1.arm.fedoraproject.org
+eth0_ip: 10.5.129.178
diff --git a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
index d7d1db6a3d..292a03af17 100644
--- a/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
+++ b/roles/dhcp_server/files/dhcpd.conf.noc01.phx2.fedoraproject.org
@@ -2330,5 +2330,37 @@ subnet 10.5.129.0 netmask 255.255.255.0 {
         filename "grubaa64.efi";
     }
 
+    host aarch64-c22n1 {
+        hardware ethernet 14:58:D0:58:25:02;
+        fixed-address 10.5.129.122;
+        next-server 10.5.126.41;
+        option host-name "aarch64-c22n1";
+        filename "grubaa64.efi";
+    }
+
+    host aarch64-c23n1 {
+        hardware ethernet 14:58:D0:58:05:72;
+        fixed-address 10.5.129.123;
+        next-server 10.5.126.41;
+        option host-name "aarch64-c23n1";
+        filename "grubaa64.efi";
+    }
+
+    host aarch64-c24n1 {
+        hardware ethernet 14:58:D0:58:35:C2;
+        fixed-address 10.5.129.124;
+        next-server 10.5.126.41;
+        option host-name "aarch64-c24n1";
+        filename "grubaa64.efi";
+    }
+
+    host aarch64-c25n1 {
+        hardware ethernet 14:58:D0:58:64:82;
+        fixed-address 10.5.129.125;
+        next-server 10.5.126.41;
+        option host-name "aarch64-c25n1";
+        filename "grubaa64.efi";
+    }
+
 }