diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 1ba4c5d48..a252b6813 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -462,7 +462,7 @@
         environment:
           CEPH_VOLUME_DEBUG: 1
           CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-          CEPH_CONTAINER_BINARY: "{{ container_binary }}"
+          CEPH_CONTAINER_BINARY: "docker"
         with_items: "{{ lvm_volumes }}"
 
       - name: zap and destroy osds created by ceph-volume with devices
@@ -472,7 +472,7 @@
         environment:
           CEPH_VOLUME_DEBUG: 1
           CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
-          CEPH_CONTAINER_BINARY: "{{ container_binary }}"
+          CEPH_CONTAINER_BINARY: "docker"
         with_items: "{{ devices | default([]) }}"
     when:
       - osd_scenario == "lvm"
@@ -561,6 +561,42 @@
       path: /etc/profile.d/ceph-aliases.sh
       state: absent
 
+- name: check container hosts
+
+  hosts:
+    - "{{ mon_group_name|default('mons') }}"
+    - "{{ osd_group_name|default('osds') }}"
+    - "{{ mds_group_name|default('mdss') }}"
+    - "{{ rgw_group_name|default('rgws') }}"
+    - "{{ rbdmirror_group_name|default('rbdmirrors') }}"
+    - "{{ nfs_group_name|default('nfss') }}"
+    - "{{ mgr_group_name|default('mgrs') }}"
+
+  become: true
+
+  tasks:
+
+  - import_role:
+      name: ceph-defaults
+      private: false
+
+  - name: show container list on all the nodes (should be empty)
+    command: >
+      docker ps --filter='name=ceph' -a -q
+    register: containers_list
+    changed_when: false
+
+  - name: show container images on all the nodes (should be empty if tags was passed remove_img)
+    command: >
+      docker images
+    register: images_list
+    changed_when: false
+
+  - name: fail if container are still present
+    fail:
+      msg: "It looks like container are still present."
+    when: containers_list.stdout_lines|length > 0
+
 - name: remove installed packages
 
   hosts:
@@ -750,7 +786,6 @@
   - name: remove data
     shell: rm -rf /var/lib/ceph/*
 
-
 - name: purge fetch directory
 
   hosts: