diff --git a/builder/orangepi.yml b/builder/orangepi.yml
index 9983f51e..dac777ee 100644
--- a/builder/orangepi.yml
+++ b/builder/orangepi.yml
@@ -457,6 +457,21 @@
         autoclean: true
       when: removed.changed
 
+    - name: remove pre-collected packages zip
+      file:
+        path: /root/go_pkgs.tgz
+        state: absent
+
+    - name: remove /root/go folder
+      file:
+        state: absent
+        path: /root/go
+
+    - name: remove /usr/local/go folder
+      file:
+        state: absent
+        path: /usr/local/go
+
     - name: remove pip cache
       file:
         state: absent
diff --git a/builder/raspberrypi32.yml b/builder/raspberrypi32.yml
index d36012da..6a3959e5 100644
--- a/builder/raspberrypi32.yml
+++ b/builder/raspberrypi32.yml
@@ -84,7 +84,7 @@
         ui: "https://github.com/bettercap/ui/releases/download/v1.3.0/ui.zip"
       opwngrid:
         source: "https://github.com/jayofelony/pwngrid.git"
-        url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.4/opwngrid-1.10.4-armhf.zip"
+        url: "https://github.com/jayofelony/pwngrid/releases/download/v1.10.5/opwngrid-1.10.5-armhf.zip"
       torch:
         wheel: "torch-2.1.0a0+gitunknown-cp39-cp39-linux_armv6l.whl"
         url: "https://github.com/Sniffleupagus/Torch4Pizero/releases/download/v1.0.0/torch-2.1.0a0+gitunknown-cp39-cp39-linux_armv6l.whl"
@@ -585,6 +585,21 @@
       apt:
         autoclean: true
 
+    - name: remove golang build libraries
+      file:
+        state: absent
+        path: /root/go
+
+    - name: remove pre-collected packages zip
+      file:
+        path: /root/go_pkgs.tgz
+        state: absent
+
+    - name: remove golang
+      file:
+        state: absent
+        path: /usr/local/go
+
     - name: remove /root/.cache (pip cache)
       file:
         state: absent
diff --git a/builder/raspberrypi64.yml b/builder/raspberrypi64.yml
index 17a6edf8..ec4f088b 100644
--- a/builder/raspberrypi64.yml
+++ b/builder/raspberrypi64.yml
@@ -576,6 +576,11 @@
         autoclean: true
       when: removed.changed
 
+    - name: remove pre-collected packages zip
+      file:
+        path: /root/go_pkgs.tgz
+        state: absent
+
     - name: remove /root/go folder
       file:
         state: absent
diff --git a/pwnagotchi/_version.py b/pwnagotchi/_version.py
index 2d517506..36dc058c 100644
--- a/pwnagotchi/_version.py
+++ b/pwnagotchi/_version.py
@@ -1 +1 @@
-__version__ = '2.5.3'
+__version__ = '2.5.4'