diff --git a/Makefile b/Makefile
index 15e0e152..9981cfb3 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ $(SDIST): setup.py pwnagotchi
 $(PWN_RELEASE).img: | $(PACKER)
 
 # If the packer or ansible files are updated, rebuild the image.
-$(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json.pkr.hcl $(shell find builder/data -type f)
+$(PWN_RELEASE).img: $(SDIST) builder/pwnagotchi.json.pkr.hcl raspberrypi32.yml raspberry64.yml orangepi.yml build_install_gopkg.yml nexmon.yml $(shell find builder/data -type f)
 
 	# sudo $(PACKER) plugins install github.com/solo-io/arm-image
 	# sudo $(PACKER) plugins install github.com/hashicorp/ansible
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index c5b00856..7c8d27e9 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -324,7 +324,7 @@
 
     - name: clone pwnagotchi repository
       git:
-        repo: https://github.com/Sniffleupagus/pwnagotchi-snflpgs.git
+        repo: https://github.com/jayofelony/pwnagotchi-torch.git
         dest: /usr/local/src/pwnagotchi
       register: pwnagotchigit
 
@@ -337,12 +337,22 @@
         chdir: /usr/local/src/pwnagotchi
       when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
+    - name: download torch whl
+      get_url:
+        url: "{{ packages.torch.url }}"
+        dest: /usr/local/src/
+
+    - name: download torchvision whl
+      get_url:
+        url: "{{ packages.torchvision.url }}"
+        dest: /usr/local/src/
+
     - name: install 32-bit pwnagotchi wheel and dependencies with 32-bit torch wheels
       pip:
         name:
+          - "{{ /usr/local/src/packages.torch.url | basename }}"
+          - "{{ /usr/local/src/packages.torchvision.url | basename }}"
           - "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
-          - "{{ packages.torch.url | basename }}"
-          - "{{ packages.torchvision.url | basename }}"
         extra_args: "--no-cache-dir"
       environment:
         #QEMU_CPU: arm1176