diff --git a/playbooks/groups/openqa-workers.yml b/playbooks/groups/openqa-workers.yml
index e8cc4021ab..ce43f5956b 100644
--- a/playbooks/groups/openqa-workers.yml
+++ b/playbooks/groups/openqa-workers.yml
@@ -12,22 +12,6 @@
   - include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
 
-  - name: override nbde_client-network-flush to work around bug
-    copy:
-      src: "{{ files }}/common/nbde_client-network-flush"
-      dest: /usr/bin/nbde_client-network-flush
-      owner: root
-      group: root
-      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:
    - { role: base, tags: ['base'] }
    - { role: rkhunter, tags: ['rkhunter'] }
@@ -37,7 +21,7 @@
    - { role: collectd/base, tags: ['collectd_base'] }
    - { role: sudo, tags: ['sudo'] }
    - { role: openqa/worker, tags: ['openqa_worker'] }
-   - { role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: datacenter == 'iad2' }
+   - { role: linux-system-roles.nbde_client, tags: ['nbde_client'], when: datacenter == 'iad2' and not inventory_hostname.startswith 'openqa-a64' }
    - apache
 
   tasks: