diff --git a/scripts/cleanImages.sh b/scripts/cleanImages.sh
index b0607ba391..8d58cfdc02 100755
--- a/scripts/cleanImages.sh
+++ b/scripts/cleanImages.sh
@@ -10,5 +10,10 @@ if [ "$docker_images_list" == "" ]; then
     echo "No docker images on the agent"
 else
     echo "Clearing images: $docker_images_list"
-    docker rmi -f $docker_images_list
+    if docker rmi -f $docker_images_list ; then
+        echo "Deleting images was successful."
+    else
+        echo "Deleting specified images failed, so falling back to delete ALL images on system."
+        docker rmi -f $(docker images -aq)
+    fi
 fi