diff --git a/CHANGES.md b/CHANGES.md
index a663cae3f..9eee0fa56 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,7 +6,7 @@ Features:
 
 - Update: RaspberryOS arm64 base image 2024-11-19 (Debian 12 Bookworm) [details](https://downloads.raspberrypi.com/raspios_full_arm64/release_notes.txt)
 - Update: amd64 base image: debian-12.8.0-amd64-netinst.iso [details](https://www.debian.org/releases/stable/amd64/release-notes/ch-whats-new.en.html)
-- Update: BTCPayServer 2.0.3 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v2.0.3)
+- Update: BTCPayServer v2.0.5 [details](https://github.com/btcpayserver/btcpayserver/releases/tag/v2.0.5)
 - Update: Specter Desktop 2.0.5 [details](https://github.com/cryptoadvance/specter-desktop/releases/tag/v2.0.5)
 - Update: Fulcrum Electrum server v1.11.1 (CLI install script with status menu) [details](https://github.com/cculianu/Fulcrum/releases/tag/v1.11.1)
 - Update: Helipad (Podcasting 2.0 Boostagram reader) v0.2.1 [details](https://github.com/Podcastindex-org/helipad/
diff --git a/home.admin/config.scripts/bonus.btcpayserver.sh b/home.admin/config.scripts/bonus.btcpayserver.sh
index e40c69046..7fd5656bd 100644
--- a/home.admin/config.scripts/bonus.btcpayserver.sh
+++ b/home.admin/config.scripts/bonus.btcpayserver.sh
@@ -3,9 +3,9 @@
 # Based on: https://gist.github.com/normandmickey/3f10fc077d15345fb469034e3697d0d0
 
 # https://github.com/dgarage/NBXplorer/tags
-NBXplorerVersion="v2.5.9"
+NBXplorerVersion="v2.5.17"
 # https://github.com/btcpayserver/btcpayserver/releases
-BTCPayVersion="v2.0.3"
+BTCPayVersion="v2.0.5"
 
 # check who signed the release (person that published release)
 PGPsigner="nicolasdorier"
@@ -929,12 +929,12 @@ if [ "$1" = "update" ]; then
   REMOTE=$(git rev-parse "$UPSTREAM")
 
   if [ $LOCAL = $REMOTE ]; then
-    TAG=$(git tag | grep v1 | sort -V | tail -1)
+    TAG=$(git tag | grep v2 | sort -V | tail -1)
     echo "# Up-to-date on version $TAG"
   else
     echo "# Pulling latest changes..."
     sudo -u btcpay git pull -p
-    TAG=$(git tag | grep v1 | sort -V | tail -1)
+    TAG=$(git tag | grep v2 | sort -V | tail -1)
     echo "# Reset to the latest release tag: $TAG"
     sudo -u btcpay git reset --hard $TAG
     echo "# Build BTCPayServer $TAG"