diff --git a/build.sh b/build.sh
index 4371c0c..2908204 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 
 DIR=`dirname "$0"`
 DIR=`exec 2>/dev/null;(cd -- "$DIR") && cd -- "$DIR"|| cd "$DIR"; unset PWD; /usr/bin/pwd || /bin/pwd || pwd`
-BW_VERSION=$(curl -sL https://go.btwrdn.co/bw-sh-versions | grep '^ *"'coreVersion'":' | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//')
+BW_VERSION=$(curl -sLI https://github.com/bitwarden/self-host/releases/latest -o /dev/null -w '%{url_effective}' | grep -o 'tag/v[^/]\+' | cut -c5- | sed 's/\r//' | sed 's/^v//')
 
 echo "Building BitBetter for BitWarden version $BW_VERSION"
 
diff --git a/update-bitwarden.sh b/update-bitwarden.sh
index 069f983..e82e7a2 100755
--- a/update-bitwarden.sh
+++ b/update-bitwarden.sh
@@ -9,7 +9,7 @@ ask () {
 }
 
 SCRIPT_BASE="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-BW_VERSION=$(curl -sL https://go.btwrdn.co/bw-sh-versions | grep '^ *"'coreVersion'":' | awk -F\: '{ print $2 }' | sed -e 's/,$//' -e 's/^"//' -e 's/"$//')
+BW_VERSION=$(curl -sLI https://github.com/bitwarden/self-host/releases/latest -o /dev/null -w '%{url_effective}' | grep -o 'tag/v[^/]\+' | cut -c5- | sed 's/\r//' | sed 's/^v//')
 
 echo "Starting Bitwarden update, newest server version: $BW_VERSION"