diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh
index d7f64da..0188d47 100755
--- a/tools-image/build-arm-image.sh
+++ b/tools-image/build-arm-image.sh
@@ -75,13 +75,11 @@ cleanup() {
   if [ "$disable_lvm" == "false" ]; then
     lvremove --yes KairosVG
   fi
-
-  for LOOPS in $(losetup -a | awk -F':' {'print $1'} | awk -F'/' {'print $3'}); do
-    for LOOPPART in $(ls /dev/mapper/${LOOPS}*| awk -F'/' {'print $4'}); do
-      dmsetup remove "${LOOPPART}" || true;
-    done;
-    losetup -d /dev/"${LOOPS}" || true;
-  done
+  MAPPER_LOOP=$(basename "$LOOP")
+    for LOOPPART in $(ls /dev/mapper/"${MAPPER_LOOP}"*| awk -F'/' {'print $4'}); do
+    dmsetup remove "${LOOPPART}" || true;
+  done;
+  losetup -d "${LOOP}" || true;
 }
 
 ensure_dir_structure() {