diff --git a/ct/alpine-rustdeskserver.sh b/ct/alpine-rustdeskserver.sh
index 7ee899b8f..e67522fc3 100644
--- a/ct/alpine-rustdeskserver.sh
+++ b/ct/alpine-rustdeskserver.sh
@@ -27,21 +27,21 @@ function update_script() {
   fi
 
   APIRELEASE=$(curl -s https://api.github.com/repos/lejianwen/rustdesk-api/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  RELEASE=$(curl -s https://api.github.com/repos/rustdesk/rustdesk-server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+  RELEASE=$(curl -s https://api.github.com/repos/lejianwen/rustdesk-server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
   if [ "${RELEASE}" != "$(cat ~/.rustdesk-server 2>/dev/null)" ] || [ ! -f ~/.rustdesk-server ]; then
     msg_info "Updating RustDesk Server to v${RELEASE}"
     $STD apk -U upgrade
     $STD service rustdesk-server-hbbs stop
     $STD service rustdesk-server-hbbr stop
     temp_file1=$(mktemp)
-    curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-linux-amd64.zip" -o "$temp_file1"
+    curl -fsSL "https://github.com/lejianwen/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-linux-amd64.zip" -o "$temp_file1"
     $STD unzip "$temp_file1"
     cp -r amd64/* /opt/rustdesk-server/
     echo "${RELEASE}" >~/.rustdesk-server
     $STD service rustdesk-server-hbbs start
     $STD service rustdesk-server-hbbr start
     rm -rf amd64
-    rm -f $temp_file1
+    rm -f "$temp_file1"
     msg_ok "Updated RustDesk Server"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"
@@ -56,7 +56,7 @@ function update_script() {
     echo "${APIRELEASE}" >~/.rustdesk-api
     $STD service rustdesk-api start
     rm -rf release
-    rm -f $temp_file2
+    rm -f "$temp_file2"
     msg_ok "Updated RustDesk API"
   else
     msg_ok "No update required. RustDesk API is already at v${APIRELEASE}"
diff --git a/ct/rustdeskserver.sh b/ct/rustdeskserver.sh
index 611d5d80a..6d76b229d 100644
--- a/ct/rustdeskserver.sh
+++ b/ct/rustdeskserver.sh
@@ -29,9 +29,7 @@ function update_script() {
     exit
   fi
 
-  RELEASE=$(curl -fsSL https://api.github.com/repos/rustdesk/rustdesk-server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  APIRELEASE=$(curl -fsSL https://api.github.com/repos/lejianwen/rustdesk-api/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ "${RELEASE}" != "$(cat ~/.rustdesk-hbbr)" ]] || [[ "${APIRELEASE}" != "$(cat ~/.rustdesk-api)" ]] || [[ ! -f ~/.rustdesk-hbbr ]] || [[ ! -f ~/.rustdesk-api ]]; then
+  if check_for_gh_release "rustdesk-api"; then
     msg_info "Stopping Service"
     systemctl stop rustdesk-hbbr
     systemctl stop rustdesk-hbbs
@@ -46,7 +44,7 @@ function update_script() {
     fetch_and_deploy_gh_release "rustdesk-api" "lejianwen/rustdesk-api" "binary" "latest" "/opt/rustdesk" "rustdesk-api-server*amd64.deb"
 
     msg_info "Starting services"
-    systemctl start -q rustdesk-* --all
+    systemctl start -q rustdesk-*
     msg_ok "Services started"
 
     msg_ok "Updated successfully!"
diff --git a/frontend/public/json/rustdeskserver.json b/frontend/public/json/rustdeskserver.json
index faa0ca7a1..7a68c2859 100644
--- a/frontend/public/json/rustdeskserver.json
+++ b/frontend/public/json/rustdeskserver.json
@@ -54,6 +54,10 @@
     {
       "text": "To see admin password on Alpine, type `cat ~/rustdesk.creds` inside LXC.",
       "type": "info"
+    },
+    {
+      "text": "This script uses hbbs/hbbr builds from `lejianwen/rustdesk-server` (instead of the official repo) for full compatibility with the RustDesk API (SSO/OAuth). See `https://github.com/community-scripts/ProxmoxVE/issues/12079`.",
+      "type": "info"
     }
   ]
 }
diff --git a/install/alpine-rustdeskserver-install.sh b/install/alpine-rustdeskserver-install.sh
index c127a8167..80293a998 100644
--- a/install/alpine-rustdeskserver-install.sh
+++ b/install/alpine-rustdeskserver-install.sh
@@ -13,17 +13,17 @@ setting_up_container
 network_check
 update_os
 
-RELEASE=$(curl -s https://api.github.com/repos/rustdesk/rustdesk-server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+RELEASE=$(curl -s https://api.github.com/repos/lejianwen/rustdesk-server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 msg_info "Installing RustDesk Server v${RELEASE}"
 temp_file1=$(mktemp)
-curl -fsSL "https://github.com/rustdesk/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-linux-amd64.zip" -o "$temp_file1"
+curl -fsSL "https://github.com/lejianwen/rustdesk-server/releases/download/${RELEASE}/rustdesk-server-linux-amd64.zip" -o "$temp_file1"
 $STD unzip "$temp_file1"
 mv amd64 /opt/rustdesk-server
 mkdir -p /root/.config/rustdesk
 cd /opt/rustdesk-server
-./rustdesk-utils genkeypair > /tmp/rustdesk_keys.txt
-grep "Public Key" /tmp/rustdesk_keys.txt | awk '{print $3}' > /root/.config/rustdesk/id_ed25519.pub
-grep "Secret Key" /tmp/rustdesk_keys.txt | awk '{print $3}' > /root/.config/rustdesk/id_ed25519
+./rustdesk-utils genkeypair >/tmp/rustdesk_keys.txt
+grep "Public Key" /tmp/rustdesk_keys.txt | awk '{print $3}' >/root/.config/rustdesk/id_ed25519.pub
+grep "Secret Key" /tmp/rustdesk_keys.txt | awk '{print $3}' >/root/.config/rustdesk/id_ed25519
 chmod 600 /root/.config/rustdesk/id_ed25519
 chmod 644 /root/.config/rustdesk/id_ed25519.pub
 rm /tmp/rustdesk_keys.txt
diff --git a/install/rustdeskserver-install.sh b/install/rustdeskserver-install.sh
index 45142f3b5..273d9bc13 100644
--- a/install/rustdeskserver-install.sh
+++ b/install/rustdeskserver-install.sh
@@ -13,10 +13,13 @@ setting_up_container
 network_check
 update_os
 
-fetch_and_deploy_gh_release "rustdesk-hbbr" "rustdesk/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-hbbr*amd64.deb"
-fetch_and_deploy_gh_release "rustdesk-hbbs" "rustdesk/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-hbbs*amd64.deb"
-fetch_and_deploy_gh_release "rustdesk-utils" "rustdesk/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-utils*amd64.deb"
+fetch_and_deploy_gh_release "rustdesk-hbbr" "lejianwen/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-hbbr*amd64.deb"
+fetch_and_deploy_gh_release "rustdesk-hbbs" "lejianwen/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-hbbs*amd64.deb"
+fetch_and_deploy_gh_release "rustdesk-utils" "lejianwen/rustdesk-server" "binary" "latest" "/opt/rustdesk" "rustdesk-server-utils*amd64.deb"
 fetch_and_deploy_gh_release "rustdesk-api" "lejianwen/rustdesk-api" "binary" "latest" "/opt/rustdesk" "rustdesk-api-server*amd64.deb"
+systemctl enable -q --now rustdesk-hbbr
+systemctl enable -q --now rustdesk-hbbs
+systemctl enable -q --now rustdesk-api
 
 motd_ssh
 customize