diff --git a/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org
index 7f8023c930..33277820e4 100644
--- a/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.11
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.11
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org
index fe75686c52..83fbf4edd5 100644
--- a/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.12
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.12
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org
index af5ac12096..86ee219a41 100644
--- a/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.13
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.13
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org
index a043ef6f13..7a31dd7776 100644
--- a/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.14
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.14
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
index eaf1e363ed..a92b0861d6 100644
--- a/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.15
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.15
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
index 5ba56c45d6..6a8054f4eb 100644
--- a/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.16
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.16
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
index 9738289693..a0bfc24192 100644
--- a/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.17
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.17
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
index b229969712..889bf3787f 100644
--- a/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.18
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.18
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
index a3f5d44009..6ec81197c7 100644
--- a/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.170.19
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.170.19
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org
index ddec86283d..b67b6723a5 100644
--- a/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.171.15
-br0_dev: enP2p1s0f1
-
 has_ipv4: yes
 br0_ipv4: 10.3.171.15
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org
index 819bf87d1b..32410dce80 100644
--- a/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.171.16
-br0_dev: enP2p1s0f1
-
 has_ipv4: yes
 br0_ipv4: 10.3.171.16
 br0_ipv4_nm: 24
@@ -43,4 +39,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org
index 228cf215ab..69fd9711b7 100644
--- a/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.171.17
-br0_dev: eth0
-
 has_ipv4: yes
 br0_ipv4: 10.3.171.17
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org
index 7c3c425d83..681cff54b2 100644
--- a/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.171.18
-br0_dev: eth0
-
 has_ipv4: yes
 br0_ipv4: 10.3.171.18
 br0_ipv4_nm: 24
@@ -43,4 +39,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org
index 7443688274..25e3baf25b 100644
--- a/inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-01.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.11
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.11
 br0_ipv4_nm: 24
@@ -42,4 +38,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org
index 6d74bb81b1..190ea20dd3 100644
--- a/inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-01.stg.iad2.fedoraproject.org
@@ -8,10 +8,6 @@ dns_search1: "stg.iad2.fedoraproject.org"
 dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.167.11
-br0_dev: eth2
-
 has_ipv4: yes
 br0_ipv4: 10.3.167.11
 br0_ipv4_nm: 24
@@ -47,4 +43,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org
index dfd338c080..eacbb78d27 100644
--- a/inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-02.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.12
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.12
 br0_ipv4_nm: 24
@@ -45,4 +41,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org
index 38fed43c66..5cd20bf5e2 100644
--- a/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-02.stg.iad2.fedoraproject.org
@@ -8,10 +8,6 @@ dns_search1: "stg.iad2.fedoraproject.org"
 dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.167.12
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.167.12
 br0_ipv4_nm: 24
@@ -47,4 +43,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org
index b277b2bdcf..e424afab83 100644
--- a/inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-03.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.13
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.13
 br0_ipv4_nm: 24
@@ -45,4 +41,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org
index a31d7a7ca2..335878b22c 100644
--- a/inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-03.stg.iad2.fedoraproject.org
@@ -8,10 +8,6 @@ dns_search1: "stg.iad2.fedoraproject.org"
 dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.167.13
-br0_dev: eth2
-
 has_ipv4: yes
 br0_ipv4: 10.3.167.13
 br0_ipv4_nm: 24
@@ -47,4 +43,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org
index bb65ca450f..d309fec8d6 100644
--- a/inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-04.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.14
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.14
 br0_ipv4_nm: 24
@@ -45,4 +41,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org
index 137a726dac..01b88a9392 100644
--- a/inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-05.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.15
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.15
 br0_ipv4_nm: 24
@@ -45,4 +41,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org
index c5ef5aae70..811d18b868 100644
--- a/inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-06.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.16
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.16
 br0_ipv4_nm: 24
@@ -45,4 +41,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org
index 6944932077..984ba14ded 100644
--- a/inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-07.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.17
-br0_dev: eno1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.17
 br0_ipv4_nm: 24
@@ -45,4 +41,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+    
diff --git a/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org
index fe59849c22..7fb040de1a 100644
--- a/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org
@@ -7,10 +7,6 @@ dns2: 10.3.163.34
 dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 
-# keep until roles/clevis/templates/99-clevis-fix.conf fixed
-br0_ip: 10.3.169.18
-br0_dev: eth1
-
 has_ipv4: yes
 br0_ipv4: 10.3.169.18
 br0_ipv4_nm: 24
@@ -45,4 +41,4 @@ network_connections:
     type: ethernet
     master: br0
     mac: "{{ br0_port0_mac }}"
-    
\ No newline at end of file
+