diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 798ed36eb3..cc6c2ddb54 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -471,7 +471,6 @@ Debian_AndroidNDK_arm64-v8a:
       - build/extern/fetched/
   before_script:
     - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-    - echo "google-android-ndk-installer google-android-installers/mirror select https://dl.google.com" | debconf-set-selections
     - apt-get update -yq
     - apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential
   stage: build
diff --git a/CI/before_install.android.sh b/CI/before_install.android.sh
index 59d98f48c4..d1ac706714 100755
--- a/CI/before_install.android.sh
+++ b/CI/before_install.android.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -ex
 
 curl -fSL -R -J https://gitlab.com/OpenMW/openmw-deps/-/raw/main/android/openmw-android-deps-20201230.zip -o ~/openmw-android-deps.zip
-unzip -o ~/openmw-android-deps -d /usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr > /dev/null
+unzip -o ~/openmw-android-deps -d /android-ndk-r22/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr > /dev/null
diff --git a/CI/before_script.android.sh b/CI/before_script.android.sh
index 3219f3a4ba..4ef903d710 100755
--- a/CI/before_script.android.sh
+++ b/CI/before_script.android.sh
@@ -7,7 +7,7 @@ mkdir -p build
 cd build
 
 cmake \
--DCMAKE_TOOLCHAIN_FILE=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake \
+-DCMAKE_TOOLCHAIN_FILE=/android-ndk-r22/build/cmake/android.toolchain.cmake \
 -DANDROID_ABI=arm64-v8a \
 -DANDROID_PLATFORM=android-21 \
 -DCMAKE_C_COMPILER_LAUNCHER=ccache \