diff --git a/bitwarden.sh b/bitwarden.sh
index cfe9903..878fc12 100644
--- a/bitwarden.sh
+++ b/bitwarden.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LINE="export SSH_AUTH_SOCK=/home/$USER/.var/app/com.bitwarden.desktop/data/.bitwarden-ssh-agent.sock"
+export SSH_AUTH_SOCK="$HOME/.bitwarden-ssh-agent.sock"
 
 if grep -qF "$LINE" ~/.bashrc; then
   echo "Bitwarden SSH agent already configured in .bashrc"
diff --git a/install-flatpaks.sh b/install-flatpaks.sh
index 3ab431e..d9c6cba 100755
--- a/install-flatpaks.sh
+++ b/install-flatpaks.sh
@@ -46,7 +46,6 @@ FLATPAKS=(
   "org.pipewire.Helvum"
   "com.jeffser.Alpaca"
   "ai.lmstudio.lm-studio"
-  "com.bitwarden.desktop"
   "com.cassidyjames.plausible"
   "io.github.sitraorg.sitra"
 )
diff --git a/packages.conf b/packages.conf
index 25700f2..387a883 100644
--- a/packages.conf
+++ b/packages.conf
@@ -98,6 +98,7 @@ MAINTENANCE=(
 
 # Desktop environment
 DESKTOP=(
+  bitwarden
   cliamp
   element-desktop
   gnome
diff --git a/remove-packages.conf b/remove-packages.conf
index 1080006..fdf7858 100644
--- a/remove-packages.conf
+++ b/remove-packages.conf
@@ -4,7 +4,6 @@
 # Pacman / AUR packages to remove (works for both pacman and yay packages)
 REMOVE_PACMAN=(
     alpaca-ai
-    bitwarden
     conky-cli
     lmstudio-bin
     neofetch
@@ -17,4 +16,5 @@ REMOVE_FLATPAKS=(
     com.nextcloud.desktopclient.nextcloud
     org.videolan.VLC
     org.libreoffice.LibreOffice
+    com.bitwarden.desktop
 )