diff --git a/.config/yadm/bootstrap.v2/applications/40-Bitwarden.sh b/.config/yadm/bootstrap.v2/applications/40-Bitwarden.sh
index 5ea6698..4d62d1f 100755
--- a/.config/yadm/bootstrap.v2/applications/40-Bitwarden.sh
+++ b/.config/yadm/bootstrap.v2/applications/40-Bitwarden.sh
@@ -9,3 +9,15 @@ setupBitwardenDaemon() {
   npm run build
   sudo npm install -g .
 }
+
+setupBitwardenCli() {
+  url=$(bw status | jq ".serverUrl" -r)
+  if [[ $url != "null" ]]; then
+    return 0
+  fi
+
+  read -p "-- Which server do you want to use for bitwarden? " -r BW_SERVER
+  bw config server $BW_SERVER
+}
+
+addActions setupBitwardenCli