diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index 07f6a99f..a6befd9b 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -30,7 +30,7 @@ jobs:
         NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
         API: 21
       run: |
-        sed -e "s|NDK|$NDK|g" -e "s|API|$API|g" ./cross/android_x86_64.txt > /tmp/android_cross.txt
+        sed -e "s|NDK|$NDK|g" -e "s|HOST_TAG|linux-x86_64|g" -e "s|API|$API|g" ./cross/android_x86_64.txt > /tmp/android_cross.txt
         meson setup build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" --cross-file /tmp/android_cross.txt
         sudo ninja -C build install
 
@@ -60,7 +60,7 @@ jobs:
         NDK: ${{ steps.setup-ndk.outputs.ndk-path }}
         API: 21
       run: |
-        sed -e "s|NDK|$NDK|g" -e "s|API|$API|g" ./cross/android_aarch64.txt > /tmp/android_cross.txt
+        sed -e "s|NDK|$NDK|g" -e "s|HOST_TAG|linux-x86_64|g" -e "s|API|$API|g" ./cross/android_aarch64.txt > /tmp/android_cross.txt
         meson setup build -Dlog=true -Dloaders="all" -Dsavers="all" -Dbindings="capi" --cross-file /tmp/android_cross.txt
         sudo ninja -C build install
 
diff --git a/cross/android_aarch64.txt b/cross/android_aarch64.txt
index 958b7b1e..d3486564 100644
--- a/cross/android_aarch64.txt
+++ b/cross/android_aarch64.txt
@@ -1,13 +1,16 @@
+# Android developer (Use the NDK with other build systems)
+# https://developer.android.com/ndk/guides/other_build_systems
+
 [binaries]
-cpp     = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-androidAPI-clang++'
-ar      = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar'
-as      = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-as'
-ranlib  = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib'
-ld      = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld'
-strip   = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip'
+cpp     = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/aarch64-linux-androidAPI-clang++'
+ar      = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-ar'
+as      = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-as'
+ranlib  = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-ranlib'
+ld      = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/ld'
+strip   = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-strip'
 
 [properties]
-sys_root = 'NDK/sysroot'
+sys_root = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/sysroot'
 
 [host_machine]
 system = 'android'
diff --git a/cross/android_x86_64.txt b/cross/android_x86_64.txt
index 593594ef..41e9e0b7 100644
--- a/cross/android_x86_64.txt
+++ b/cross/android_x86_64.txt
@@ -1,13 +1,16 @@
+# Android developer (Use the NDK with other build systems)
+# https://developer.android.com/ndk/guides/other_build_systems
+
 [binaries]
-cpp     = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-androidAPI-clang++'
-ar      = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ar'
-as      = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-as'
-ranlib  = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ranlib'
-ld      = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-ld'
-strip   = 'NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android-strip'
+cpp     = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/x86_64-linux-androidAPI-clang++'
+ar      = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-ar'
+as      = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-as'
+ranlib  = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-ranlib'
+ld      = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/ld'
+strip   = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/bin/llvm-strip'
 
 [properties]
-sys_root = 'NDK/sysroot'
+sys_root = 'NDK/toolchains/llvm/prebuilt/HOST_TAG/sysroot'
 
 [host_machine]
 system = 'android'