diff --git a/src/com/mirantis/mcp/Calico.groovy b/src/com/mirantis/mcp/Calico.groovy
index a1e4721..b1b3dfd 100644
--- a/src/com/mirantis/mcp/Calico.groovy
+++ b/src/com/mirantis/mcp/Calico.groovy
@@ -513,14 +513,11 @@
         NODE_CONTAINER_NAME=${nodeImage} make st
       """
     } catch (Exception e) {
-      sh """cd calico_home/calico_node
-        make stop-etcd"""
-      // FIXME: cleaning has to be done by make stop/clean targets
       sh """
-        for dc in calico-felix cali-st-ext-nginx cali-st-host cali-st-gw host1 host2 host3; do
-          docker rm -f "\${dc}" || :
-        done
-      """
+        cd calico_home/calico_node
+        make stop-etcd
+        make clean
+        """
       if (failOnErrors) {
         throw e
       }