diff --git a/cleanImages.sh b/cleanImages.sh
index 9775170cc9..d759434a49 100644
--- a/cleanImages.sh
+++ b/cleanImages.sh
@@ -1,4 +1,14 @@
 #!/bin/bash
 set -x
 
-echo $imagesToBeDeleted
+imagesToBeDeleted="alfresco-content-repository\|ags-repo-enterprise\|ags-share-enterprise\|alfresco-share"
+echo "List all images:"
+docker images -a
+
+docker_images_list=$(docker images | grep '$imagesToBeDeleted' | awk '{print $3}' | uniq)
+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
+fi