diff --git a/.gitignore b/.gitignore
index 3967fbe8..a67c9cec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ ubuntu/packages/*.deb
 ubuntu/packages/*.bin
 ubuntu/packages/*.tar.gz
 .vscode
+*/http/*.ks
diff --git a/centos6/Makefile b/centos6/Makefile
index f2956fc0..f92f2faf 100644
--- a/centos6/Makefile
+++ b/centos6/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 
 export PACKER_LOG KS_PROXY
 
@@ -12,10 +11,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 centos6.tar.gz: check-deps clean http/centos6.ks
-	${SUDO} ${PACKER} init centos6.pkr.hcl && ${SUDO} ${PACKER} build centos6.pkr.hcl
+	${PACKER} init centos6.pkr.hcl && ${PACKER} build centos6.pkr.hcl
 
 http/centos6.ks: http/centos6.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-centos6 centos6.tar.gz http/centos6.ks
+	${RM} -rf output-centos6 centos6.tar.gz http/centos6.ks
+
+.INTERMEDIATE: http/centos6.ks
diff --git a/centos6/README.md b/centos6/README.md
index f4e1cdd5..27364b62 100644
--- a/centos6/README.md
+++ b/centos6/README.md
@@ -46,8 +46,8 @@ be in packer-maas/centos6, where this file is located. Once in
 packer-maas/centos6 you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build .
+packer init
+PACKER_LOG=1 packer build .
 ```
 
 Note: centos6.pkr.hcl is configured to run Packer in headless mode. Only Packer
diff --git a/centos7/Makefile b/centos7/Makefile
index 9f5973d6..14f2d9d5 100644
--- a/centos7/Makefile
+++ b/centos7/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 
 export PACKER_LOG KS_PROXY
 
@@ -12,10 +11,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 centos7.tar.gz: clean check-deps http/centos7.ks
-	${SUDO} ${PACKER} init centos7.pkr.hcl && ${SUDO} ${PACKER} build centos7.pkr.hcl
+	${PACKER} init centos7.pkr.hcl && ${PACKER} build centos7.pkr.hcl
 
 http/centos7.ks: http/centos7.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-centos7 centos7.tar.gz http/centos7.ks
+	${RM} -rf output-centos7 centos7.tar.gz http/centos7.ks
+
+.INTERMEDIATE: http/centos7.ks
diff --git a/centos7/README.md b/centos7/README.md
index de1f06f3..12caa45f 100644
--- a/centos7/README.md
+++ b/centos7/README.md
@@ -47,8 +47,8 @@ be in packer-maas/centos7, where this file is located. Once in
 packer-maas/centos7 you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build .
+packer init
+PACKER_LOG=1 packer build .
 ```
 
 Note: centos7.pkr.hcl is configured to run Packer in headless mode. Only Packer
diff --git a/centos8-stream/Makefile b/centos8-stream/Makefile
index c9453ca8..060001f1 100644
--- a/centos8-stream/Makefile
+++ b/centos8-stream/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 
 export PACKER_LOG KS_PROXY
 
@@ -12,10 +11,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 centos8-stream.tar.gz: check-deps clean http/centos8-stream.ks
-	${SUDO} ${PACKER} init centos8-stream.pkr.hcl && ${SUDO} ${PACKER} build centos8-stream.pkr.hcl
+	${PACKER} init centos8-stream.pkr.hcl && ${PACKER} build centos8-stream.pkr.hcl
 
 http/centos8-stream.ks: http/centos8-stream.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-centos8-stream centos8-stream.tar.gz http/centos8-stream.ks
+	${RM} -rf output-centos8-stream centos8-stream.tar.gz http/centos8-stream.ks
+
+.INTERMEDIATE: http/centos8-stream.ks
diff --git a/centos8-stream/README.md b/centos8-stream/README.md
index 8e92e9ec..88bdefb0 100644
--- a/centos8-stream/README.md
+++ b/centos8-stream/README.md
@@ -51,8 +51,8 @@ be in packer-maas/centos8-stream, where this file is located. Once in
 packer-maas/centos8-stream you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build .
+packer init
+PACKER_LOG=1 packer build .
 ```
 
 Note: centos8-stream.pkr.hcl is configured to run Packer in headless mode. Only Packer
diff --git a/centos8/Makefile b/centos8/Makefile
index 11ac4ecf..e6d64bf3 100644
--- a/centos8/Makefile
+++ b/centos8/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 
 export PACKER_LOG KS_PROXY
 
@@ -12,10 +11,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 centos8.tar.gz: check-deps clean http/centos8.ks
-	${SUDO} ${PACKER} init centos8.pkr.hcl && ${PACKER} build centos8.pkr.hcl
+	${PACKER} init centos8.pkr.hcl && ${PACKER} build centos8.pkr.hcl
 
 http/centos8.ks: http/centos8.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-centos8 centos8.tar.gz http/centos8.ks
+	${RM} -rf output-centos8 centos8.tar.gz http/centos8.ks
+
+.INTERMEDIATE: http/centos8.ks
diff --git a/centos8/README.md b/centos8/README.md
index dbf41715..110c06c0 100644
--- a/centos8/README.md
+++ b/centos8/README.md
@@ -51,8 +51,8 @@ be in packer-maas/centos8, where this file is located. Once in
 packer-maas/centos8 you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build .
+packer init
+PACKER_LOG=1 packer build .
 ```
 
 Note: centos8.pkr.hcl is configured to run Packer in headless mode. Only Packer
diff --git a/rhel7/Makefile b/rhel7/Makefile
index fc96f92e..278cac02 100644
--- a/rhel7/Makefile
+++ b/rhel7/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 ISO ?= ${RHEL7_ISO_PATH}
 
 export PACKER_LOG KS_PROXY
@@ -13,10 +12,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 rhel7.tar.gz: check-deps clean http/rhel7.ks
-	${SUDO} ${PACKER} init rhel7.pkr.hcl && ${SUDO} ${PACKER} build -var "rhel7_iso_path=${ISO}" rhel7.pkr.hcl
+	${PACKER} init rhel7.pkr.hcl && ${PACKER} build -var "rhel7_iso_path=${ISO}" rhel7.pkr.hcl
 
 http/rhel7.ks: http/rhel7.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-rhel7 rhel7.tar.gz http/rhel7.ks
+	${RM} -rf output-rhel7 rhel7.tar.gz http/rhel7.ks
+
+.INTERMEDIATE: http/rhel7.ks
diff --git a/rhel7/README.md b/rhel7/README.md
index 6d8ef5b0..1f40eaad 100644
--- a/rhel7/README.md
+++ b/rhel7/README.md
@@ -43,8 +43,8 @@ be in packer-maas/rhel7, where this file is located. Once in packer-maas/rhel7
 you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build -var 'rhel7_iso_path=/PATH/TO/rhel-server-7.9-x86_64-dvd.iso' .
+packer init
+PACKER_LOG=1 packer build -var 'rhel7_iso_path=/PATH/TO/rhel-server-7.9-x86_64-dvd.iso' .
 ```
 
 Note: rhel7.pkr.hcl is configured to run Packer in headless mode. Only Packer
diff --git a/rhel8/Makefile b/rhel8/Makefile
index 104ea142..1f78aea8 100644
--- a/rhel8/Makefile
+++ b/rhel8/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 ISO ?= ${RHEL8_ISO_PATH}
 
 export PACKER_LOG KS_PROXY
@@ -13,10 +12,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 rhel8.tar.gz: check-deps clean http/rhel8.ks
-	${SUDO} ${PACKER} init rhel8.pkr.hcl && ${SUDO} ${PACKER} build -var "rhel8_iso_path=${ISO}" rhel8.pkr.hcl
+	${PACKER} init rhel8.pkr.hcl && ${PACKER} build -var "rhel8_iso_path=${ISO}" rhel8.pkr.hcl
 
 http/rhel8.ks: http/rhel8.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-rhel8 rhel8.tar.gz http/rhel8.ks
+	${RM} -rf output-rhel8 rhel8.tar.gz http/rhel8.ks
+
+.INTERMEDIATE: http/rhel8.ks
\ No newline at end of file
diff --git a/rhel8/README.md b/rhel8/README.md
index d2331055..fe1457ba 100644
--- a/rhel8/README.md
+++ b/rhel8/README.md
@@ -43,8 +43,8 @@ be in packer-maas/rhel8, where this file is located. Once in packer-maas/rhel8
 you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build -var 'rhel8_iso_path=/PATH/TO/rhel-8.3-x86_64-dvd.iso' .
+packer init
+PACKER_LOG=1 packer build -var 'rhel8_iso_path=/PATH/TO/rhel-8.3-x86_64-dvd.iso' .
 ```
 
 Note: rhel8.pkr.hcl is configured to run Packer in headless mode. Only Packer
diff --git a/rhel9/Makefile b/rhel9/Makefile
index 16ef3b88..04110851 100644
--- a/rhel9/Makefile
+++ b/rhel9/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 ISO ?= rhel-baseos-9.1-x86_64-dvd.iso
 
 export PACKER_LOG KS_PROXY
@@ -13,10 +12,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 rhel9.tar.gz: check-deps clean http/rhel9.ks
-	${SUDO} ${PACKER} init rhel9.pkr.hcl && ${SUDO} ${PACKER} build -var "rhel9_iso_path=${ISO}" rhel9.pkr.hcl
+	${PACKER} init rhel9.pkr.hcl && ${PACKER} build -var "rhel9_iso_path=${ISO}" rhel9.pkr.hcl
 
 http/rhel9.ks: http/rhel9.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-rhel9 rhel9.tar.gz http/rhel9.ks
+	${RM} -rf output-rhel9 rhel9.tar.gz http/rhel9.ks
+
+.INTERMEDIATE: http/rhel9.ks
diff --git a/rhel9/README.md b/rhel9/README.md
index 0a837b54..f8b30d33 100644
--- a/rhel9/README.md
+++ b/rhel9/README.md
@@ -43,8 +43,8 @@ be in packer-maas/rhel9, where this file is located. Once in packer-maas/rhel9
 you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build -var 'rhel9_iso_path=/PATH/TO/rhel-baseos-9.1-x86_64-dvd.iso' .
+packer init
+PACKER_LOG=1 packer build -var 'rhel9_iso_path=/PATH/TO/rhel-baseos-9.1-x86_64-dvd.iso' .
 ```
 
 Note: rhel9.pkr.hcl is configured to run Packer in headless mode. Only Packer
diff --git a/rocky8/Makefile b/rocky8/Makefile
index de1d7202..7df35f1b 100644
--- a/rocky8/Makefile
+++ b/rocky8/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 
 export PACKER_LOG KS_PROXY
 
@@ -12,10 +11,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 rocky8.tar.gz: check-deps clean http/rocky.ks
-	${SUDO} ${PACKER} init rocky8.pkr.hcl && ${SUDO} ${PACKER} build rocky8.pkr.hcl
+	${PACKER} init rocky8.pkr.hcl && ${PACKER} build rocky8.pkr.hcl
 
 http/rocky.ks: http/rocky.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-rocky8 rocky8.tar.gz http/rocky.ks
+	${RM} -rf output-rocky8 rocky8.tar.gz http/rocky.ks
+
+.INTERMEDIATE: http/rocky.ks
diff --git a/rocky8/README.md b/rocky8/README.md
index 7f0109c4..39152bbd 100644
--- a/rocky8/README.md
+++ b/rocky8/README.md
@@ -40,8 +40,8 @@ make
 You can also manually run packer. Set your current working directory to packer-maas/rocky8, where this file resides, and generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build .
+packer init
+PACKER_LOG=1 packer build .
 ```
 
 The installation runs in a non-interactive mode.
diff --git a/rocky9/Makefile b/rocky9/Makefile
index 67dc030f..10167801 100644
--- a/rocky9/Makefile
+++ b/rocky9/Makefile
@@ -1,6 +1,5 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
-SUDO ?= sudo
 
 export PACKER_LOG KS_PROXY
 
@@ -12,10 +11,12 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 rocky9.tar.gz: check-deps clean http/rocky.ks
-	${SUDO} ${PACKER} init rocky9.pkr.hcl && ${SUDO} ${PACKER} build rocky9.pkr.hcl
+	${PACKER} init rocky9.pkr.hcl && ${PACKER} build rocky9.pkr.hcl
 
 http/rocky.ks: http/rocky.ks.in
-	envsubst '$KS_PROXY' < $< | tee $@
+	envsubst '$${KS_PROXY}' < $< | tee $@
 
 clean:
-	${SUDO} ${RM} -rf output-rocky9 rocky9.tar.gz http/rocky.ks
+	${RM} -rf output-rocky9 rocky9.tar.gz http/rocky.ks
+
+.INTERMEDIATE: http/rocky.ks
diff --git a/rocky9/README.md b/rocky9/README.md
index 2627eb39..15e3612a 100644
--- a/rocky9/README.md
+++ b/rocky9/README.md
@@ -41,7 +41,7 @@ make
 You can also manually run packer. Set your current working directory to packer-maas/rocky9, where this file resides, and generate an image with:
 
 ```shell
-sudo PACKER_LOG=1 packer build .
+PACKER_LOG=1 packer build .
 ```
 
 The installation runs in a non-interactive mode.
diff --git a/scripts/fuse-nbd b/scripts/fuse-nbd
index a5ae1744..013ed0d3 100644
--- a/scripts/fuse-nbd
+++ b/scripts/fuse-nbd
@@ -59,7 +59,7 @@ function mount_part() {
     done
     case "${FUSEDRV}" in
     "fusefat") fusefat ${DEV}/nbd ${MOUNTPOINT} -o rw+ -s ;;
-    "fuse2fs") fuse2fs ${DEV}/nbd ${MOUNTPOINT} ;;
+    "fuse2fs") fuse2fs ${DEV}/nbd ${MOUNTPOINT} -o fakeroot ;;
     *) echo "Unsupported Fuse driver" && exit 1 ;;
     esac
 }
diff --git a/sles12/Makefile b/sles12/Makefile
index 5e03a234..7d7b14da 100644
--- a/sles12/Makefile
+++ b/sles12/Makefile
@@ -1,7 +1,6 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
 export PACKER_LOG
-SUDO ?= sudo
 ISO ?= SLES12-SP5-JeOS.x86_64-12.5-OpenStack-Cloud-GM.qcow2
 
 .PHONY: all clean
@@ -12,10 +11,10 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 sles12.tar.gz: check-deps clean
-	${SUDO} ${PACKER} init sles.pkr.hcl && ${SUDO} ${PACKER} build -var "sles12_iso_path=${ISO}" -on-error=ask sles.pkr.hcl
+	${PACKER} init sles.pkr.hcl && ${PACKER} build -var "sles12_iso_path=${ISO}" -on-error=ask sles.pkr.hcl
 
 clean:
-	${SUDO} ${RM} -rf output-sles12 sles12.tar.gz
+	${RM} -rf output-sles12 sles12.tar.gz
 
 lint:
 	packer validate .
diff --git a/sles12/README.md b/sles12/README.md
index 89a654a3..5fdde2a3 100644
--- a/sles12/README.md
+++ b/sles12/README.md
@@ -40,8 +40,8 @@ make ISO=/PATH/TO/SLES12-SP5-JeOS.x86_64-12.5-OpenStack-Cloud-GM.qcow2
 Alternatively you can manually run packer. Your current working directory must be in `packer-maas/sles12`, where this file is located. Once in `packer-maas/sles12` you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build -var 'sles_iso_path=/PATH/TO/SLES12-SP5-JeOS.x86_64-12.5-OpenStack-Cloud-GM.qcow2' .
+packer init
+PACKER_LOG=1 packer build -var 'sles_iso_path=/PATH/TO/SLES12-SP5-JeOS.x86_64-12.5-OpenStack-Cloud-GM.qcow2' .
 ```
 
 Note: `sles.pkr.hcl` is configured to run Packer in headless mode. Only Packer output will be seen. If you wish to see the installation output connect to the VNC port given in the packer output or change the value of `headless` to false in `sles.pkr.hcl`.
diff --git a/sles15/Makefile b/sles15/Makefile
index 671570b3..bf3facb8 100644
--- a/sles15/Makefile
+++ b/sles15/Makefile
@@ -1,7 +1,6 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
 export PACKER_LOG
-SUDO ?= sudo
 ISO ?= SLE-15-SP4-Full-x86_64-GM-Media1.iso
 
 .PHONY: all clean
@@ -12,10 +11,10 @@ check-deps:
 	dpkg -s libnbd-bin nbdkit packer fuse2fs > /dev/null
 
 sles15.tar.gz: check-deps clean
-	${SUDO} ${PACKER} init sles.pkr.hcl && ${SUDO} ${PACKER} build -var "sles15_iso_path=${ISO}" -on-error=ask sles.pkr.hcl
+	${PACKER} init sles.pkr.hcl && ${PACKER} build -var "sles15_iso_path=${ISO}" -on-error=ask sles.pkr.hcl
 
 clean:
-	${SUDO} ${RM} -rf output-sles15 sles15.tar.gz
+	${RM} -rf output-sles15 sles15.tar.gz
 
 lint:
 	packer validate .
diff --git a/sles15/README.md b/sles15/README.md
index 37599143..0b3ed2ab 100644
--- a/sles15/README.md
+++ b/sles15/README.md
@@ -37,8 +37,8 @@ be in `packer-maas/sles15`, where this file is located. Once in packer-maas/sles
 you can generate an image with:
 
 ```shell
-sudo packer init
-sudo PACKER_LOG=1 packer build -var 'sles15_iso_path=/PATH/TO/SLE-15-SP4-Full-x86_64-GM-Media1.iso' .
+packer init
+PACKER_LOG=1 packer build -var 'sles15_iso_path=/PATH/TO/SLE-15-SP4-Full-x86_64-GM-Media1.iso' .
 ```
 
 Note: `sles.pkr.hcl` is configured to run Packer in headless mode. Only Packer
diff --git a/ubuntu/Makefile b/ubuntu/Makefile
index e9a3d042..e0a4a877 100644
--- a/ubuntu/Makefile
+++ b/ubuntu/Makefile
@@ -1,7 +1,6 @@
 PACKER ?= packer
 PACKER_LOG ?= 0
 export PACKER_LOG
-SUDO ?= sudo
 
 .PHONY: all clean
 
@@ -27,17 +26,19 @@ OVMF_VARS.fd: /usr/share/OVMF/OVMF_VARS.fd
 	cp -v $< $@
 
 custom-cloudimg.tar.gz: check-deps clean
-	${SUDO} ${PACKER} init . && ${SUDO} ${PACKER} build -only='cloudimg.*' .
+	${PACKER} init . && ${PACKER} build -only='cloudimg.*' .
 
 custom-ubuntu.tar.gz: check-deps clean seeds-flat.iso OVMF_VARS.fd \
 			packages/custom-packages.tar.gz
-	${SUDO} ${PACKER} init . && ${SUDO} ${PACKER} build -only=qemu.flat .
+	${PACKER} init . && ${PACKER} build -only=qemu.flat .
 
 custom-ubuntu-lvm.dd.gz: check-deps clean seeds-lvm.iso OVMF_VARS.fd
-	${SUDO} ${PACKER} init . && ${SUDO} ${PACKER} build -only=qemu.lvm .
+	${PACKER} init . && ${PACKER} build -only=qemu.lvm .
 
 clean:
-	${SUDO} ${RM} -rf output-* custom-*.gz
+	${RM} -rf output-* custom-*.gz \
+		seeds-flat.iso seeds-lvm.iso seeds-cloudimg.iso \
+		OVMF_VARS.fd
 
 CUSTOM_PKGS:=${wildcard packages/*.deb}
 
@@ -48,4 +49,5 @@ else
 	tar czf $@ -C packages ${notdir $^}
 endif
 
-.INTERMEDIATE: OVMF_VARS.fd
+.INTERMEDIATE: OVMF_VARS.fd packages/custom-packages.tar.gz \
+	seeds-flat.iso seeds-lvm.iso seeds-cloudimg.iso
diff --git a/ubuntu/README.md b/ubuntu/README.md
index fae4df48..292382bb 100644
--- a/ubuntu/README.md
+++ b/ubuntu/README.md
@@ -30,8 +30,8 @@ The build the image you give the template a script which has all the
 customizations:
 
 ```shell
-sudo packer init .
-sudo packer build -var customize_script=my-changes.sh -var ubuntu_series=jammy \
+packer init .
+packer build -var customize_script=my-changes.sh -var ubuntu_series=jammy \
     -only='cloudimg.*' .
 ```
 
@@ -61,8 +61,8 @@ include it in the image.
 The easiest way of doing this is to use the `kernel` parameter:
 
 ```shell
-sudo packer init .
-sudo packer build -var kernel=linux-lowlatency -var customize_script=my-changes.sh \
+packer init .
+packer build -var kernel=linux-lowlatency -var customize_script=my-changes.sh \
     -only='cloudimg.*' .
 ```
 
@@ -77,8 +77,8 @@ By default, images are produces for amd64. You can build for arm64 as well if
 you specify the `architecture` parameter:
 
 ```shell
-sudo packer init .
-sudo packer build -var architecture=arm64 -var customize_script=my-changes.sh \
+packer init .
+packer build -var architecture=arm64 -var customize_script=my-changes.sh \
     -only='cloudimg.*' .
 ```
 
@@ -114,15 +114,15 @@ be in packer-maas/ubuntu, where this file is located. Once in
 packer-maas/ubuntu you can generate an image with:
 
 ```shell
-sudo packer init .
-sudo PACKER_LOG=1 packer build -only=qemu.lvm .
+packer init .
+PACKER_LOG=1 packer build -only=qemu.lvm .
 ```
 
 or
 
 ```shell
-sudo packer init .
-sudo PACKER_LOG=1 packer build -only=qemu.flat .
+packer init .
+PACKER_LOG=1 packer build -only=qemu.flat .
 ```
 
 Note: ubuntu-lvm.pkr.hcl and ubuntu-flat.pkr.hcl are configured to run Packer in headless mode. Only Packer output will be seen. If you wish to see the installation output connect to the VNC port given in the Packer output or change the value of headless to false in the HCL2 file.
@@ -143,7 +143,7 @@ maas admin boot-resources create \
     title='Ubuntu Custom TGZ' \
     architecture='amd64/generic' \
     filetype='tgz' \
-    content@=custom-ubuntu.tar.gz
+    content@=custom-cloudimg.tar.gz
 ```
 
 LVM raw image