diff --git a/inventory/group_vars/buildvm_armv7 b/inventory/group_vars/buildvm_armv7
index bd9cd353f2..98b9e14ac9 100644
--- a/inventory/group_vars/buildvm_armv7
+++ b/inventory/group_vars/buildvm_armv7
@@ -6,8 +6,8 @@ mem_size: 40960
 max_mem_size: "{{ mem_size }}"
 num_cpus: 5
 max_cpu: "{{ num_cpus }}"
-ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-29-armv7
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/29/Server/armhfp/os/
+ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-armv7
+ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/armhfp/os/
 ansible_python_interpreter: "/usr/bin/python3"
 nm: 255.255.255.0
 gw: 10.5.129.254
diff --git a/inventory/host_vars/buildvm-armv7-01.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-01.arm.fedoraproject.org
index 0a7aae645b..8edb1c7e3c 100644
--- a/inventory/host_vars/buildvm-armv7-01.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-01.arm.fedoraproject.org
@@ -1,5 +1,3 @@
 ---
 vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org
 eth0_ip: 10.5.129.131
-ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-31-armv7
-ks_repo: http://10.5.126.23/pub/fedora/linux/releases/31/Server/armhfp/os/
diff --git a/inventory/host_vars/buildvm-armv7-02.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-02.arm.fedoraproject.org
index b335b11893..91eb7dc58d 100644
--- a/inventory/host_vars/buildvm-armv7-02.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-02.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c02n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org
 eth0_ip: 10.5.129.132
diff --git a/inventory/host_vars/buildvm-armv7-03.arm.fedoraproject.org b/inventory/host_vars/buildvm-armv7-03.arm.fedoraproject.org
index 80bcf4283f..ead2fa0dbd 100644
--- a/inventory/host_vars/buildvm-armv7-03.arm.fedoraproject.org
+++ b/inventory/host_vars/buildvm-armv7-03.arm.fedoraproject.org
@@ -1,3 +1,3 @@
 ---
-vmhost: aarch64-c03n1.arm.fedoraproject.org
+vmhost: buildvmhost-aarch64-10.arm.fedoraproject.org
 eth0_ip: 10.5.129.133