diff --git a/com.bitwarden.desktop.yaml b/com.bitwarden.desktop.yaml
index 980c6cb..1f5ab77 100644
--- a/com.bitwarden.desktop.yaml
+++ b/com.bitwarden.desktop.yaml
@@ -34,14 +34,20 @@ modules:
           - x86_64
         url: https://github.com/bitwarden/desktop/releases/download/v1.16.4/Bitwarden-1.16.4-amd64.deb
         sha256: d500eaf4c2d4899cbfc360bf75fdcf3ad5ddcf6aa7b9491328bd1e8d659734bd
+      - type: script
+        dest-filename: bitwarden.sh
+        commands:
+          - 'exec env TMPDIR=$XDG_CACHE_HOME /app/Bitwarden/bitwarden --no-sandbox "$@"'
       - type: file
         path: com.bitwarden.desktop.appdata.xml
     buildsystem: simple
     build-commands:
-      - ar -x Bitwarden-*.deb
-      - tar -xf data.tar.xz
-      - cp -r usr/* ${FLATPAK_DEST}
-      - mkdir -p ${FLATPAK_DEST}/bin
-      - cp -r opt/Bitwarden/* ${FLATPAK_DEST}/bin
-      - desktop-file-edit --set-key=Exec --set-value="${FLATPAK_DEST}/bin/bitwarden --no-sandbox" ${FLATPAK_DEST}/share/applications/bitwarden.desktop 
-      - install -Dm644 -t /app/share/metainfo ${FLATPAK_ID}.appdata.xml
\ No newline at end of file
+      - 'ar -x Bitwarden*.deb'
+      - 'rm -f Bitwarden*.deb'
+      - 'tar -xf data.tar.xz'
+      - 'rm -f control.tar.gz data.tar.xz debian-binary'
+      - 'cp -r opt/* usr/* $FLATPAK_DEST'
+      - 'rm -rf opt usr'
+      - 'install bitwarden.sh $FLATPAK_DEST/bin/bitwarden'
+      - 'install -D -m 644 -t $FLATPAK_DEST/share/metainfo $FLATPAK_ID.appdata.xml'
+      - 'desktop-file-edit --set-key=Exec --set-value="bitwarden %U" $FLATPAK_DEST/share/applications/bitwarden.desktop'
\ No newline at end of file