diff --git a/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do b/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
index 4a208a8197696941d07636165a80fc9f4933e4ec..1649b0e2f43d47f73619147ecc480d017d4f44b3 100644
--- a/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
+++ b/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
@@ -3,28 +3,27 @@
 >/dev/null command -v flex
 >/dev/null command -v bison
 
-redo-ifchange "${2}".tar.gz
+LINUX_VERSION="${2}"
+
+redo-ifchange "${LINUX_VERSION}".tar.gz
 tar \
  --extract \
  --gzip \
  --file "${2}".tar.gz \
  --skip-old-files \
 
-LINUX_D="${2}"
 redo-ifchange \
- "${LINUX_D}"/.config \
- "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts \
- "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi \
+ "${LINUX_VERSION}"/.config \
+ "${LINUX_VERSION}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts \
+ "${LINUX_VERSION}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi \
 
 export \
  ARCH=arm64 \
  LOADADDR=0x40480000 \
  CROSS_COMPILE=aarch64-linux-gnu- \
 
-redo "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi
-
 (
- cd "${LINUX_D}"
+ cd "${LINUX_VERSION}"
  for PATCHFILE in ../template-kernel/patches/*.patch; do
   git apply --check "${PATCHFILE}"
   git apply "${PATCHFILE}"
@@ -37,4 +36,4 @@ redo "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi
  >&2 make -j "$(nproc)" freescale/imx8mq-mnt-reform2.dtb
 )
 
-cp "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts "${3}"
+cp "${LINUX_VERSION}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts "${3}"
diff --git a/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do b/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
index b56cd7b74640d1dd94977d10999cdf8b75a08aef..64aad02d0e6ca9efec7a2bbf7006beab1d3cbd35 100644
--- a/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
+++ b/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
@@ -3,18 +3,19 @@
 >/dev/null command -v flex
 >/dev/null command -v bison
 
-redo-ifchange "${2}".tar.gz
+LINUX_VERSION="${2}"
+
+redo-ifchange "${LINUX_VERSION}".tar.gz
 tar \
  --extract \
  --gzip \
  --file "${2}".tar.gz \
  --skip-old-files \
 
-LINUX_D="${2}"
 redo-ifchange \
- "${LINUX_D}"/.config \
- "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts \
- "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi \
+ "${LINUX_VERSION}"/.config \
+ "${LINUX_VERSION}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts \
+ "${LINUX_VERSION}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi \
 
 export \
  ARCH=arm64 \
@@ -22,7 +23,7 @@ export \
  CROSS_COMPILE=aarch64-linux-gnu- \
 
 (
- cd "${LINUX_D}"
+ cd "${LINUX_VERSION}"
  for PATCHFILE in ../template-kernel/patches/*.patch; do
   git apply --check "${PATCHFILE}"
   git apply "${PATCHFILE}"
@@ -31,4 +32,4 @@ export \
  >&2 make -j "$(nproc)" Image
 )
 
-cp "${LINUX_D}"/arch/arm64/boot/Image "${3}"
+cp "${LINUX_VERSION}"/arch/arm64/boot/Image "${3}"