diff --git a/inventory/group_vars/buildvm_aarch64 b/inventory/group_vars/buildvm_aarch64
index 6ba3c00185..8a40773fbe 100644
--- a/inventory/group_vars/buildvm_aarch64
+++ b/inventory/group_vars/buildvm_aarch64
@@ -10,7 +10,7 @@ csi_relationship: |
 csi_security_category: High
 dns: 10.3.163.33
 docker_registry: "candidate-registry.fedoraproject.org"
-gw: 10.3.170.254
+eth0_ipv4_gw: 10.3.170.254
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm_aarch64_stg b/inventory/group_vars/buildvm_aarch64_stg
index a92270ceac..ec4acc22f0 100644
--- a/inventory/group_vars/buildvm_aarch64_stg
+++ b/inventory/group_vars/buildvm_aarch64_stg
@@ -12,7 +12,7 @@ csi_security_category: High
 datacenter: staging
 dns: 10.3.163.33
 docker_registry: "candidate-registry.stg.fedoraproject.org"
-gw: 10.3.167.254
+eth0_ipv4_gw: 10.3.167.254
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm_armv7 b/inventory/group_vars/buildvm_armv7
index 2df91cd553..87e7e9b540 100644
--- a/inventory/group_vars/buildvm_armv7
+++ b/inventory/group_vars/buildvm_armv7
@@ -10,7 +10,7 @@ csi_relationship: |
 csi_security_category: High
 dns: 10.3.163.33
 docker_registry: "candidate-registry.fedoraproject.org"
-gw: 10.3.170.254
+eth0_ipv4_gw: 10.3.170.254
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm_armv7_stg b/inventory/group_vars/buildvm_armv7_stg
index 5412fba68c..55f822f395 100644
--- a/inventory/group_vars/buildvm_armv7_stg
+++ b/inventory/group_vars/buildvm_armv7_stg
@@ -12,7 +12,7 @@ csi_security_category: High
 datacenter: staging
 dns: 10.3.163.33
 docker_registry: "candidate-registry.stg.fedoraproject.org"
-gw: 10.3.167.254
+eth0_ipv4_gw: 10.3.167.254
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm_ppc64le b/inventory/group_vars/buildvm_ppc64le
index f3b79a5f69..8a84ef3b09 100644
--- a/inventory/group_vars/buildvm_ppc64le
+++ b/inventory/group_vars/buildvm_ppc64le
@@ -13,7 +13,7 @@ csi_relationship: |
 csi_security_category: High
 datacenter: iad2
 dns: 10.3.163.33
-gw: 10.3.171.254
+eth0_ipv4_gw: 10.3.171.254
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm_ppc64le_stg b/inventory/group_vars/buildvm_ppc64le_stg
index b870d853b5..4b63d4e2cd 100644
--- a/inventory/group_vars/buildvm_ppc64le_stg
+++ b/inventory/group_vars/buildvm_ppc64le_stg
@@ -12,7 +12,7 @@ csi_security_category: High
 datacenter: staging
 dns: 10.3.163.33
 docker_registry: "candidate-registry.stg.fedoraproject.org"
-gw: 10.3.167.254
+eth0_ipv4_gw: 10.3.167.254
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 host_group: kojibuilder
diff --git a/inventory/group_vars/buildvm_s390x b/inventory/group_vars/buildvm_s390x
index 93f3c9c045..8a7cdad22c 100644
--- a/inventory/group_vars/buildvm_s390x
+++ b/inventory/group_vars/buildvm_s390x
@@ -9,7 +9,7 @@ csi_relationship: |
   * Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
 csi_security_category: High
 dns: 10.3.163.33
-gw: 10.16.0.254
+eth0_ipv4_gw: 10.16.0.254
 host_group: kojibuilder
 koji_hub_nfs: "fedora_koji"
 koji_server_url: "https://koji.fedoraproject.org/kojihub"