diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ec6c17c89..7454eaabe 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -10,15 +10,28 @@ jobs:
       matrix:
         include:
           - identifier: android-debug
-            name: Android Debug
+            name: 🤖 Android 64-bit Debug
             target: template_debug
             platform: android
-            arch: [arm64, arm32, x86_64, x86_32]
+            arch: arm64
+
+          - identifier: android-release
+            name: 🤖 Android 64-bit Release
+            target: template_release
+            platform: android
+            arch: arm64
+
+          - identifier: android-debug
+            name: 🤖 Android 32-bit Debug
+            target: template_debug
+            platform: android
+            arch: arm32
+
           - identifier: android-release
-            name: Android Release
+            name: 🤖 Android 32-bit Release
             target: template_release
             platform: android
-            arch: [arm64, arm32, x86_64, x86_32]
+            arch: arm32
 
     steps:
       - name: Checkout Terrain3D
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 081eae4fc..0dff2b8c7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,18 +54,32 @@ jobs:
             platform: macos
 
           - identifier: android-debug
-            name: 🤖 Android Debug
+            name: 🤖 Android 64-bit Debug
             runner: ubuntu-20.04
             target: template_debug
             platform: android
-            arch: [arm64, arm32, x86_64, x86_32]
+            arch: arm64
 
           - identifier: android-release
-            name: 🤖 Android Release
+            name: 🤖 Android 64-bit Release
             runner: ubuntu-20.04
             target: template_release
             platform: android
-            arch: [arm64, arm32, x86_64, x86_32]
+            arch: arm64
+
+          - identifier: android-debug
+            name: 🤖 Android 32-bit Debug
+            runner: ubuntu-20.04
+            target: template_debug
+            platform: android
+            arch: arm32
+
+          - identifier: android-release
+            name: 🤖 Android 32-bit Release
+            runner: ubuntu-20.04
+            target: template_release
+            platform: android
+            arch: arm32
 
     steps:
       - name: Checkout Terrain3D