diff --git a/.local/bin/install/firefox.sh b/.local/bin/install/firefox.sh
index de2161b..e1bc7b6 100755
--- a/.local/bin/install/firefox.sh
+++ b/.local/bin/install/firefox.sh
@@ -1,20 +1,9 @@
 #! zsh
 
-FIREFOX=$(enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort show "Firefox" 2>&1)
-FIREFOXUN=$(echo "$FIREFOX" | grep -Po "(?<=login: )\w+")
-
-wait_for_copy() {
-    timeout 60s wl-paste --watch sh -c 'kill $PPID' >/dev/null 2>&1
-}
-
-echo $FIREFOXUN | wl-copy
+enpass-cli -vault="$HOME/.local/share/Enpass/Enpass/Vaults/primary" -sort copy "Firefox"
 
 firefox "https://accounts.firefox.com/signin?action=email&service=sync" &
 
-wait_for_copy()
-
-enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort copy "Firefox"
-
 read -s -k $'?Press enter when you have synced Firefox...\n'
 
 echo "" | wl-copy
diff --git a/.local/bin/install/nextcloud.sh b/.local/bin/install/nextcloud.sh
index d9b51b4..cbb99e2 100755
--- a/.local/bin/install/nextcloud.sh
+++ b/.local/bin/install/nextcloud.sh
@@ -1,23 +1,10 @@
 #! zsh
 
-# 1. Fetch credentials (Enpass logic remains the same)
-TOWER=$(enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort show "Scarif: Tower" 2>&1)
-TOWERUN=$(echo "$TOWER" | grep -Po "(?<=login: )\w+")
-
-wait_for_copy() {
-    timeout 60s wl-paste --watch sh -c 'kill $PPID' >/dev/null 2>&1
-}
-
-echo "https://tower.scarif.space" | wl-copy
 mkdir -p "$HOME/Tower"
 
 nextcloud &
 
-wait_for_copy
-echo "$TOWERUN" | wl-copy
-
-wait_for_copy
-enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort copy "Scarif: Tower"
+enpasscli -vault="$HOME/.local/share/Enpass/Enpass/Vaults/primary" -sort copy "Scarif: Tower"
 
 read -s -k $'?Press enter when you have synced Nextcloud... \n'
 
diff --git a/.local/bin/install/password.sh b/.local/bin/install/password.sh
index 3a05893..a8c1072 100755
--- a/.local/bin/install/password.sh
+++ b/.local/bin/install/password.sh
@@ -2,27 +2,19 @@
 
 export MASTERPW=$(gum input --header="Master password" --password)
 
-echo "https://tower.scarif.space" | wl-copy
-
-wait_for_copy() {
-    timeout 60s wl-paste --watch sh -c 'kill $PPID' >/dev/null 2>&1
-}
-
 Enpass &
 
-wait_for_copy
-
 echo "$MASTERPW" | wl-copy
 
 read -n 1 -r -s -p $'Press enter when you have synced enpass...\n'
 
-echo "" | wl-copy
+wl-copy --clear
 
-CHECKPW=$(enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort list 2>&1)
+CHECKPW=$(enpass-cli -vault="$HOME/.local/share/Enpass/Enpass/Vaults/primary" -sort list 2>&1)
 
 while [[ "$CHECKPW" == *level=fatal* ]]; do
     export MASTERPW=$(zenity --password)
-    CHECKPW=$(enpasscli -vault="$HOME/Documents/Enpass/Vaults/primary" -sort list)
+    CHECKPW=$(enpass-cli -vault="$HOME/.local/share/Enpass/Enpass/Vaults/primary" -sort list)
 done
 
 echo "Password set successfuly"