diff --git a/image/Makefile b/image/Makefile
index 1ad137ea..d6125511 100644
--- a/image/Makefile
+++ b/image/Makefile
@@ -1,13 +1,30 @@
+.PHONY: ensure-checkout build-image clean clean-docker
 
+COMMIT_HASH := 1f6508fd12d0045da34eef37f140af8509b3886d
 
-image:
+gen-image:
 	git clone https://github.com/RPi-Distro/pi-gen.git gen-image
-	cd gen-image && \
-		git checkout 1a5baa1d3592e42899d7553bdf00a4cabc364564
+
+ensure-checkout: gen-image
+	git -C gen-image fetch --all
+	git -C gen-image reset --hard $(COMMIT_HASH)
+	git -C gen-image clean -fdx
+	git -C gen-image apply ../gen-image_export-image.patch
+
+build-image: ensure-checkout
+	cp -r image-config/config gen-image
+	cp -r image-config/stage-nextbox gen-image
+	cd gen-image && ./build.sh
+	#find . -name deploy
+
+build-image-docker: ensure-checkout
 	cp -r image-config/config gen-image
 	cp -r image-config/stage-nextbox gen-image
-	sed -i -e 's/setarch linux32 //g' gen-image/scripts/common
-	cd gen-image && \
-		./build.sh
-	find . -name deploy
+	cd gen-image && CONTINUE=1 ./build-docker.sh
+	#find . -name deploy
+
+clean:
+	rm -rf gen-image
 
+clean-docker: clean
+	docker container rm -v pigen_work
diff --git a/image/gen-image_export-image.patch b/image/gen-image_export-image.patch
new file mode 100644
index 00000000..324de55c
--- /dev/null
+++ b/image/gen-image_export-image.patch
@@ -0,0 +1,13 @@
+diff --git a/export-image/prerun.sh b/export-image/prerun.sh
+index 06ca90a..0b0b78d 100755
+--- a/export-image/prerun.sh
++++ b/export-image/prerun.sh
+@@ -50,7 +50,7 @@ if [ "${NO_PRERUN_QCOW2}" = "0" ]; then
+ 	BOOT_DEV="${LOOP_DEV}p1"
+ 	ROOT_DEV="${LOOP_DEV}p2"
+ 
+-	ROOT_FEATURES="^huge_file,^orphan_file"
++	ROOT_FEATURES=""
+ 	for FEATURE in 64bit; do
+ 	if grep -q "$FEATURE" /etc/mke2fs.conf; then
+ 		ROOT_FEATURES="^$FEATURE,$ROOT_FEATURES"