diff --git a/ansible/roles/destroy/tasks/cleanup_containers.yml b/ansible/roles/destroy/tasks/cleanup_containers.yml
index 4ccdd9cdd8..c6aee8ef5e 100644
--- a/ansible/roles/destroy/tasks/cleanup_containers.yml
+++ b/ansible/roles/destroy/tasks/cleanup_containers.yml
@@ -1,3 +1,10 @@
 ---
-- name: Destroying all Kolla containers and volumes
+- name: Destroying all Kolla containers and volumes on compute node
+  environment:
+    COMPUTE: true
   command: /tmp/kolla-cleanup/tools/cleanup-containers
+  when: inventory_hostname in groups['compute']
+
+- name: Destroying all Kolla containers and volumes on non compute node
+  command: /tmp/kolla-cleanup/tools/cleanup-containers
+  when: inventory_hostname not in groups['compute']
diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index 14249c9605..c73d197dda 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -1,5 +1,5 @@
 #!/bin/bash
-if [[ $(pgrep qemu) ]]; then
+if [[ $COMPUTE ]] && [[ $(pgrep qemu) ]]; then
     echo "Some qemu processes were detected."
     echo "Docker will not be able to stop the nova_libvirt container with those running."
     echo "Please clean them up before rerunning this script."