diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
deleted file mode 100644
index 65b12890f..000000000
--- a/.github/workflows/android.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Android NDK Build
-
-on:
-  push:
-    branches: [ "master", "main" ]
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-
-      - name: Install Ninja
-        run: sudo apt-get install ninja-build
-
-      - name: Setup Android NDK
-        uses: nttld/setup-ndk@v1
-        id: setup-ndk
-        with:
-          ndk-version: r26b
-
-      - name: Build with CMake
-        run: |
-          mkdir -p build && cd build
-          cmake .. \
-            -GNinja \
-            -DCMAKE_TOOLCHAIN_FILE=${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \
-            -DANDROID_ABI=arm64-v8a \
-            -DANDROID_PLATFORM=android-26 \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DANDROID_STL=c++_static
-          ninja
-
-      - name: Upload Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: JKMenu-Package
-          path: |
-            build/libJKMenu.so
-            build/jk_injector
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..821c74cd4
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,48 @@
+name: Android CI
+
+on:
+  push:
+    branches: [ "main", "master" ]
+  pull_request:
+    branches: [ "main", "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        abi: [arm64-v8a, armeabi-v7a]
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'zulu'
+        java-version: '17'
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Setup Android NDK
+      run: |
+        echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;25.1.8937393"
+
+    - name: Configure CMake for ${{ matrix.abi }}
+      run: |
+        cmake -B build_${{ matrix.abi }} \
+          -DCMAKE_TOOLCHAIN_FILE=${ANDROID_HOME}/ndk/25.1.8937393/build/cmake/android.toolchain.cmake \
+          -DANDROID_ABI=${{ matrix.abi }} \
+          -DANDROID_PLATFORM=android-24 \
+          -DCMAKE_BUILD_TYPE=Release
+
+    - name: Build for ${{ matrix.abi }}
+      run: cmake --build build_${{ matrix.abi }} --config Release
+
+    - name: Upload SO for ${{ matrix.abi }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: libmodmenu_${{ matrix.abi }}
+        path: build_${{ matrix.abi }}/libmodmenu.so