diff --git a/Makefile b/Makefile
index 6771779a..22133674 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,8 @@ $(PWN_RELEASE).img: | $(PACKER)
 $(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json builder/pwnagotchi.yml $(shell find builder/data -type f)
 	sudo $(PACKER) plugins install github.com/solo-io/arm-image
 	cd builder && sudo $(UNSHARE) $(PACKER) build -var "pwn_hostname=$(PWN_HOSTNAME)" -var "pwn_version=$(PWN_VERSION)" pwnagotchi.json
-	sudo chown -R $USER:$USER builder/images
-	mv builder/images $@
+	sudo chown -R $$USER:$$USER builder/images
+	mv builder/images /home/$$USER
 
 # If any of these files are updated, rebuild the checksums.
 $(PWN_RELEASE).sha256: $(PWN_RELEASE).img
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 990adb57..a2b3d9e2 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -271,7 +271,7 @@
       src: /usr/local/src/nexmon/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin
       dest: /usr/lib/firmware/brcm/brcmfmac43430-sdio.bin
 
-  - name: copy 43430-sdio as 43436s-sdio for the special 43430/1
+  - name: copy 43430-sdio as 43436s-sdio for the special 43430/1 /2
     copy:
       src: /usr/lib/firmware/brcm/brcmfmac43430-sdio.bin
       dest: /usr/lib/firmware/brcm/brcmfmac43436s-sdio.bin