diff --git a/contrib/network-storage/heketi/heketi-tear-down.yml b/contrib/network-storage/heketi/heketi-tear-down.yml
index da2c05eb7..92b9f92d6 100644
--- a/contrib/network-storage/heketi/heketi-tear-down.yml
+++ b/contrib/network-storage/heketi/heketi-tear-down.yml
@@ -1,4 +1,9 @@
 ---
-- hosts: localhost
+- hosts: kube-master[0]
   roles:
     - { role: tear-down }
+
+- hosts: heketi-node
+  become: yes
+  roles:
+    - { role: tear-down-disks }
diff --git a/contrib/network-storage/heketi/roles/tear-down/tasks/disks.yml b/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
similarity index 69%
rename from contrib/network-storage/heketi/roles/tear-down/tasks/disks.yml
rename to contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
index dace142ed..01e03660c 100644
--- a/contrib/network-storage/heketi/roles/tear-down/tasks/disks.yml
+++ b/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
@@ -1,6 +1,5 @@
 ---
 - name: "Install lvm utils (RedHat)"
-  delegate_to: "{{ node }}"
   become: true
   yum:
       name: "lvm2"
@@ -8,34 +7,31 @@
   when: "ansible_os_family == 'RedHat'"
 
 - name: "Install lvm utils (Debian)"
-  delegate_to: "{{ node }}"
   become: true
   apt:
       name: "lvm2"
       state: "present"
   when: "ansible_os_family == 'Debian'"
+
 - name: "Get volume group information."
-  delegate_to: "{{ node }}"
   become: true
-  shell: "pvs {{ disk }} --option vg_name | tail -n+2"
-  vars: { disk: "{{ hostvars[node]['disk_volume_device_1'] }}" }
+  shell: "pvs {{ disk_volume_device_1 }} --option vg_name | tail -n+2"
   register: "volume_groups"
   ignore_errors: true
   changed_when: false
+
 - name: "Remove volume groups."
-  delegate_to: "{{ node }}"
   become: true
   command: "vgremove {{ volume_group }} --yes"
   with_items: "{{ volume_groups.stdout_lines }}"
   loop_control: { loop_var: "volume_group" }
+
 - name: "Remove physical volume from cluster disks."
-  delegate_to: "{{ node }}"
   become: true
-  command: "pvremove {{ disk }} --yes"
-  vars: { disk: "{{ hostvars[node]['disk_volume_device_1'] }}" }
+  command: "pvremove {{ disk_volume_device_1 }} --yes"
   ignore_errors: true
+
 - name: "Remove lvm utils (RedHat)"
-  delegate_to: "{{ node }}"
   become: true
   yum:
       name: "lvm2"
@@ -43,7 +39,6 @@
   when: "ansible_os_family == 'RedHat'"
 
 - name: "Remove lvm utils (Debian)"
-  delegate_to: "{{ node }}"
   become: true
   apt:
       name: "lvm2"
diff --git a/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml b/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
index 3c9659bae..5c5e69ab8 100644
--- a/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
+++ b/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
@@ -49,8 +49,3 @@
   command: "{{ bin_dir }}/kubectl delete secret {{ secrets.stdout|from_json|json_query(storage_query) }}"
   when: "storage_query is defined"
   ignore_errors: true
-- name: "Prepare cluster disks."
-  include_tasks: "disks.yml"
-  with_items: "{{ groups['heketi-node'] }}"
-  loop_control:
-    loop_var: "node"