diff --git a/builder/pwnagotchi.yml b/builder/pwnagotchi.yml
index 144d47bd..94251497 100644
--- a/builder/pwnagotchi.yml
+++ b/builder/pwnagotchi.yml
@@ -356,13 +356,19 @@
     command: "python3 setup.py sdist bdist_wheel"
     args:
       chdir: /usr/local/src/pwnagotchi
-    when: pwnagotchigit.changed
+    when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
 
   - name: install pwnagotchi wheel and dependencies
     pip:
       name: "{{ lookup('fileglob', '/usr/local/src/pwnagotchi/dist/pwnagotchi*.whl') }}"
       extra_args: "--no-cache-dir"
-    when: pwnagotchigit.changed
+    when: (pwnagotchigit.changed) or (pip_packages['pwnagotchi'] is undefined) or (pip_packages['pwnagotchi'] != pwnagotchi_version)
+
+  - name: remove pwnagotchi folder
+    file:
+      state: absent
+      path: /usr/local/src/pwnagotchi
+
 
   - name: create /usr/local/share/pwnagotchi/ folder
     file: