diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64
index 9dabb3b56e..af4c105a8f 100644
--- a/inventory/group_vars/buildvm_aarch64
+++ b/inventory/group_vars/buildvm_aarch64
@@ -20,13 +20,13 @@ koji_root: "koji.fedoraproject.org/koji"
 koji_server_url: "https://koji.fedoraproject.org/kojihub"
 koji_topurl: "https://kojipkgs.fedoraproject.org/"
 koji_weburl: "https://koji.fedoraproject.org/koji"
-ks_repo: http://10.3.163.35/pub/fedora/linux/releases/38/Server/aarch64/os/
+ks_repo: http://10.3.163.35/pub/fedora/linux/releases/39/Server/aarch64/os/
 ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora
 lvm_size: 300000
 max_cpu: "{{ num_cpus }}"
 max_mem_size: "{{ mem_size }}"
 mem_size: 36864
-num_cpus: 8
+num_cpus: 12
 # These variables are for koji-containerbuild/osbs
 osbs_url: "osbs.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
diff --git a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org
index 761f717837..547ed6fc44 100644
--- a/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-01.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.91
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org
index fbfe714507..35f51def37 100644
--- a/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-02.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.92
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org
index 3cc0f72bfa..94f0a0ec55 100644
--- a/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-03.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.93
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org
index b1c291aa48..1ff276a6d0 100644
--- a/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-04.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.94
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org
index b36a08c67d..5addd8d6fe 100644
--- a/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-05.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.95
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org
index dc8454829a..31227aef2a 100644
--- a/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-06.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.96
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org
index 05c23a4a15..c6f84c9704 100644
--- a/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-07.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.97
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org
index 72e6910626..63c47ee6fd 100644
--- a/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-08.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.98
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org
index 84cb3eb162..907dd05400 100644
--- a/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-09.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.99
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org
diff --git a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org b/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org
index e60266c125..d1926fdcc5 100644
--- a/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/buildvm-a64-10.iad2.fedoraproject.org
@@ -1,4 +1,4 @@
 ---
 datacenter: iad2
 eth0_ipv4_ip: 10.3.170.100
-vmhost: bvmhost-a64-12.iad2.fedoraproject.org
+vmhost: bvmhost-a64-01.iad2.fedoraproject.org