diff --git a/lib/img-functions b/lib/img-functions
index 6e94423b..852f575b 100644
--- a/lib/img-functions
+++ b/lib/img-functions
@@ -86,7 +86,10 @@ function run_d_in_target () {
       trap - ERR
       check_break after-$1 run_in_target bash
       sudo umount -f $TMP_MOUNT_PATH/tmp/in_target.d
-      sudo rmdir $TMP_MOUNT_PATH/tmp/in_target.d
+      if ! timeout 5  sh -c " while ! sudo rmdir $TMP_MOUNT_PATH/tmp/in_target.d; do sleep 1; done"; then
+          echo "ERROR: unable to cleanly remove $TMP_MOUNT_PATH/tmp/in_target.d"
+          exit 1
+      fi
     fi
 }