diff --git a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org b/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
index f7648aeb9d..593c45ec43 100644
--- a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
@@ -1,2 +1,30 @@
----
-ansible_ifcfg_blocklist: True
+ansible_ifcfg_blocklist: true
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: fedoraproject.org
+mac0: 52:e9:b3:41:72:fd
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ vmbr_ipv4 }}/{{ vmbr_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      - '{{ dns2 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ vmbr_ipv4_gw }}'
+    name: vmbr
+    state: up
+    type: bridge
+  - mac: '{{ vmbr_port0_mac }}'
+    master: vmbr
+    name: vmbr-port0
+    state: up
+    type: ethernet
+vmbr_ipv4: 10.16.0.10
+vmbr_ipv4_gw: 10.16.0.254
+vmbr_ipv4_nm: 24
+vmbr_port0_mac: '{{ mac0 }}'
diff --git a/inventory/host_vars/ibiblio01.fedoraproject.org b/inventory/host_vars/ibiblio01.fedoraproject.org
index 9b1bcdeeba..3dfe76c94a 100644
--- a/inventory/host_vars/ibiblio01.fedoraproject.org
+++ b/inventory/host_vars/ibiblio01.fedoraproject.org
@@ -1,14 +1,41 @@
 ---
-br0_ip: 152.19.134.138
-br0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fe01"
-br0_ipv6_gw: "2600:2701:4000:5211::1"
+br0_ipv4: 152.19.134.138
+br0_ipv4_gw: 152.19.134.129
+br0_ipv4_nm: 25
+br0_ipv6: 2600:2701:4000:5211:dead:beef:00fe:fe01
+br0_ipv6_gw: 2600:2701:4000:5211::1
 br0_ipv6_nm: 104
-br0_nm: 255.255.255.128
+br0_port0_mac: '{{ mac0 }}'
 datacenter: ibiblio
-dns: 8.8.8.8
-gw: 152.19.134.129
-has_ipv6: yes
-nm: 255.255.255.128
+dns1: 8.8.8.8
+dns_search1: fedoraproject.org
+dns_search2: vpn.fedoraproject.org
+has_ipv4: true
+has_ipv6: true
+mac0: 24:6e:96:69:3b:58
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+        - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+        - '{{ br0_ipv6 }}/{{ br0_ipv6_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+        - '{{ dns1 }}'
+      dns_search:
+        - '{{ dns_search1 }}'
+        - '{{ dns_search2 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+      gateway6: '{{ br0_ipv6_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 postfix_group: vpn
diff --git a/inventory/host_vars/ibiblio05.fedoraproject.org b/inventory/host_vars/ibiblio05.fedoraproject.org
index 1610f3b92b..41fd965b64 100644
--- a/inventory/host_vars/ibiblio05.fedoraproject.org
+++ b/inventory/host_vars/ibiblio05.fedoraproject.org
@@ -1,14 +1,41 @@
 ---
-br0_ip: 152.19.134.137
-br0_ipv6: "2600:2701:4000:5211:dead:beef:00fe:fe05/104"
-br0_ipv6_gw: "2600:2701:4000:5211::1"
+br0_ipv4: 152.19.134.137
+br0_ipv4_gw: 152.19.134.129
+br0_ipv4_nm: 25
+br0_ipv6: 2600:2701:4000:5211:dead:beef:00fe:fe05/104
+br0_ipv6_gw: 2600:2701:4000:5211::1
 br0_ipv6_nm: 104
-br0_nm: 255.255.255.128
+br0_port0_mac: '{{ mac0 }}'
 datacenter: ibiblio
-dns: 152.2.21.1
-gw: 152.19.134.129
-has_ipv6: yes
-nm: 255.255.255.128
+dns1: 152.2.21.1
+dns_search1: fedoraproject.org
+dns_search2: vpn.fedoraproject.org
+has_ipv4: true
+has_ipv6: true
+mac0: ec:f4:bb:e1:58:22
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+        - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+        - '{{ br0_ipv6 }}/{{ br0_ipv6_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+        - '{{ dns1 }}'
+      dns_search:
+        - '{{ dns_search1 }}'
+        - '{{ dns_search2 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+      gateway6: '{{ br0_ipv6_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 postfix_group: vpn
diff --git a/inventory/host_vars/internetx01.fedoraproject.org b/inventory/host_vars/internetx01.fedoraproject.org
index 69c905399d..1be841217b 100644
--- a/inventory/host_vars/internetx01.fedoraproject.org
+++ b/inventory/host_vars/internetx01.fedoraproject.org
@@ -1,10 +1,40 @@
 ---
-br0_ip: 85.236.55.4
-br0_ipv6: "2001:4178:2:1269::10"
-br0_ipv6_gw: "2001:4178:2:1269::1"
-br0_nm: 255.255.255.240
+br0_ipv4: 85.236.55.4
+br0_ipv4_gw: 152.19.134.129
+br0_ipv4_nm: 28
+br0_ipv6: 2001:4178:2:1269::10
+br0_ipv6_gw: 2001:4178:2:1269::1
+br0_port0_mac: '{{ mac0 }}'
 datacenter: internetx
-has_ipv6: yes
+dns1: 8.8.8.8
+dns_search1: fedoraproject.org
+dns_search2: vpn.fedoraproject.org
+has_ipv4: true
+has_ipv6: true
+mac0: 00:26:b9:89:62:5e
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+        - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+        - '{{ br0_ipv6 }}/{{ br0_ipv6_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+        - '{{ dns1 }}'
+      dns_search:
+        - '{{ dns_search1 }}'
+        - '{{ dns_search2 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+      gateway6: '{{ br0_ipv6_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 postfix_group: vpn
diff --git a/inventory/host_vars/osuosl01.fedoraproject.org b/inventory/host_vars/osuosl01.fedoraproject.org
index 6af792c6f1..a3b58bf1da 100644
--- a/inventory/host_vars/osuosl01.fedoraproject.org
+++ b/inventory/host_vars/osuosl01.fedoraproject.org
@@ -1,7 +1,33 @@
 ---
-br0_ip: 140.211.169.194
-br0_nm: 255.255.255.128
+br0_ipv4: 140.211.169.194
+br0_ipv4_gw: 140.211.169.193
+br0_ipv4_nm: 26
+br0_port0_mac: '{{ mac0 }}'
 datacenter: osuosl
+dns1: 8.8.8.8
+dns_search1: fedoraproject.org
+has_ipv4: true
+mac0: e4:43:4b:23:cb:b6
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+        - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+        - '{{ dns1 }}'
+      dns_search:
+        - '{{ dns_search1 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 virthost: true
diff --git a/inventory/host_vars/osuosl02.fedoraproject.org b/inventory/host_vars/osuosl02.fedoraproject.org
index 2acf648a16..f3058cb015 100644
--- a/inventory/host_vars/osuosl02.fedoraproject.org
+++ b/inventory/host_vars/osuosl02.fedoraproject.org
@@ -1,7 +1,33 @@
 ---
-br0_ip: 140.211.169.195
-br0_nm: 140.211.169.194
+br0_ipv4: 140.211.169.195
+br0_ipv4_gw: 140.211.169.193
+br0_ipv4_nm: 26
+br0_port0_mac: '{{ mac0 }}'
 datacenter: osuosl
+dns1: 8.8.8.8
+dns_search1: fedoraproject.org
+has_ipv4: true
+mac0: 34:40:b5:ac:a8:a0
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+        - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+        - '{{ dns1 }}'
+      dns_search:
+        - '{{ dns_search1 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 virthost: true
diff --git a/inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org b/inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org
index b99901cecd..b9b56b8206 100644
--- a/inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/qvmhost-x86-02.iad2.fedoraproject.org
@@ -3,9 +3,35 @@ br0_dev: eno1
 br0_gw: 10.3.174.254
 br0_ip: 10.3.174.12
 br0_nm: 255.255.255.0
+br0_port0_mac: '{{ mac1 }}'
 datacenter: iad2
-dns: 10.3.163.33
+dns1: 10.3.163.33
+dns2: 10.3.163.33
+dns_search1: iad2.fedoraproject.org
+dns_search2: fedoraproject.org
 mac1: e4:43:4b:a8:b3:0e
 mac2: e4:43:4b:a8:b3:10
 mac3: e4:43:4b:a8:b3:2e
 mac4: e4:43:4b:a8:b3:2f
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+        - '{{ br0_ip }}/24'
+      auto6: false
+      dhcp4: false
+      dns:
+        - '{{ dns1 }}'
+        - '{{ dns2 }}'
+      dns_search:
+        - '{{ dns_search1 }}'
+        - '{{ dns_search2 }}'
+      gateway4: '{{ br0_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
diff --git a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org
index eb447cbd51..12cf3a0257 100644
--- a/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/retrace03.rdu-cc.fedoraproject.org
@@ -1,152 +1,158 @@
 ---
 datacenter: rdu-cc
 # Clean-up packages of following EOLed operating systems
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: fedoraproject.org
 eol_opsys: []
 # When not empty, the array should have the following form:
 #   - { opsys: "Fedora", release: "36" }
-
+eth2_ipv4: 8.43.85.61
+eth2_ipv4_gw: 8.43.85.254
+eth2_ipv4_nm: 23
 # List of supported operating systems
 faf_opsys_list:
   - fedora
   - centos
 faf_repos:
   # Fedora 33 repositories ------------------------------------------------
-  - arch: 'src'
-    name: 'fedora-33-source'
-    opsys: 'Fedora 33'
+  - arch: src
+    name: fedora-33-source
+    opsys: Fedora 33
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/source/tree/'
-  - arch: 'x86_64'
-    name: 'fedora-33-x86_64'
-    opsys: 'Fedora 33'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/source/tree/
+  - arch: x86_64
+    name: fedora-33-x86_64
+    opsys: Fedora 33
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/os/'
-  - arch: 'x86_64'
-    name: 'fedora-33-x86_64-debug'
-    opsys: 'Fedora 33'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/os/
+  - arch: x86_64
+    name: fedora-33-x86_64-debug
+    opsys: Fedora 33
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/debug/tree/'
-  - arch: 'x86_64'
-    name: 'fedora-33-x86_64-testing-debug'
-    opsys: 'Fedora 33'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/33/Everything/x86_64/debug/tree/
+  - arch: x86_64
+    name: fedora-33-x86_64-testing-debug
+    opsys: Fedora 33
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/debug/'
-  - arch: 'x86_64'
-    name: 'fedora-33-x86_64-testing'
-    opsys: 'Fedora 33'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/debug/
+  - arch: x86_64
+    name: fedora-33-x86_64-testing
+    opsys: Fedora 33
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/'
-  - arch: 'x86_64'
-    name: 'fedora-33-x86_64-updates-debug'
-    opsys: 'Fedora 33'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/33/Everything/x86_64/
+  - arch: x86_64
+    name: fedora-33-x86_64-updates-debug
+    opsys: Fedora 33
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/debug/'
-  - arch: 'x86_64'
-    name: 'fedora-33-x86_64-updates'
-    opsys: 'Fedora 33'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/debug/
+  - arch: x86_64
+    name: fedora-33-x86_64-updates
+    opsys: Fedora 33
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/'
-  # Fedora 34 repositories ------------------------------------------------
-  - arch: 'src'
-    name: 'fedora-34-source'
-    opsys: 'Fedora 34'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/33/Everything/x86_64/
+  - arch: src
+    name: fedora-34-source
+    opsys: Fedora 34
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/source/tree/'
-  - arch: 'x86_64'
-    name: 'fedora-34-x86_64'
-    opsys: 'Fedora 34'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/source/tree/
+  - arch: x86_64
+    name: fedora-34-x86_64
+    opsys: Fedora 34
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/os/'
-  - arch: 'x86_64'
-    name: 'fedora-34-x86_64-debug'
-    opsys: 'Fedora 34'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/os/
+  - arch: x86_64
+    name: fedora-34-x86_64-debug
+    opsys: Fedora 34
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/debug/tree/'
-  - arch: 'x86_64'
-    name: 'fedora-34-x86_64-updates'
-    opsys: 'Fedora 34'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/x86_64/debug/tree/
+  - arch: x86_64
+    name: fedora-34-x86_64-updates
+    opsys: Fedora 34
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/'
-  - arch: 'x86_64'
-    name: 'fedora-34-x86_64-updates-debug'
-    opsys: 'Fedora 34'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/
+  - arch: x86_64
+    name: fedora-34-x86_64-updates-debug
+    opsys: Fedora 34
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/debug/'
-  - arch: 'x86_64'
-    name: 'fedora-34-x86_64-testing'
-    opsys: 'Fedora 34'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/34/Everything/x86_64/debug/
+  - arch: x86_64
+    name: fedora-34-x86_64-testing
+    opsys: Fedora 34
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/'
-  - arch: 'x86_64'
-    name: 'fedora-34-x86_64-testing-debug'
-    opsys: 'Fedora 34'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/
+  - arch: x86_64
+    name: fedora-34-x86_64-testing-debug
+    opsys: Fedora 34
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/'
-  # Fedora 35 repositories ------------------------------------------------
-  - arch: 'src'
-    name: 'fedora-35-source'
-    opsys: 'Fedora 35'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/34/Everything/x86_64/debug/
+  - arch: src
+    name: fedora-35-source
+    opsys: Fedora 35
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/35/Everything/source/tree/'
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/35/Everything/source/tree/'
-  - arch: 'x86_64'
-    name: 'fedora-35-x86_64'
-    opsys: 'Fedora 35'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/35/Everything/source/tree/
+      - http://dl01.fedoraproject.org/pub/fedora/linux/development/35/Everything/source/tree/
+  - arch: x86_64
+    name: fedora-35-x86_64
+    opsys: Fedora 35
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/35/Everything/x86_64/os/'
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/35/Everything/x86_64/os/'
-  - arch: 'x86_64'
-    name: 'fedora-35-x86_64-debug'
-    opsys: 'Fedora 35'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/35/Everything/x86_64/os/
+      - http://dl01.fedoraproject.org/pub/fedora/linux/development/35/Everything/x86_64/os/
+  - arch: x86_64
+    name: fedora-35-x86_64-debug
+    opsys: Fedora 35
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/releases/35/Everything/x86_64/debug/tree/'
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/35/Everything/x86_64/debug/tree/'
-  - arch: 'x86_64'
-    name: 'fedora-35-x86_64-testing-debug'
-    opsys: 'Fedora 35'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/releases/35/Everything/x86_64/debug/tree/
+      - http://dl01.fedoraproject.org/pub/fedora/linux/development/35/Everything/x86_64/debug/tree/
+  - arch: x86_64
+    name: fedora-35-x86_64-testing-debug
+    opsys: Fedora 35
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/35/Everything/x86_64/debug/'
-  - arch: 'x86_64'
-    name: 'fedora-35-x86_64-testing'
-    opsys: 'Fedora 35'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/35/Everything/x86_64/debug/
+  - arch: x86_64
+    name: fedora-35-x86_64-testing
+    opsys: Fedora 35
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/35/Everything/x86_64/'
-  - arch: 'x86_64'
-    name: 'fedora-35-x86_64-updates-debug'
-    opsys: 'Fedora 35'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/testing/35/Everything/x86_64/
+  - arch: x86_64
+    name: fedora-35-x86_64-updates-debug
+    opsys: Fedora 35
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/35/Everything/x86_64/debug/'
-  - arch: 'x86_64'
-    name: 'fedora-35-x86_64-updates'
-    opsys: 'Fedora 35'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/35/Everything/x86_64/debug/
+  - arch: x86_64
+    name: fedora-35-x86_64-updates
+    opsys: Fedora 35
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/updates/35/Everything/x86_64/'
-  # Fedora Rawhide repositories -------------------------------------------
-  - arch: 'src'
-    name: 'fedora-rawhide-source'
-    opsys: 'Fedora Rawhide'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/updates/35/Everything/x86_64/
+  - arch: src
+    name: fedora-rawhide-source
+    opsys: Fedora Rawhide
     url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/'
-  - arch: 'x86_64'
-    name: 'fedora-rawhide-x86_64'
-    opsys: 'Fedora Rawhide'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/
+  - arch: x86_64
+    name: fedora-rawhide-x86_64
+    opsys: Fedora Rawhide
+    url: 
+      - null
+  - arch: x86_64
+    name: fedora-rawhide-x86_64-debug
+    opsys: Fedora Rawhide
     url:
-  - arch: 'x86_64'
-    name: 'fedora-rawhide-x86_64-debug'
-    opsys: 'Fedora Rawhide'
-    url:
-      - 'http://dl01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/debug/tree/'
+      - http://dl01.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/debug/tree/
 faf_server_name: retrace.fedoraproject.org/faf
 # consumed by roles/copr/certbot
+has_ipv4: true
+has_ipv6: false
 letsencrypt:
   certificates:
     retrace03.rdu-cc.fedoraproject.org:
       challenge_dir: /var/www/html
       domains:
-        - retrace03.rdu-cc.fedoraproject.org
-        - retrace.fedoraproject.org
+      - retrace03.rdu-cc.fedoraproject.org
+      - retrace.fedoraproject.org
       mail: msuchy@redhat.com
   predefined_deploy_script: httpd
+mac0: f4:02:70:fa:79:84
 nagios_Check_Services:
   dhcpd: false
   httpd: false
@@ -154,14 +160,32 @@ nagios_Check_Services:
   nrpe: true
   sshd: true
   swap: false
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ eth2_ipv4 }}/{{ eth2_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      - '{{ dns2 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ eth2_ipv4_gw }}'
+    mac: '{{ mac0 }}'
+    name: eth2
+    state: up
+    type: ethernet
 public_hostname: retrace03.rdu-cc.fedoraproject.org
-rs_internal_arch_list: [source, x86_64]
+rs_internal_arch_list:
+- source
+- x86_64
 rs_internal_centos_vers: [7, 8]
 # we do not have enough storage on stg
 rs_internal_fedora_vers: [33, 34, 35, rawhide]
 rs_internal_fedora_vers_removed: [30, 31, 32]
 rs_use_faf_packages: true
 sar_output_file: faf.json
-# GDPR SAR variables
-sar_script: '/usr/bin/faf sar'
+sar_script: /usr/bin/faf sar
 sar_script_user: faf
diff --git a/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org b/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org
index 091fe40a25..d116f1b3a0 100644
--- a/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org
+++ b/inventory/host_vars/storinator01.rdu-cc.fedoraproject.org
@@ -1,18 +1,42 @@
 ---
 # this box is not currently mission critical
 datacenter: rdu-cc
-dns: 8.8.8.8
-eth0_ip: 8.43.85.62
-eth0_nm: 255.255.255.0
-eth2_ip: 172.23.5.25
-eth2_nm: 255.255.255.0
+dns1: 8.8.8.8
+dns_search1: fedoraproject.org
+eth0_ipv4: 8.43.85.62
+eth0_ipv4_gw: 8.43.85.254
+eth0_ipv4_nm: 23
+eth2_ipv4: 172.23.5.25
+eth2_ipv4_nm: 24
 freezes: false
-gw: 8.43.85.254
+has_ipv4: true
+has_ipv6: false
+mac0: ac:1f:6b:b0:6a:12
+mac1: ac:1f:6b:ac:67:ec
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ eth0_ipv4_gw }}'
+    mac: '{{ mac0 }}'
+    name: eth0
+    state: up
+    type: ethernet
+  - autoconnect: false
+    mac: '{{ mac1 }}'
+    name: eth2
+    type: ethernet
 # this box mounts a large share from the netapp to store combined http
 # logs from the proxies.
-nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3"
+nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3
 nrpe_procs_crit: 1000
-# general configs
 nrpe_procs_warn: 900
 tcp_ports_eth2: [111, 2049]
 udp_ports_eth2: [111, 2049]
diff --git a/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org b/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org
index cf8e1f0609..53db13e8d4 100644
--- a/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org
+++ b/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org
@@ -1,9 +1,33 @@
 ---
-br0_ip: 8.43.85.65
-br0_nm: 255.255.255.0
+br0_dev: eno1
+br0_ipv4: 8.43.85.65
+br0_ipv4_gw: 8.43.85.254
+br0_ipv4_nm: 24
+br0_port0_mac: '{{ mac0 }}'
 datacenter: rdu-cc
-dns: 8.8.8.8
-gw: 8.43.85.254
+dns1: 8.8.8.8
+dns_search1: fedoraproject.org
+mac0: ec:f4:bb:e1:6a:a4
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 postfix_group: vpn
diff --git a/inventory/host_vars/virthost-cc-rdu02.fedoraproject.org b/inventory/host_vars/virthost-cc-rdu02.fedoraproject.org
index d2561e05ba..f949e2c28e 100644
--- a/inventory/host_vars/virthost-cc-rdu02.fedoraproject.org
+++ b/inventory/host_vars/virthost-cc-rdu02.fedoraproject.org
@@ -1,9 +1,32 @@
 ---
-br0_ip: 8.43.85.66
-br0_nm: 255.255.255.0
+br0_ipv4: 8.43.85.66
+br0_ipv4_gw: 8.43.85.254
+br0_ipv4_nm: 24
+br0_port0_mac: '{{ mac0 }}'
 datacenter: rdu-cc
-dns: 8.8.8.8
-gw: 8.43.85.254
+dns1: 8.8.8.8
+dns_search1: fedoraproject.org
+mac0: 24:6e:96:d5:a4:0a
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 postfix_group: vpn
diff --git a/inventory/host_vars/virthost-cc-rdu03.fedoraproject.org b/inventory/host_vars/virthost-cc-rdu03.fedoraproject.org
index 7358cb9efc..3ff05459c9 100644
--- a/inventory/host_vars/virthost-cc-rdu03.fedoraproject.org
+++ b/inventory/host_vars/virthost-cc-rdu03.fedoraproject.org
@@ -1,9 +1,34 @@
 ---
-br0_ip: 8.43.85.64
-br0_nm: 255.255.255.0
+br0_ipv4: 8.43.85.64
+br0_ipv4_gw: 8.43.85.254
+br0_ipv4_nm: 24
+br0_port0_mac: '{{ mac0 }}'
 datacenter: rdu-cc
-dns: 8.8.8.8
-gw: 8.43.85.254
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: fedoraproject.org
+mac0: e4:1f:13:ba:b1:b8
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      - '{{ dns2 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 postfix_group: vpn
diff --git a/inventory/host_vars/virthost-rdu01.fedoraproject.org b/inventory/host_vars/virthost-rdu01.fedoraproject.org
index df1d7430ff..0e5510645f 100644
--- a/inventory/host_vars/virthost-rdu01.fedoraproject.org
+++ b/inventory/host_vars/virthost-rdu01.fedoraproject.org
@@ -1,15 +1,61 @@
 ---
-br0_ip: 172.31.2.11
-br0_nm: 255.255.255.0
-br1_ip: 172.31.1.2
-br1_nm: 255.255.255.0
+br0_ipv4: 172.31.2.11
+br0_ipv4_gw: 172.31.2.254
+br0_ipv4_nm: 24
+br0_port0_mac: '{{ mac0 }}'
+br1_ipv4: 172.31.1.2
+br1_ipv4_gw: 172.31.2.254
+br1_ipv4_nm: 24
+br1_port0_mac: '{{ mac1 }}'
 datacenter: rdu
-dns: 8.8.8.8
-gw: 172.31.2.254
+dns1: 10.3.163.33
+dns2: 10.3.163.34
+dns_search1: fedoraproject.org
+mac0: ec:f4:bb:e1:6d:e4
+mac1: ec:f4:bb:e1:6d:e5
 nagios_Check_Services:
   mail: false
   nrpe: false
-nm: 255.255.255.0
+network_connections:
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ br0_ipv4 }}/{{ br0_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ br0_ipv4_gw }}'
+    name: br0
+    state: up
+    type: bridge
+  - mac: '{{ br0_port0_mac }}'
+    master: br0
+    name: br0-port0
+    state: up
+    type: ethernet
+  - autoconnect: true
+    ip:
+      address:
+      - '{{ br1_ipv4 }}/{{ br1_ipv4_nm }}'
+      auto6: false
+      dhcp4: false
+      dns:
+      - '{{ dns1 }}'
+      - '{{ dns2 }}'
+      dns_search:
+      - '{{ dns_search1 }}'
+      gateway4: '{{ br1_ipv4_gw }}'
+    name: br1
+    state: up
+    type: bridge
+  - mac: '{{ br1_port0_mac }}'
+    master: br1
+    name: br1-port0
+    state: up
+    type: ethernet
 nrpe_procs_crit: 1000
 nrpe_procs_warn: 900
 postfix_group: vpn