diff --git a/scripts/gha/build_android.sh b/scripts/gha/build_android.sh
index 09ac1321..79a8a71d 100755
--- a/scripts/gha/build_android.sh
+++ b/scripts/gha/build_android.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 unset ANDROID_SDK_ROOT
-export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.15+6
+export JAVA_HOME=$GITHUB_WORKSPACE/java
 export ANDROID_HOME=$GITHUB_WORKSPACE/sdk
 export PATH=$PATH:$JAVA_HOME/bin:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/tools/bin
 
diff --git a/scripts/gha/deps_android.sh b/scripts/gha/deps_android.sh
index e1624c4f..20333343 100755
--- a/scripts/gha/deps_android.sh
+++ b/scripts/gha/deps_android.sh
@@ -1,29 +1,33 @@
 #!/bin/bash
 
-cd $GITHUB_WORKSPACE
+cd "$GITHUB_WORKSPACE" || exit 1
 
-ANDROID_COMMANDLINE_TOOLS_VER="13114758"
+ANDROID_COMMANDLINE_TOOLS_VER="14742923"
 ANDROID_BUILD_TOOLS_VER="36.0.0"
 ANDROID_PLATFORM_VER="android-35"
-ANDROID_NDK_VERSION="28.2.13676358"
+ANDROID_NDK_VERSION="29.0.14206865"
+
+BUILD_ONCE_RUN_WITH_SPECIFIC_RUNTIME_VERSION="jbrsdk-21.0.10-linux-x64-b1163.110"
 
 echo "Download JDK 17"
-wget https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.15%2B6/OpenJDK17U-jdk_x64_linux_hotspot_17.0.15_6.tar.gz -qO- | tar -xzf - || exit 1
-export JAVA_HOME=$GITHUB_WORKSPACE/jdk-17.0.15+6
+wget https://cache-redirector.jetbrains.com/intellij-jbr/$BUILD_ONCE_RUN_WITH_SPECIFIC_RUNTIME_VERSION.tar.gz -qO- | tar -xzf - || exit 1
+mv $BUILD_ONCE_RUN_WITH_SPECIFIC_RUNTIME_VERSION java
+
+export JAVA_HOME=$GITHUB_WORKSPACE/java
 export PATH=$PATH:$JAVA_HOME/bin
 
 echo "Download hlsdk-portable"
 git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-portable -b mobile_hacks 3rdparty/hlsdk-portable || exit 1
 
 echo "Download SDL"
-pushd 3rdparty
-wget https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.tar.gz -qO- | tar -xzf - || exit 1
-mv SDL2-$SDL_VERSION SDL
-popd
+pushd 3rdparty || exit 1
+wget "https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.tar.gz" -qO- | tar -xzf - || exit 1
+mv "SDL2-$SDL_VERSION" SDL
+popd || exit 1
 
 echo "Download Android SDK"
 mkdir -p sdk || exit 1
-pushd sdk
+pushd sdk || exit 1
 wget https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_COMMANDLINE_TOOLS_VER}_latest.zip -qO sdk.zip || exit 1
 unzip -q sdk.zip || exit 1
 mv cmdline-tools tools
@@ -32,7 +36,7 @@ mv tools cmdline-tools/tools
 unset ANDROID_SDK_ROOT
 export ANDROID_HOME=$GITHUB_WORKSPACE/sdk
 export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/tools/bin
-popd
+popd || exit 1
 
 echo "Download all needed tools and Android NDK"
 yes | sdkmanager --licenses > /dev/null 2>/dev/null # who even reads licenses? :)