diff --git a/Makefile b/Makefile
index e3fe6796..ed62ff85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-PACKER_VERSION=1.9.2
+PACKER_VERSION=1.9.4
 PWN_HOSTNAME=pwnagotchi
-PWN_VERSION=torch
+PWN_VERSION=2.0.1
 
 all: clean install image
 
@@ -11,7 +11,7 @@ langs:
     done
 
 install:
-	curl https://releases.hashicorp.com/packer/$(PACKER_VERSION)/packer_$(PACKER_VERSION)_linux_arm64.zip -o /tmp/packer.zip
+	curl https://releases.hashicorp.com/packer/$(PACKER_VERSION)/packer_$(PACKER_VERSION)_linux_amd64.zip -o /tmp/packer.zip
 	unzip /tmp/packer.zip -d /tmp
 	sudo mv /tmp/packer /usr/bin/packer
 	git clone https://github.com/solo-io/packer-plugin-arm-image /tmp/packer-plugin-arm-image
diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 353ef189..bd9ccb21 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -5,7 +5,7 @@
   vars:
     pwnagotchi:
       hostname: "{{ lookup('env', 'PWN_HOSTNAME') | default('pwnagotchi', true) }}"
-      version: "{{ lookup('env', 'PWN_VERSION') | default('master', true) }}"
+      version: "{{ lookup('env', 'PWN_VERSION') | default('pwnagotchi-torch', true) }}"
     system:
       boot_options:
         - "dtoverlay=dwc2"
@@ -138,13 +138,17 @@
 
   tasks:
   - name: download old libpcap packages
-    shell: "wget http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8_1.9.1-3_arm64.deb && wget http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap0.8-dev_1.9.1-3_arm64.deb && wget http://ports.ubuntu.com/pool/main/libp/libpcap/libpcap-dev_1.9.1-3_arm64.deb"
-    dest: /usr/local/src/
+    ansible.builtin.get_url:
+      url: "http://ports.ubuntu.com/pool/main/libp/libpcap/{{ item }}"
+      dest: /usr/local/src/
+      with_items:
+        - libpcap0.8-dev_1.9.1-_arm64.deb
+        - libpcap0.8_1.9.1-3_arm64.deb
+        - libpcap-dev_1.9.1-3_arm64.deb
 
   - name: install old libpcap packages
-    shell: dpkg -i /usr/local/src/libpcap*
-    args:
-      executable: /bin/bash
+    apt:
+      deb: /usr/local/src/libpcap*
     register: libpcap
 
   - name: change hostname