diff --git a/reform2-imx8mq/.gitignore b/reform2-imx8mq/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..693f76aa2783f9ffb82666365d1a0bd0b4c960b2
--- /dev/null
+++ b/reform2-imx8mq/.gitignore
@@ -0,0 +1,6 @@
+linux-5.7-rc6.imx8mq-mnt-reform2.kernel
+linux-5.7-rc6.tar.gz
+linux-5.7-rc6
+!linux-5.7-rc6/.config
+!linux-5.7-rc6/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts
+!linux-5.7-rc6/arch/arm64/boot/dts/freescale/imx8mq.dtsi
diff --git a/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do b/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
index a67a35f8b9f27fb33973a53f80b411eaa1ac3dae..d96c2b1c96f528bafd0a531193182cde5f9b0f0f 100644
--- a/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
+++ b/reform2-imx8mq/default.imx8mq-mnt-reform2.dtb.do
@@ -3,43 +3,28 @@
 >/dev/null command -v bison
 
 redo-ifchange "${2}".tar.gz
-tar xzf "${2}".tar.gz
+tar \
+ --extract \
+ --gzip \
+ --file "${2}".tar.gz \
+ --skip-old-files \
 
-REFORM_D=imx8mq-mnt-reform2
 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 \
 
 export \
  ARCH=arm64 \
  LOADADDR=0x40480000 \
  CROSS_COMPILE=aarch64-linux-gnu- \
 
->"${LINUX_D}"/.config.do cat <<EOF
- FILE=../"${REFORM_D}"/kernel-config
- redo-ifchange "\${FILE}"
- cp "\${FILE}" "\${3}"
-EOF
-
-redo-ifchange "${LINUX_D}"/.config
-
->"${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts.do cat <<EOF
- FILE=../../../../../../"${REFORM_D}"/imx8mq-mnt-reform2.dts
- redo-ifchange "\${FILE}"
- cp "\${FILE}" "\${3}"
-EOF
-
-redo "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts
-
->"${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi.do cat <<EOF
- FILE=../../../../../../"${REFORM_D}"/imx8mq.dtsi
- redo-ifchange "\${FILE}"
- cp "\${FILE}" "\${3}" 
-EOF
-
 redo "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi
 
 (
  cd "${LINUX_D}"
- for PATCHFILE in ../"${REFORM_D}"/patches/*.patch; do
+ for PATCHFILE in ../template-kernel/patches/*.patch; do
   git apply --check "${PATCHFILE}"
   git apply "${PATCHFILE}"
  done
diff --git a/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do b/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
index fc14f921d28685faad4b7a9e1db27971dc6e1095..ebbce28a22a851a83ddaf5f49a8d230372f0dd26 100644
--- a/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
+++ b/reform2-imx8mq/default.imx8mq-mnt-reform2.kernel.do
@@ -3,43 +3,26 @@
 >/dev/null command -v bison
 
 redo-ifchange "${2}".tar.gz
-tar xzf "${2}".tar.gz
+tar \
+ --extract \
+ --gzip \
+ --file "${2}".tar.gz \
+ --skip-old-files \
 
-REFORM_D=imx8mq-mnt-reform2
 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 \
 
 export \
  ARCH=arm64 \
  LOADADDR=0x40480000 \
  CROSS_COMPILE=aarch64-linux-gnu- \
 
->"${LINUX_D}"/.config.do cat <<EOF
- FILE=../"${REFORM_D}"/kernel-config
- redo-ifchange "\${FILE}"
- cp "\${FILE}" "\${3}"
-EOF
-
-redo-ifchange "${LINUX_D}"/.config
-
->"${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts.do cat <<EOF
- FILE=../../../../../../"${REFORM_D}"/imx8mq-mnt-reform2.dts
- redo-ifchange "\${FILE}"
- cp "\${FILE}" "\${3}"
-EOF
-
-redo "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts
-
->"${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi.do cat <<EOF
- FILE=../../../../../../"${REFORM_D}"/imx8mq.dtsi
- redo-ifchange "\${FILE}"
- cp "\${FILE}" "\${3}" 
-EOF
-
-redo "${LINUX_D}"/arch/arm64/boot/dts/freescale/imx8mq.dtsi
-
 (
  cd "${LINUX_D}"
- for PATCHFILE in ../"${REFORM_D}"/patches/*.patch; do
+ for PATCHFILE in ../template-kernel/patches/*.patch; do
   git apply --check "${PATCHFILE}"
   git apply "${PATCHFILE}"
  done
diff --git a/reform2-imx8mq/template-kernel/kernel-config b/reform2-imx8mq/linux-5.7-rc6/.config
similarity index 100%
rename from reform2-imx8mq/template-kernel/kernel-config
rename to reform2-imx8mq/linux-5.7-rc6/.config
diff --git a/reform2-imx8mq/template-kernel/imx8mq-mnt-reform2.dts b/reform2-imx8mq/linux-5.7-rc6/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts
similarity index 100%
rename from reform2-imx8mq/template-kernel/imx8mq-mnt-reform2.dts
rename to reform2-imx8mq/linux-5.7-rc6/arch/arm64/boot/dts/freescale/imx8mq-mnt-reform2.dts
diff --git a/reform2-imx8mq/template-kernel/imx8mq.dtsi b/reform2-imx8mq/linux-5.7-rc6/arch/arm64/boot/dts/freescale/imx8mq.dtsi
similarity index 100%
rename from reform2-imx8mq/template-kernel/imx8mq.dtsi
rename to reform2-imx8mq/linux-5.7-rc6/arch/arm64/boot/dts/freescale/imx8mq.dtsi