diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59863018c7..0d535ac697 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,8 +131,8 @@ build android 28 local:
     MESON_ARGS: >
       -Dbad=enabled
       -Dbad:androidmedia=enabled
-      --cross-file /opt/android_arm64_28.txt
-  image: "${CI_REGISTRY_IMAGE}/amd64/android_28:latest"
+      --cross-file cross-files/android_arm64_api28.txt
+  image: "${CI_REGISTRY_IMAGE}/amd64/ubuntu:latest"
   except:
     refs:
       - "master@gstreamer/gst-ci"
diff --git a/docker/ubuntu/android-create-toolchain.sh b/docker/ubuntu/android-create-toolchain.sh
index f57711c304..996dfe231d 100755
--- a/docker/ubuntu/android-create-toolchain.sh
+++ b/docker/ubuntu/android-create-toolchain.sh
@@ -23,27 +23,5 @@ set -eu
 
 arch=$1
 api=$2
-toolchain_path=/opt/android-toolchain-$arch-$api
-
-# Create standalone toolchains
+toolchain_path=/opt/android-$arch-api$api
 /opt/android-ndk/build/tools/make_standalone_toolchain.py --arch $arch --api $api --install-dir $toolchain_path
-
-# Create a cross file that can be passed to meson
-cat > /opt/android_${arch}_${api}.txt <<- EOM
-[host_machine]
-system = 'android'
-cpu_family = 'aarch64'
-cpu = '${arch}'
-endian = 'little'
-
-[properties]
-c_args = ['--sysroot', '${toolchain_path}/sysroot']
-cpp_args = ['--sysroot', '${toolchain_path}/sysroot']
-
-[binaries]
-c = '${toolchain_path}/bin/aarch64-linux-android-clang'
-cpp = '${toolchain_path}/bin/aarch64-linux-android-clang++'
-ar = '${toolchain_path}/bin/aarch64-linux-android-ar'
-strip = '${toolchain_path}/bin/aarch64-linux-android-strip'
-pkgconfig = 'false'
-EOM
diff --git a/docker/ubuntu/prepare.sh b/docker/ubuntu/prepare.sh
index 5559ede629..c5b74a040b 100644
--- a/docker/ubuntu/prepare.sh
+++ b/docker/ubuntu/prepare.sh
@@ -39,4 +39,4 @@ rm -rf /opt/android-ndk
 
 # get gst-build and make all subprojects available
 git clone git://anongit.freedesktop.org/gstreamer/gst-build '/gst-build/'
-cd '/gst-build/' && meson build/ && rm -rf build/
\ No newline at end of file
+meson subprojects download --sourcedir /gst-build