diff --git a/common.sh b/common.sh
index bb37c35b3..82fa0186b 100644
--- a/common.sh
+++ b/common.sh
@@ -425,10 +425,11 @@ userpatch_create()
 	for i in {3..1..1}; do echo -n "$i." && sleep 1; done
 }
 
-# overlayfs_wrapper <operation> <workdir>
+# overlayfs_wrapper <operation> <workdir> <description>
 #
 # <operation>: wrap|cleanup
 # <workdir>: path to source directory
+# <description>: suffix for merged directory to help locating it in /tmp
 # return value: new directory
 #
 # Assumptions/notes:
@@ -447,9 +448,10 @@ overlayfs_wrapper()
 	local operation="$1"
 	if [[ $operation == wrap ]]; then
 		local srcdir="$2"
+		local description="$3"
 		local tempdir=$(mktemp -d)
 		local workdir=$(mktemp -d)
-		local mergeddir=$(mktemp -d)
+		local mergeddir=$(mktemp -d --suffix="_$description")
 		mount -t overlay overlay -o lowerdir="$srcdir",upperdir="$tempdir",workdir="$workdir" "$mergeddir"
 		# this is executed in a subshell, so use temp files to pass extra data outside
 		echo "$tempdir" >> /tmp/.overlayfs_wrapper_cleanup
diff --git a/main.sh b/main.sh
index 7d22689b9..9b0c507c8 100644
--- a/main.sh
+++ b/main.sh
@@ -206,7 +206,7 @@ if [[ ! -f $DEST/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb ]]; then
 		find_toolchain "UBOOT" "$UBOOT_NEEDS_GCC" "UBOOT_TOOLCHAIN"
 	fi
 
-	compile_uboot $(overlayfs_wrapper "wrap" "$SOURCES/$BOOTSOURCEDIR")
+	compile_uboot $(overlayfs_wrapper "wrap" "$SOURCES/$BOOTSOURCEDIR" "u-boot_${LINUXFAMILY}_${BRANCH}")
 fi
 
 # Compile kernel if packed .deb does not exist
@@ -217,7 +217,7 @@ if [[ ! -f $DEST/debs/${CHOSEN_KERNEL}_${REVISION}_${ARCH}.deb ]]; then
 		find_toolchain "KERNEL" "$KERNEL_NEEDS_GCC" "KERNEL_TOOLCHAIN"
 	fi
 
-	compile_kernel $(overlayfs_wrapper "wrap" "$SOURCES/$LINUXSOURCEDIR")
+	compile_kernel $(overlayfs_wrapper "wrap" "$SOURCES/$LINUXSOURCEDIR" "kernel_${LINUXFAMILY}_${BRANCH}")
 fi
 
 overlayfs_wrapper "cleanup"