diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 049580f..8dd93b7 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
 
 # Entrypoint for reform-build-kernel docker image
+OUTPUT="/output/$KERNEL_VERSION"
 
-if [ -f /output/Image ]
+[[ -d "$OUTPUT" ]] || mkdir "$OUTPUT"
+
+if [ -f "$OUTPUT/Image" ]
 then
     printf "Kernel image exist in destination aborting compilation.\n"
     exit 0
@@ -10,9 +13,9 @@ fi
 
 if ./make_kernel.sh
 then
-    cp linux/arch/arm64/boot/Image /output/
-    cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dtb /output/imx8mq-mnt-reform2-single-display.dtb
-    cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2-hdmi.dtb /output/imx8mq-mnt-reform2-dual-display.dtb
+    cp linux/arch/arm64/boot/Image "$OUTPUT"
+    cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dtb "$OUTPUT/imx8mq-mnt-reform2-single-display.dtb"
+    cp linux/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2-hdmi.dtb "$OUTPUT/imx8mq-mnt-reform2-dual-display.dtb"
 else
     printf "Error when building Kernel\n" 1>&2
     exit 10