diff --git a/inventory/group_vars/openqa_workers b/inventory/group_vars/openqa_workers
index ae6fe400e7..99860f52d4 100644
--- a/inventory/group_vars/openqa_workers
+++ b/inventory/group_vars/openqa_workers
@@ -21,3 +21,5 @@ openqa_nfs_worker: true
 openqa_secret: "{{ prod_openqa_apisecret }}"
 openqa_workers: 4
 primary_auth_source: ipa
+# all worker hosts should be encrypted as of 2024-10 redeployment
+openqa_nbde: true
diff --git a/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org
index f868e9535d..78438027ac 100644
--- a/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-a64-worker01.iad2.fedoraproject.org
@@ -62,5 +62,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
-# this box is not encrypted
-openqa_nbde: false
diff --git a/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org
index 75f420e4fd..8bcf47c49e 100644
--- a/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-a64-worker02.iad2.fedoraproject.org
@@ -4,16 +4,16 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-eth0_mac: "{{ mac1 }}"
-eth1_ipv4: 10.3.174.62
-eth1_ipv4_gw: 10.3.174.254
-eth1_ipv4_nm: 24
-eth1_mac: "{{ mac2 }}"
-eth2_mac: "{{ mac3 }}"
+enP2p1s0_mac: "{{ mac1 }}"
+enp1s0_ipv4: 10.3.174.62
+enp1s0_ipv4_gw: 10.3.174.254
+enp1s0_ipv4_nm: 24
+enp1s0_mac: "{{ mac2 }}"
+enp1s0d1_mac: "{{ mac3 }}"
 freezes: false
-# eth0 is disabled/nothing
-# eth1 is active network
-# eth2 is disabled/nothing
+# enP2p1s0 is disabled/nothing
+# enp1s0 is active network
+# enp1s0d1 is disabled/nothing
 # NOTE network configuration beyond the scope of linux-system-roles on
 # this host is performed by the openqa/worker role
 
@@ -23,14 +23,14 @@ mac2: 50:6b:4b:7f:a8:b0
 mac3: 50:6b:4b:7f:a8:b1
 network_connections:
   - autoconnect: no
-    mac: "{{ eth0_mac }}"
-    name: eth0
+    mac: "{{ enP2p1s0_mac }}"
+    name: enP2p1s0
     state: down
     type: ethernet
   - autoconnect: yes
     ip:
       address:
-        - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+        - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -38,21 +38,21 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ eth1_ipv4_gw }}"
-    mac: "{{ eth1_mac }}"
-    name: eth1
+      gateway4: "{{ enp1s0_ipv4_gw }}"
+    mac: "{{ enp1s0_mac }}"
+    name: enp1s0
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ eth2_mac }}"
-    name: eth2
+    mac: "{{ enp1s0d1_mac }}"
+    name: enp1s0d1
     state: down
     type: ethernet
 nrpe_procs_crit: 300
 nrpe_procs_warn: 250
 # has an HW RNG, so let's have rngd
 openqa_rngd: true
-openqa_tap_iface: eth1
+openqa_tap_iface: enp1s0
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 15
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
@@ -62,5 +62,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
-# this box is not encrypted
-openqa_nbde: false
diff --git a/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org
index 5af52f61e1..77cd609aec 100644
--- a/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-a64-worker03.iad2.fedoraproject.org
@@ -4,16 +4,18 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-eth0_mac: "{{ mac1 }}"
-eth1_ipv4: 10.3.174.63
-eth1_ipv4_gw: 10.3.174.254
-eth1_ipv4_nm: 24
-eth1_mac: "{{ mac2 }}"
-eth2_mac: "{{ mac3 }}"
+enP2p1s0_mac: "{{ mac1 }}"
+enp1s0_ipv4: 10.3.174.63
+enp1s0_ipv4_gw: 10.3.174.254
+enp1s0_ipv4_nm: 24
+enp1s0_mac: "{{ mac2 }}"
+enp1s0d1_mac: "{{ mac3 }}"
 freezes: false
-# eth0 is disabled/nothing
-# eth1 is active network
-# eth2 is disabled/nothing
+# enP2p1s0 is disabled/nothing
+# enp1s0 is active network
+# enp1s0d1 is disabled/nothing
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
 
 has_ipv4: yes
 mac1: 00:1b:21:e0:6e:5b
@@ -21,14 +23,14 @@ mac2: 50:6b:4b:7f:98:30
 mac3: 50:6b:4b:7f:98:31
 network_connections:
   - autoconnect: no
-    mac: "{{ eth0_mac }}"
-    name: eth0
+    mac: "{{ enP2p1s0_mac }}"
+    name: enP2p1s0
     state: down
     type: ethernet
   - autoconnect: yes
     ip:
       address:
-        - "{{ eth1_ipv4 }}/{{ eth1_ipv4_nm }}"
+        - "{{ enp1s0_ipv4 }}/{{ enp1s0_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -36,21 +38,21 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ eth1_ipv4_gw }}"
-    mac: "{{ eth1_mac }}"
-    name: eth1
+      gateway4: "{{ enp1s0_ipv4_gw }}"
+    mac: "{{ enp1s0_mac }}"
+    name: enp1s0
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ eth2_mac }}"
-    name: eth2
+    mac: "{{ enp1s0d1_mac }}"
+    name: enp1s0d1
     state: down
     type: ethernet
 nrpe_procs_crit: 300
 nrpe_procs_warn: 250
 # has an HW RNG, so let's have rngd
 openqa_rngd: true
-openqa_tap_iface: eth1
+openqa_tap_iface: enp1s0
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 15
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
@@ -60,5 +62,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
-# this box is not encrypted
-openqa_nbde: false
diff --git a/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org b/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org
index 501119eca9..1f682f3748 100644
--- a/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-a64-worker04.iad2.fedoraproject.org
@@ -4,17 +4,20 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-eth0_mac: "{{ mac1 }}"
-eth1_mac: "{{ mac2 }}"
-eth2_mac: "{{ mac3 }}"
-eth3_mac: "{{ mac4 }}"
-eth2_ipv4: 10.3.174.64
-eth2_ipv4_gw: 10.3.174.254
-eth2_ipv4_nm: 24
+eno1_mac: "{{ mac1 }}"
+eno2_mac: "{{ mac2 }}"
+enP1p1s0f0np0_mac: "{{ mac3 }}"
+enP1p1s0f1np1_mac: "{{ mac4 }}"
+enP1p1s0f0np0_ipv4: 10.3.174.64
+enP1p1s0f0np0_ipv4_gw: 10.3.174.254
+enP1p1s0f0np0_ipv4_nm: 24
 freezes: false
-# eth0 is disabled/nothing
-# eth1 is active network
-# eth2 is disabled/nothing
+# eno1 is disabled/nothing
+# eno2 is disabled/nothing
+# enP1p1s0f0np0 is active network
+# enP1p1s0f1np1 is disabled/nothing
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
 
 has_ipv4: yes
 mac1: d8:5e:d3:8b:73:d6
@@ -23,19 +26,19 @@ mac3: 0c:42:a1:5a:08:b0
 mac4: 0c:42:a1:5a:08:b1
 network_connections:
   - autoconnect: no
-    mac: "{{ eth0_mac }}"
-    name: eth0
+    mac: "{{ eno1_mac }}"
+    name: eno1
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ eth1_mac }}"
-    name: eth1
+    mac: "{{ eno2_mac }}"
+    name: eno2
     state: down
     type: ethernet
   - autoconnect: yes
     ip:
       address:
-        - "{{ eth2_ipv4 }}/{{ eth2_ipv4_nm }}"
+        - "{{ enP1p1s0f0np0_ipv4 }}/{{ enP1p1s0f0np0_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -43,21 +46,21 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ eth2_ipv4_gw }}"
-    mac: "{{ eth2_mac }}"
-    name: eth2
+      gateway4: "{{ enP1p1s0f0np0_ipv4_gw }}"
+    mac: "{{ enP1p1s0f0np0_mac }}"
+    name: enP1p1s0f0np0
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ eth3_mac }}"
-    name: eth3
+    mac: "{{ enP1p1s0f1np1_mac }}"
+    name: enP1p1s0f1np1
     state: down
     type: ethernet
 nrpe_procs_crit: 300
 nrpe_procs_warn: 250
 # has an HW RNG, so let's have rngd
 openqa_rngd: true
-openqa_tap_iface: eth2
+openqa_tap_iface: enP1p1s0f0np0
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 20
 # also means we need to bump the load average threshold
@@ -69,5 +72,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303', '20313', '20323', '20333', '20343', '20353']
-# this box is encrypted
-openqa_nbde: true
diff --git a/inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org
index 545161380b..c59cb5c8c5 100644
--- a/inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-p09-worker01.iad2.fedoraproject.org
@@ -55,5 +55,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
-# this box is encrypted
-openqa_nbde: true
diff --git a/inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org b/inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org
index 531808fb6c..8d87a75bf5 100644
--- a/inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-p09-worker02.iad2.fedoraproject.org
@@ -4,16 +4,16 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-eth0_ipv4: 10.3.174.43
-eth0_ipv4_gw: 10.3.174.254
-eth0_ipv4_nm: 24
-eth0_mac: "{{ mac1 }}"
-eth1_mac: "{{ mac2 }}"
-eth2_mac: "{{ mac3 }}"
+enp1s0f0np0_ipv4: 10.3.174.43
+enp1s0f0np0_ipv4_gw: 10.3.174.254
+enp1s0f0np0_ipv4_nm: 24
+enp1s0f0np0_mac: "{{ mac1 }}"
+enp1s0f1np1_mac: "{{ mac2 }}"
+enP2p1s0f0np0_mac: "{{ mac3 }}"
 freezes: false
-# eth0 is default network
-# eth1 is disabled/nothing
-# eth2 is disabled/nothing
+# enp1s0f0np0 is default network
+# enp1s0f1np1 is disabled/nothing
+# enP2p1s0f0np0 is disabled/nothing
 
 has_ipv4: yes
 mac1: 40:a6:b7:18:86:b8
@@ -23,7 +23,7 @@ network_connections:
   - autoconnect: yes
     ip:
       address:
-        - "{{ eth0_ipv4 }}/{{ eth0_ipv4_nm }}"
+        - "{{ enp1s0f0np0_ipv4 }}/{{ enp1s0f0np0_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -31,26 +31,26 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ eth0_ipv4_gw }}"
-    mac: "{{ eth0_mac }}"
-    name: eth0
+      gateway4: "{{ enp1s0f0np0_ipv4_gw }}"
+    mac: "{{ enp1s0f0np0_mac }}"
+    name: enp1s0f0np0
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ eth1_mac }}"
-    name: eth1
+    mac: "{{ enp1s0f1np1_mac }}"
+    name: enp1s0f1np1
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ eth2_mac }}"
-    name: eth2
+    mac: "{{ enP2p1s0f0np0_mac }}"
+    name: enP2p1s0f0np0
     state: down
     type: ethernet
 nrpe_procs_crit: 300
 nrpe_procs_warn: 250
 # has an HW RNG, so let's have rngd
 openqa_rngd: true
-openqa_tap_iface: eth0
+openqa_tap_iface: enp1s0f0np0
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 15
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
@@ -60,5 +60,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153']
-# this box is not encrypted
-openqa_nbde: false
diff --git a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org
index 87378b591d..127db7d315 100644
--- a/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-x86-worker01.iad2.fedoraproject.org
@@ -4,18 +4,18 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-em1_ipv4: 10.3.174.21
-em1_ipv4_gw: 10.3.174.254
-em1_ipv4_nm: 24
-em1_mac: "{{ mac1 }}"
-em2_mac: "{{ mac2 }}"
-em3_mac: "{{ mac3 }}"
-em4_mac: "{{ mac4 }}"
+eno1np0_ipv4: 10.3.174.21
+eno1np0_ipv4_gw: 10.3.174.254
+eno1np0_ipv4_nm: 24
+eno1np0_mac: "{{ mac1 }}"
+eno2np1_mac: "{{ mac2 }}"
+eno3_mac: "{{ mac3 }}"
+eno4_mac: "{{ mac4 }}"
 freezes: false
-# em1 is default network
-# em2 is disabled/nothing
-# em3 is disabled/nothing
-# em4 is disabled/nothing
+# eno1np0 is default network
+# eno2np1 is disabled/nothing
+# eno3 is disabled/nothing
+# eno4 is disabled/nothing
 # NOTE network configuration beyond the scope of linux-system-roles on
 # this host is performed by the openqa/worker role
 
@@ -28,7 +28,7 @@ network_connections:
   - autoconnect: yes
     ip:
       address:
-        - "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
+        - "{{ eno1np0_ipv4 }}/{{ eno1np0_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -36,31 +36,31 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ em1_ipv4_gw }}"
-    mac: "{{ em1_mac }}"
-    name: em1
+      gateway4: "{{ eno1np0_ipv4_gw }}"
+    mac: "{{ eno1np0_mac }}"
+    name: eno1np0
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ em2_mac }}"
-    name: em2
+    mac: "{{ eno2np1_mac }}"
+    name: eno2np1
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em3_mac }}"
-    name: em3
+    mac: "{{ eno3_mac }}"
+    name: eno3
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em4_mac }}"
-    name: em4
+    mac: "{{ eno4_mac }}"
+    name: eno4
     state: down
     type: ethernet
 nrpe_procs_crit: 1600
 nrpe_procs_warn: 1400
 # Has a hardware RNG
 openqa_rngd: true
-openqa_tap_iface: em1
+openqa_tap_iface: eno1np0
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 30
 # also means we need to bump the load average threshold
@@ -72,5 +72,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
-# this box is encrypted
-openqa_nbde: true
diff --git a/inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org
index 87e20afb8f..2e88656587 100644
--- a/inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-x86-worker02.iad2.fedoraproject.org
@@ -4,18 +4,20 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-em1_ipv4: 10.3.174.22
-em1_ipv4_gw: 10.3.174.254
-em1_ipv4_nm: 24
-em1_mac: "{{ mac1 }}"
-em2_mac: "{{ mac2 }}"
-em3_mac: "{{ mac3 }}"
-em4_mac: "{{ mac4 }}"
+eno1np0_ipv4: 10.3.174.22
+eno1np0_ipv4_gw: 10.3.174.254
+eno1np0_ipv4_nm: 24
+eno1np0_mac: "{{ mac1 }}"
+eno2np1_mac: "{{ mac2 }}"
+eno3_mac: "{{ mac3 }}"
+eno4_mac: "{{ mac4 }}"
 freezes: false
-# em1 is default network
-# em2 is disabled/nothing
-# em3 is disabled/nothing
-# em4 is disabled/nothing
+# eno1np0 is default network
+# eno2np1 is disabled/nothing
+# eno3 is disabled/nothing
+# eno4 is disabled/nothing
+# NOTE network configuration beyond the scope of linux-system-roles on
+# this host is performed by the openqa/worker role
 
 has_ipv4: yes
 mac1: e4:43:4b:23:e8:cc
@@ -26,7 +28,7 @@ network_connections:
   - autoconnect: yes
     ip:
       address:
-        - "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
+        - "{{ eno1np0_ipv4 }}/{{ eno1np0_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -34,31 +36,31 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ em1_ipv4_gw }}"
-    mac: "{{ em1_mac }}"
-    name: em1
+      gateway4: "{{ eno1np0_ipv4_gw }}"
+    mac: "{{ eno1np0_mac }}"
+    name: eno1np0
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ em2_mac }}"
-    name: em2
+    mac: "{{ eno2np1_mac }}"
+    name: eno2np1
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em3_mac }}"
-    name: em3
+    mac: "{{ eno3_mac }}"
+    name: eno3
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em4_mac }}"
-    name: em4
+    mac: "{{ eno4_mac }}"
+    name: eno4
     state: down
     type: ethernet
 nrpe_procs_crit: 1600
 nrpe_procs_warn: 1400
 # Has a hardware RNG
 openqa_rngd: true
-openqa_tap_iface: em1
+openqa_tap_iface: eno1np0
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 30
 # also means we need to bump the load average threshold
@@ -70,5 +72,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
-# this box is not encrypted
-openqa_nbde: false
diff --git a/inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org
index 1bf831b5ab..d363cd825d 100644
--- a/inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-x86-worker03.iad2.fedoraproject.org
@@ -69,5 +69,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223']
-# this box is encrypted
-openqa_nbde: true
diff --git a/inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org
index f8dc848e67..818d66516e 100644
--- a/inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-x86-worker04.iad2.fedoraproject.org
@@ -4,18 +4,18 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-em1_ipv4: 10.3.174.24
-em1_ipv4_gw: 10.3.174.254
-em1_ipv4_nm: 24
-em1_mac: "{{ mac1 }}"
-em2_mac: "{{ mac2 }}"
-em3_mac: "{{ mac3 }}"
-em4_mac: "{{ mac4 }}"
+eno1np0_ipv4: 10.3.174.24
+eno1np0_ipv4_gw: 10.3.174.254
+eno1np0_ipv4_nm: 24
+eno1np0_mac: "{{ mac1 }}"
+eno2np1_mac: "{{ mac2 }}"
+eno3_mac: "{{ mac3 }}"
+eno4_mac: "{{ mac4 }}"
 freezes: false
-# em1 is default network
-# em2 is disabled/nothing
-# em3 is disabled/nothing
-# em4 is disabled/nothing
+# eno1np0 is default network
+# eno2np1 is disabled/nothing
+# eno3 is disabled/nothing
+# eno4 is disabled/nothing
 # NOTE network configuration beyond the scope of linux-system-roles on
 # this host is performed by the openqa/worker role
 
@@ -28,7 +28,7 @@ network_connections:
   - autoconnect: yes
     ip:
       address:
-        - "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
+        - "{{ eno1np0_ipv4 }}/{{ eno1np0_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -36,31 +36,31 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ em1_ipv4_gw }}"
-    mac: "{{ em1_mac }}"
-    name: em1
+      gateway4: "{{ eno1np0_ipv4_gw }}"
+    mac: "{{ eno1np0_mac }}"
+    name: eno1np0
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ em2_mac }}"
-    name: em2
+    mac: "{{ eno2np1_mac }}"
+    name: eno2np1
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em3_mac }}"
-    name: em3
+    mac: "{{ eno3_mac }}"
+    name: eno3
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em4_mac }}"
-    name: em4
+    mac: "{{ eno4_mac }}"
+    name: eno4
     state: down
     type: ethernet
 nrpe_procs_crit: 1600
 nrpe_procs_warn: 1400
 # Has a hardware RNG
 openqa_rngd: true
-openqa_tap_iface: em1
+openqa_tap_iface: eno1np0
 # this is a powerful machine, can handle more openQA workers
 openqa_workers: 30
 # also means we need to bump the load average threshold
@@ -72,5 +72,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
-# this box is encrypted
-openqa_nbde: true
diff --git a/inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org
index 8d0b91b818..c5275759e4 100644
--- a/inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-x86-worker05.iad2.fedoraproject.org
@@ -69,5 +69,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
-# this box is encrypted
-openqa_nbde: true
diff --git a/inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org b/inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org
index e00835b66f..af3b7937c9 100644
--- a/inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org
+++ b/inventory/host_vars/openqa-x86-worker06.iad2.fedoraproject.org
@@ -4,18 +4,18 @@ dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
-em1_ipv4: 10.3.174.26
-em1_ipv4_gw: 10.3.174.254
-em1_ipv4_nm: 24
-em1_mac: "{{ mac1 }}"
-em2_mac: "{{ mac2 }}"
-em3_mac: "{{ mac3 }}"
-em4_mac: "{{ mac4 }}"
+eno1_ipv4: 10.3.174.26
+eno1_ipv4_gw: 10.3.174.254
+eno1_ipv4_nm: 24
+eno1_mac: "{{ mac1 }}"
+eno2_mac: "{{ mac2 }}"
+eno3_mac: "{{ mac3 }}"
+eno4_mac: "{{ mac4 }}"
 freezes: false
-# em1 is default network
-# em2 is disabled/nothing
-# em3 is disabled/nothing
-# em4 is disabled/nothing
+# eno1 is default network
+# eno2 is disabled/nothing
+# eno3 is disabled/nothing
+# eno4 is disabled/nothing
 
 has_ipv4: yes
 mac1: 24:6e:96:b1:c8:00
@@ -26,7 +26,7 @@ network_connections:
   - autoconnect: yes
     ip:
       address:
-        - "{{ em1_ipv4 }}/{{ em1_ipv4_nm }}"
+        - "{{ eno1_ipv4 }}/{{ eno1_ipv4_nm }}"
       dhcp4: no
       dns:
         - "{{ dns1 }}"
@@ -34,24 +34,24 @@ network_connections:
       dns_search:
         - "{{ dns_search1 }}"
         - "{{ dns_search2 }}"
-      gateway4: "{{ em1_ipv4_gw }}"
-    mac: "{{ em1_mac }}"
-    name: em1
+      gateway4: "{{ eno1_ipv4_gw }}"
+    mac: "{{ eno1_mac }}"
+    name: eno1
     state: up
     type: ethernet
   - autoconnect: no
-    mac: "{{ em2_mac }}"
-    name: em2
+    mac: "{{ eno2_mac }}"
+    name: eno2
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em3_mac }}"
-    name: em3
+    mac: "{{ eno3_mac }}"
+    name: eno3
     state: down
     type: ethernet
   - autoconnect: no
-    mac: "{{ em4_mac }}"
-    name: em4
+    mac: "{{ eno4_mac }}"
+    name: eno4
     state: down
     type: ethernet
 nrpe_procs_crit: 1600
@@ -69,5 +69,3 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 # $ENV{QEMUPORT} = ($options{instance}) * 10 + 20002;
 # so for worker 1 it's 20012, for worker 2 it's 20022, etc etc
 tcp_ports: ['20013', '20023', '20033', '20043', '20053', '20063', '20073', '20083', '20093', '20103', '20113', '20123', '20133', '20143', '20153', '20163', '20173', '20183', '20193', '20203', '20213', '20223', '20233', '20243', '20253', '20263', '20273', '20283', '20293', '20303']
-# this box is not encrypted
-openqa_nbde: false