diff --git a/files/hotfix/nbde_client.conf b/files/hotfix/nbde_client.conf
deleted file mode 100644
index 579fab6850..0000000000
--- a/files/hotfix/nbde_client.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# nbde_client dracut config
-kernel_cmdline="ip=dhcp"
-omit_dracutmodules+=" ifcfg "
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index caad509890..dccb91b502 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -18,13 +18,21 @@
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
-  - name: override nbde_client.conf to work around bug
+  - name: override nbde_client-network-flush to work around bug
     copy:
-      src: "{{ files }}/hotfix/nbde_client.conf"
-      dest: /etc/dracut.conf.d/nbde_client.conf
+      src: "{{ files }}/common/nbde_client-network-flush"
+      dest: /usr/bin/nbde_client-network-flush
       owner: root
       group: root
-      mode: 444 
+      mode: 755 
+
+  - name: tell NetworkManager we don't want any auto connections
+    copy:
+      src: "{{ files }}/common/noautodefault.conf"
+      dest: /etc/NetworkManager/conf.d/noautodefault.conf
+      owner: root
+      group: root
+      mode: 644 
 
   roles:
   - base