diff --git a/diskimage_builder/lib/common-functions b/diskimage_builder/lib/common-functions
index 77cdd185..31a21046 100644
--- a/diskimage_builder/lib/common-functions
+++ b/diskimage_builder/lib/common-functions
@@ -193,7 +193,7 @@ function kill_chroot_processes () {
 }
 
 function cleanup_build_dir () {
-    if ! timeout 5  sh -c " while ! sudo rm -rf $TMP_BUILD_DIR/built; do sleep 1; done"; then
+    if ! timeout 10  sh -c " while ! sudo rm -rf $TMP_BUILD_DIR/built; do sleep 1; done"; then
         echo "ERROR: unable to cleanly remove $TMP_BUILD_DIR/built"
         exit 1
     fi
diff --git a/diskimage_builder/lib/img-functions b/diskimage_builder/lib/img-functions
index d22c0d41..e08d4a4d 100644
--- a/diskimage_builder/lib/img-functions
+++ b/diskimage_builder/lib/img-functions
@@ -95,7 +95,7 @@ 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
-      if ! timeout 5  sh -c " while ! sudo rmdir $TMP_MOUNT_PATH/tmp/in_target.d; do sleep 1; done"; then
+      if ! timeout 10  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