diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 879263a5d3..10ac5d88f8 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -149,6 +149,7 @@ nagios_Check_Services:
   swap: true
 nat_rules: []
 # default network block device encryption settings for linux-system-roles/nbde_client
+nbde: true
 nbde_client_bindings:
   - device: /dev/md2
     encryption_password: "{{ nbde_password }}"
diff --git a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org b/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
index 78a0af7e10..9fce28ae1b 100644
--- a/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvmhost-s390x-01.s390.fedoraproject.org
@@ -1,6 +1,7 @@
 dns1: 10.3.163.33
 dns2: 10.3.163.34
 dns_search1: fedoraproject.org
+nbde: false
 network_connections:
   - autoconnect: true
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org
index 68826f0e28..1ea832c406 100644
--- a/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-01.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:d3:c0
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org
index 386b43657a..c614404c5f 100644
--- a/inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-01.stg.iad2.fedoraproject.org
@@ -11,6 +11,7 @@ dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:ef:20
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org
index d66d24458f..f407da1944 100644
--- a/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-02.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:c2:c0
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org
index 49a4822c1b..2feb8f7835 100644
--- a/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-03.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6b:0a:40
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org
index d3a3f8ed2e..535837d61c 100644
--- a/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-04.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:b5:d0
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
index 7da2cd2087..7817c445f2 100644
--- a/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-05.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:ef:70
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
index 63410d6156..2957bf31b9 100644
--- a/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-06.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:ba:60
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
index c3f2b45e7f..b811ed21d3 100644
--- a/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-07.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6b:07:00
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
index 3221daba55..c1dd8e3684 100644
--- a/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-08.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:c2:00
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
index ac78d57bda..8c22a83feb 100644
--- a/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-09.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:c9:70
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-10.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-10.iad2.fedoraproject.org
index 3c219ca59f..da97f2bd7a 100644
--- a/inventory/host_vars/bvmhost-a64-10.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-10.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:dd:a0
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-11.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-11.iad2.fedoraproject.org
index edfda2aca8..75f753afa2 100644
--- a/inventory/host_vars/bvmhost-a64-11.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-11.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:c2:50
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org
index a74ee86e21..75790af276 100644
--- a/inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-a64-osbs-01.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 50:6b:4b:6a:b7:f0
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-p08-01.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p08-01.stg.iad2.fedoraproject.org
index c90cc6e8aa..300c600b4a 100644
--- a/inventory/host_vars/bvmhost-p08-01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p08-01.stg.iad2.fedoraproject.org
@@ -11,6 +11,7 @@ dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 has_ipv4: yes
 mac1: 80:61:5f:06:96:5e
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org
index e277c33a2a..b3719326dc 100644
--- a/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-01.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 40:a6:b7:18:8a:38
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org
index 2ef8e429a8..8c9be03990 100644
--- a/inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-01.stg.iad2.fedoraproject.org
@@ -11,6 +11,7 @@ dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 has_ipv4: yes
 mac3: b8:ce:f6:88:9a:de
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org
index b5a36a4c00..8360d5de0a 100644
--- a/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-02.iad2.fedoraproject.org
@@ -11,6 +11,7 @@ dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: ac:1f:6b:56:e9:11
 mac2: 40:a6:b7:18:86:b4
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org
index 3b8293b4bd..1ad91520b0 100644
--- a/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-03.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 40:a6:b7:18:85:74
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org
index feaf08a074..f8fa855495 100644
--- a/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-04.iad2.fedoraproject.org
@@ -11,6 +11,7 @@ dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 40:a6:b7:18:85:74
 mac2: 40:a6:b7:18:86:c8
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org
index 56b129febe..9895f203c8 100644
--- a/inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-p09-05.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search2: "iad2.fedoraproject.org"
 dns_search3: "fedoraproject.org"
 has_ipv4: yes
 mac2: b8:ce:f6:c5:ff:66
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org b/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org
index 7c5c476b73..e648c09b9d 100644
--- a/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/bvmhost-x86-08.iad2.fedoraproject.org
@@ -13,6 +13,14 @@ mac1: e4:43:4b:24:19:96
 mac2: e4:43:4b:24:19:76
 mac3: e4:43:4b:24:19:97
 mac4: e4:43:4b:24:19:78
+nbde_client_bindings:
+  - device: /dev/md127
+    encryption_password: "{{ nbde_password }}"
+    password_temporary: no
+    threshold: 1
+    servers:
+      - http://tang01.iad2.fedoraproject.org
+      - http://tang02.iad2.fedoraproject.org
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org
index 6ee2bddcc6..efb22464a0 100644
--- a/inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-08.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac1: 24:6e:96:b1:61:f8
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org b/inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org
index 98373206a0..3efaac7822 100644
--- a/inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org
+++ b/inventory/host_vars/vmhost-x86-09.iad2.fedoraproject.org
@@ -10,6 +10,7 @@ dns_search1: "iad2.fedoraproject.org"
 dns_search2: "fedoraproject.org"
 has_ipv4: yes
 mac2: 24:6e:96:b1:61:c0
+nbde: false
 network_connections:
   - autoconnect: yes
     ip:
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index 25a56ac5c9..4dd4265dcd 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -30,7 +30,7 @@
   - { role: iscsi_client, when: "inventory_hostname.startswith(('bvmhost-x86-06', 'bvmhost-x86-07')) and datacenter == 'iad2'" }
   - sudo
   - virthost
-  - { role: linux-system-roles.nbde_client, when: datacenter == 'iad2' }
+  - { role: linux-system-roles.nbde_client, when: datacenter == 'iad2' and nbde == 'true' }
   - { role: serial-console, when: datacenter == 'iad2' and not inventory_hostname.startswith('buildvmhost-s390x') }
 
   tasks: