diff --git a/inventory/builders b/inventory/builders
index c9bbb1b084..a2b421651f 100644
--- a/inventory/builders
+++ b/inventory/builders
@@ -95,8 +95,6 @@ buildvm-a64-38.iad2.fedoraproject.org
 buildvm-a64-39.iad2.fedoraproject.org
 buildvm-a64-40.iad2.fedoraproject.org
 
-[buildvm_s390x_zvm]
-
 [buildvm_s390x_kvm]
 buildvm-s390x-01.s390.fedoraproject.org
 buildvm-s390x-02.s390.fedoraproject.org
@@ -130,7 +128,6 @@ buildvm-s390x-13.s390.fedoraproject.org
 buildvm-s390x-14.s390.fedoraproject.org
 
 [buildvm_s390x:children]
-buildvm_s390x_zvm
 buildvm_s390x_kvm
 
 [bvmhost_s390x]
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index 9251c93b65..c1f54d3463 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -20,7 +20,7 @@ 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/39/Server/x86_64/os/
+ks_repo: http://10.3.163.35/pub/fedora/linux/releases/40/Server/x86_64/os/
 ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora
 lvm_size: 262144
 max_mem_size: "{{ mem_size }}"
diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64
index 68844a186d..c73d8b4c42 100644
--- a/inventory/group_vars/buildvm_aarch64
+++ b/inventory/group_vars/buildvm_aarch64
@@ -20,7 +20,7 @@ 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/39/Server/aarch64/os/
+ks_repo: http://10.3.163.35/pub/fedora/linux/releases/40/Server/aarch64/os/
 ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora
 lvm_size: 300000
 max_cpu: "{{ num_cpus }}"
diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le
index be1c97f802..28aadea18c 100644
--- a/inventory/group_vars/buildvm_ppc64le
+++ b/inventory/group_vars/buildvm_ppc64le
@@ -21,7 +21,7 @@ koji_hub_nfs: "fedora_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-secondary/releases/39/Server/ppc64le/os/
+ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/40/Server/ppc64le/os/
 ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora
 lvm_size: 600000
 #
diff --git a/inventory/group_vars/buildvm_s390x_kvm b/inventory/group_vars/buildvm_s390x_kvm
index 7151237abc..223590c0ee 100644
--- a/inventory/group_vars/buildvm_s390x_kvm
+++ b/inventory/group_vars/buildvm_s390x_kvm
@@ -4,7 +4,7 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 eth0_ipv4_gw: 10.16.0.254
-ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/39/Server/s390x/os/
+ks_repo: http://10.3.163.35/pub/fedora-secondary/releases/40/Server/s390x/os/
 ks_url: http://10.3.163.35/repo/rhel/ks/kvm-fedora
 lvm_size: 102400
 main_bridge: vmbr
diff --git a/inventory/group_vars/buildvm_s390x_zvm b/inventory/group_vars/buildvm_s390x_zvm
deleted file mode 100644
index 08125b1390..0000000000
--- a/inventory/group_vars/buildvm_s390x_zvm
+++ /dev/null
@@ -1,26 +0,0 @@
----
-dns1: 10.3.163.33
-dns2: 10.3.163.34
-dns_search1: "iad2.fedoraproject.org"
-dns_search2: "fedoraproject.org"
-enc900_ipv4_gw: 10.16.0.254
-enc900_ipv4_nm: 24
-has_ipv4: yes
-#network_connections:
-#  - autoconnect: yes
-#    ip:
-#      address:
-#        - "{{ enc900_ipv4_ip }}/{{ enc900_ipv4_nm }}"
-#      dhcp4: no
-#      dns:
-#        - "{{ dns1 }}"
-#        - "{{ dns2 }}"
-#      dns_search:
-#        - "{{ dns_search1 }}"
-#        - "{{ dns_search2 }}"
-#      gateway4: "{{ enc900_ipv4_gw }}"
-#    mac: "{{ ansible_default_ipv4.macaddress }}"
-#    name: enc900
-#    state: up
-#    type: ethernet
-varnish_group: s390kojipkgs