diff --git a/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org
index 86351fa55b..ae17ad978e 100644
--- a/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-15.s390.fedoraproject.org
@@ -6,9 +6,7 @@ dns_search2: "fedoraproject.org"
 eth0_ipv4: 10.16.0.26
 eth0_ipv4_gw: 10.16.0.254
 eth0_ipv4_nm: 24
-eth0_mac: "{{ mac0 }}"
 has_ipv4: yes
-mac0: 52:54:00:a2:30:f8
 network_connections:
   - autoconnect: yes
     ip:
@@ -22,7 +20,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     state: up
     type: ethernet
diff --git a/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org
index 41f3240199..afc7a02897 100644
--- a/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-16.s390.fedoraproject.org
@@ -6,9 +6,7 @@ dns_search2: "fedoraproject.org"
 eth0_ipv4: 10.16.0.27
 eth0_ipv4_gw: 10.16.0.254
 eth0_ipv4_nm: 24
-eth0_mac: "{{ mac0 }}"
 has_ipv4: yes
-mac0: 52:54:00:b9:2c:93
 network_connections:
   - autoconnect: yes
     ip:
@@ -22,7 +20,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     state: up
     type: ethernet
diff --git a/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org
index ca0524d302..7c78c60e23 100644
--- a/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-17.s390.fedoraproject.org
@@ -6,9 +6,7 @@ dns_search2: "fedoraproject.org"
 eth0_ipv4: 10.16.0.28
 eth0_ipv4_gw: 10.16.0.254
 eth0_ipv4_nm: 24
-eth0_mac: "{{ mac0 }}"
 has_ipv4: yes
-mac0: 52:54:00:aa:25:b9
 network_connections:
   - autoconnect: yes
     ip:
@@ -22,7 +20,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     state: up
     type: ethernet
diff --git a/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org
index e990d2209b..2b47061a2d 100644
--- a/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-18.s390.fedoraproject.org
@@ -6,9 +6,7 @@ dns_search2: "fedoraproject.org"
 eth0_ipv4: 10.16.0.29
 eth0_ipv4_gw: 10.16.0.254
 eth0_ipv4_nm: 24
-eth0_mac: "{{ mac0 }}"
 has_ipv4: yes
-mac0: 52:54:00:db:57:e3
 network_connections:
   - autoconnect: yes
     ip:
@@ -22,7 +20,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     state: up
     type: ethernet
diff --git a/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org
index b30f96e440..ea1e922ec4 100644
--- a/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-19.s390.fedoraproject.org
@@ -8,7 +8,6 @@ eth0_ipv4_gw: 10.16.0.254
 eth0_ipv4_nm: 24
 eth0_mac: "{{ mac0 }}"
 has_ipv4: yes
-mac0: 52:54:00:c4:f2:4e
 network_connections:
   - autoconnect: yes
     ip:
@@ -22,7 +21,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     state: up
     type: ethernet
diff --git a/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org
index 3f861696f0..39a392122e 100644
--- a/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-20.s390.fedoraproject.org
@@ -6,9 +6,7 @@ dns_search2: "fedoraproject.org"
 eth0_ipv4: 10.16.0.31
 eth0_ipv4_gw: 10.16.0.254
 eth0_ipv4_nm: 24
-eth0_mac: "{{ mac0 }}"
 has_ipv4: yes
-mac0: 52:54:00:74:95:f0
 network_connections:
   - autoconnect: yes
     ip:
@@ -22,7 +20,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     state: up
     type: ethernet
diff --git a/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org
index 9ff579fc98..97f4a26918 100644
--- a/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390x-24.s390.fedoraproject.org
@@ -10,7 +10,6 @@ eth0_ipv4_gw: 10.16.0.254
 eth0_ipv4_nm: 24
 eth0_mac: "{{ mac0 }}"
 has_ipv4: yes
-mac0: 52:54:00:70:cc:a7
 network_connections:
   - autoconnect: yes
     ip:
@@ -24,7 +23,7 @@ network_connections:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
       gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
+    mac: "{{ ansible_default_ipv4.macaddress }}"
     name: eth0
     state: up
     type: ethernet