diff --git a/.gitlab/check-supported-images.sh b/.gitlab/check-supported-images.sh
index 645f83200c604a8f00177e0a8f6427cdeb9967d8..4b14ccb14be3fe9a2198fedaa3cfcc7638461d24 100755
--- a/.gitlab/check-supported-images.sh
+++ b/.gitlab/check-supported-images.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 echo "Starting registry check ..."
 
+SUPPORTED_VERSIONS="1.7.3, 1.8.0"
+MAINTAINED_SERVICES="analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-db, search-service, search-service-init, storage-service-init, ui"
+CI_REGISTRY2_URL="registry.datalab.tuwien.ac.at/dbrepo"
+
 VERSIONS=(${SUPPORTED_VERSIONS//,/ })
 SERVICES=(${MAINTAINED_SERVICES//,/ })
 
@@ -14,7 +18,6 @@ for SERVICE in "${SERVICES[@]}"; do
       >&2 echo "[ERROR] Failed to find image: ${CI_REGISTRY2_URL}/${SERVICE}:${VERSION}"
       exit 1
     fi
-    echo "[DEBUG] Found image: ${CI_REGISTRY2_URL}/${SERVICE}:${VERSION}"
   done
-  echo "[INFO] Finished successfully."
 done
+echo "[INFO] Finished successfully."
diff --git a/.gitlab/remove-unsupported-images.sh b/.gitlab/remove-unsupported-images.sh
index 7fb90b75a274bd81dd057f8cd843f7ea98a9b195..141246e5dae8ce75f7830183efb8c1210c0f11a7 100755
--- a/.gitlab/remove-unsupported-images.sh
+++ b/.gitlab/remove-unsupported-images.sh
@@ -1,30 +1,17 @@
 #!/bin/bash
 echo "Starting registry housekeeping ..."
 
-SUPPORTED_VERSIONS="1.7.3, 1.8.0"
-MAINTAINED_SERVICES="analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-db, search-service, search-service-init, storage-service-init, ui"
 VERSIONS=(${SUPPORTED_VERSIONS//,/ })
 SERVICES=(${MAINTAINED_SERVICES//,/ })
 
-CI_REGISTRY2_URL="registry.datalab.tuwien.ac.at/dbrepo"
-
 for SERVICE in "${SERVICES[@]}"; do
   TAGS=$(regctl tag ls "${CI_REGISTRY2_URL}/${SERVICE}")
   TAGS=(${TAGS//\n/ })
   for TAG in "${TAGS[@]}"; do
     if [[ ! "${VERSIONS[*]}" =~ $TAG ]]; then
-      echo "===> ${TAG}"
+      regctl tag rm ${CI_REGISTRY2_URL}/${SERVICE}:$TAG
+      echo "[INFO] Deleted unsupported tag ${CI_REGISTRY2_URL}/${SERVICE}:$TAG"
     fi
   done
 done
-#for key in "${!services[@]}"; do
-#  echo "Checking ${CI_REGISTRY2_URL}/${services[$key]} tags ..."
-#  TAGS=$(regctl tag ls ${CI_REGISTRY2_URL}/${services[$key]})
-#  for tag in $TAGS; do
-#      res=$(echo "${SUPPORTED_VERSIONS}" | grep "$tag")
-#      if [[ -z $res ]]; then
-#        regctl tag rm ${CI_REGISTRY2_URL}/${services[$key]}:$tag
-#        echo "Deleted unsupported tag ${CI_REGISTRY2_URL}/${services[$key]}:$tag"
-#      fi
-#  done
-#done
+echo "[INFO] Finished successfully."