diff --git a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
index 0dc2af1..2c46439 100644
--- a/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
+++ b/plans/dcaegen2-collectors-datafile/Functional-suite/teardown.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-running_containers=$(docker ps --filter name=dfc_ -q)
-
+running_containers=$(docker ps --filter name=dfc_ -qa)
+running_images=$(docker images -q)
 
 if [ -z "$running_containers" ]
 then
@@ -10,5 +10,6 @@
     echo "Stopping and removing containers"
     docker stop $running_containers
     docker rm $running_containers
+    docker rmi $running_images
 fi