diff --git a/ct/vaultwarden.sh b/ct/vaultwarden.sh
index a0120e117..28d611a01 100644
--- a/ct/vaultwarden.sh
+++ b/ct/vaultwarden.sh
@@ -43,6 +43,8 @@ function update_script() {
       systemctl stop vaultwarden
       msg_ok "Stopped Service"
 
+      fetch_and_deploy_gh_release "vaultwarden" "dani-garcia/vaultwarden" "tarball" "latest" "/tmp/vaultwarden-src"
+
       msg_info "Updating VaultWarden to $VAULT (Patience)"
       cd /tmp/vaultwarden-src
       $STD cargo build --features "sqlite,mysql,postgresql" --release
@@ -70,9 +72,10 @@ function update_script() {
       systemctl stop vaultwarden
       msg_ok "Stopped Service"
 
+      fetch_and_deploy_gh_release "vaultwarden_webvault" "dani-garcia/bw_web_builds" "prebuild" "latest" "/opt/vaultwarden" "bw_web_*.tar.gz"
+
       msg_info "Updating Web-Vault to $WVRELEASE"
       rm -rf /opt/vaultwarden/web-vault
-      fetch_and_deploy_gh_release "vaultwarden_webvault" "dani-garcia/bw_web_builds" "prebuild" "latest" "/opt/vaultwarden" "bw_web_*.tar.gz"
       chown -R root:root /opt/vaultwarden/web-vault/
       msg_ok "Updated Web-Vault to ${WVRELEASE}"
 
diff --git a/install/vaultwarden-install.sh b/install/vaultwarden-install.sh
index d7e2ac286..4b7f0e6d0 100644
--- a/install/vaultwarden-install.sh
+++ b/install/vaultwarden-install.sh
@@ -25,8 +25,6 @@ $STD apt install -y \
 msg_ok "Installed Dependencies"
 
 setup_rust
-
-# Fetch vaultwarden source and build
 fetch_and_deploy_gh_release "vaultwarden" "dani-garcia/vaultwarden" "tarball" "latest" "/tmp/vaultwarden-src"
 
 msg_info "Building Vaultwarden (Patience)"
@@ -40,7 +38,6 @@ mkdir -p /opt/vaultwarden/{bin,data}
 cp target/release/vaultwarden /opt/vaultwarden/bin/
 cd ~ && rm -rf /tmp/vaultwarden-src
 
-# Fetch Web-Vault
 fetch_and_deploy_gh_release "vaultwarden_webvault" "dani-garcia/bw_web_builds" "prebuild" "latest" "/opt/vaultwarden" "bw_web_*.tar.gz"
 
 cat <<EOF >/opt/vaultwarden/.env
@@ -95,9 +92,7 @@ AmbientCapabilities=CAP_NET_BIND_SERVICE
 [Install]
 WantedBy=multi-user.target
 EOF
-
-systemctl daemon-reload
-$STD systemctl enable --now vaultwarden
+systemctl enable --q -now vaultwarden
 msg_ok "Created Service"
 
 motd_ssh