diff --git a/.github/scripts/notify-release-on-prs.ts b/.github/scripts/notify-release-on-prs.ts
index 991cd0fcc..2ef403273 100644
--- a/.github/scripts/notify-release-on-prs.ts
+++ b/.github/scripts/notify-release-on-prs.ts
@@ -1,3 +1,10 @@
+/**
+ * This script should be run as node notify-release-on-prs.ts --tag <release_tag>.
+ * It will post a comment on each of the PRs included in the changelog of the specified release.
+ * The script can be ran multiple times for the same release_tag, it will not post a
+ * new comment but instead update the existing comment.
+ */
+
 import { Octokit } from '@octokit/rest';
 import { parseArgs } from 'node:util';
 import * as core from "@actions/core";
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index f0168d025..c158711d4 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -39,6 +39,10 @@ jobs:
     needs:
       - pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
+    strategy:
+      fail-fast: false
+      matrix:
+        renderer: [opengl, vulkan]
     defaults:
       run:
         working-directory: platform/android
@@ -81,18 +85,6 @@ jobs:
           cmakeVersion: 3.24.1
           ninjaVersion: latest
 
-      - name: Cache node modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
       - uses: actions/setup-node@v4
         with:
           node-version-file: ".nvmrc"
@@ -141,18 +133,21 @@ jobs:
             - ${{ env.cache-name }}
 
       - name: Check code style
+        if: matrix.renderer == 'opengl'
         run: make android-check
 
       - name: Run Android unit tests
-        run: make run-android-unit-test
+        run: RENDERER=${{ matrix.renderer }} make run-android-unit-test
 
       - name: Build libmaplibre.so for arm-v8
-        run: make android-lib-arm-v8
+        run: RENDERER=${{ matrix.renderer }} make android-lib-arm-v8
 
       - name: Build API documentation
+        if: matrix.renderer == 'opengl'
         run: ./gradlew dokkaGenerate
 
       - name: Build Examples documentation
+        if: matrix.renderer == 'opengl'
         run: make mkdocs-build
 
       - name: Copy developer config with API key for UI tests
@@ -167,57 +162,52 @@ jobs:
 
       - name: Build Benchmark, copy to platform/android
         run: |
-          ./gradlew assembleOpenglRelease assembleOpenglReleaseAndroidTest -PtestBuildType=release
-          cp MapLibreAndroidTestApp/build/outputs/apk/opengl/release/MapLibreAndroidTestApp-opengl-release.apk .
-          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/opengl/release/MapLibreAndroidTestApp-opengl-release-androidTest.apk .
+          ./gradlew assemble${{ matrix.renderer }}Release assemble${{ matrix.renderer }}ReleaseAndroidTest -PtestBuildType=release
+          cp MapLibreAndroidTestApp/build/outputs/apk/${{ matrix.renderer }}/release/MapLibreAndroidTestApp-${{ matrix.renderer }}-release.apk .
+          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/${{ matrix.renderer }}/release/MapLibreAndroidTestApp-${{ matrix.renderer }}-release-androidTest.apk .
 
       # https://developer.android.com/guide/practices/page-sizes
       - name: Check alignment of .apk
         run: |
-          unzip -o MapLibreAndroidTestApp/build/outputs/apk/opengl/release/MapLibreAndroidTestApp-opengl-release.apk -d /tmp/my_apk_out
+          unzip -o MapLibreAndroidTestApp/build/outputs/apk/${{ matrix.renderer }}/release/MapLibreAndroidTestApp-${{ matrix.renderer }}-release.apk -d /tmp/my_apk_out
           scripts/check-alignment.sh /tmp/my_apk_out
 
       - name: Create artifact for benchmark APKs
+        if: matrix.renderer == 'opengl'
         uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
           name: benchmarkAPKs
           path: |
-            platform/android/MapLibreAndroidTestApp-opengl-release.apk
-            platform/android/MapLibreAndroidTestApp-opengl-release-androidTest.apk
+            platform/android/MapLibreAndroidTestApp-${{ matrix.renderer }}-release.apk
+            platform/android/MapLibreAndroidTestApp-${{ matrix.renderer }}-release-androidTest.apk
 
-      - if: github.event_name == 'pull_request'
+      - if: github.event_name == 'pull_request' && matrix.renderer == 'opengl'
         uses: ./.github/actions/save-pr-number
 
-      - name: Build Instrumentation Tests (OpenGL), copy to platform/android
+      - name: Set renderer env var (OpenGL or Vulkan)
+        shell: bash
         run: |
-          ./gradlew assembleOpenglDebug assembleOpenglDebugAndroidTest -PtestBuildType=debug
-          cp MapLibreAndroidTestApp/build/outputs/apk/opengl/debug/MapLibreAndroidTestApp-opengl-debug.apk InstrumentationTestAppOpenGL.apk
-          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/opengl/debug/MapLibreAndroidTestApp-opengl-debug-androidTest.apk InstrumentationTestsOpenGL.apk
+          case "${{ matrix.renderer }}" in
+            opengl) echo "renderer=OpenGL" >> "$GITHUB_ENV" ;;
+            vulkan) echo "renderer=Vulkan" >> "$GITHUB_ENV" ;;
+            *) echo "::error ::Unknown renderer '${{ matrix.renderer }}'"; exit 1 ;;
+          esac
 
-      - name: Upload android-ui-test-opengl
+      - name: Build Instrumentation Tests (${{ matrix.renderer }}), copy to platform/android
+        run: |
+          ./gradlew assemble${{ matrix.renderer }}Debug assemble${{ matrix.renderer }}DebugAndroidTest -PtestBuildType=debug
+          cp MapLibreAndroidTestApp/build/outputs/apk/${{ matrix.renderer }}/debug/MapLibreAndroidTestApp-${{ matrix.renderer }}-debug.apk InstrumentationTestApp${{ env.renderer }}.apk
+          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/${{ matrix.renderer }}/debug/MapLibreAndroidTestApp-${{ matrix.renderer }}-debug-androidTest.apk InstrumentationTests${{ env.renderer }}.apk
+
+      - name: Upload android-ui-test-${{ matrix.renderer }}
         uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
-          name: android-ui-test-opengl
+          name: android-ui-test-${{ matrix.renderer }}
           path: |
-            platform/android/InstrumentationTestAppOpenGL.apk
-            platform/android/InstrumentationTestsOpenGL.apk
-
-      - name: Build Instrumentation Tests, copy to platform/android
-        run: |
-          ./gradlew assembleVulkanDebug assembleVulkanDebugAndroidTest -PtestBuildType=debug
-          cp MapLibreAndroidTestApp/build/outputs/apk/vulkan/debug/MapLibreAndroidTestApp-vulkan-debug.apk InstrumentationTestAppVulkan.apk
-          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/vulkan/debug/MapLibreAndroidTestApp-vulkan-debug-androidTest.apk InstrumentationTestsVulkan.apk
-
-      - name: Upload android-ui-test-vulkan
-        uses: actions/upload-artifact@v4
-        with:
-          if-no-files-found: error
-          name: android-ui-test-vulkan
-          path: |
-            platform/android/InstrumentationTestAppVulkan.apk
-            platform/android/InstrumentationTestsVulkan.apk
+            platform/android/InstrumentationTestApp${{ env.renderer }}.apk
+            platform/android/InstrumentationTests${{ env.renderer }}.apk
 
   android-build-cpp-test:
     runs-on: ubuntu-24.04
diff --git a/platform/android/Makefile b/platform/android/Makefile
index 750376868..ac4e8fdd7 100644
--- a/platform/android/Makefile
+++ b/platform/android/Makefile
@@ -218,9 +218,9 @@ run-android-ui-test-%: run-android-ui-test-arm-v7-%
 # Run Java Unit tests on the JVM of the development machine executing this
 .PHONY: run-android-unit-test
 run-android-unit-test:
-	$(MLN_ANDROID_GRADLE) -Pmaplibre.abis=none :MapLibreAndroid:testOpenglDebugUnitTest --info
+	$(MLN_ANDROID_GRADLE) -Pmaplibre.abis=none :MapLibreAndroid:test$(RENDERER)DebugUnitTest --info
 run-android-unit-test-%:
-	$(MLN_ANDROID_GRADLE) -Pmaplibre.abis=none :MapLibreAndroid:testOpenglDebugUnitTest --info --tests "$*"
+	$(MLN_ANDROID_GRADLE) -Pmaplibre.abis=none :MapLibreAndroid:test$(RENDERER)DebugUnitTest --info --tests "$*"
 
 DEBUG_TAR_FILE_NAME := $(if $(findstring opengl,$(RENDERER)),debug-symbols-opengl-$(MLN_ANDROID_APK_SUFFIX).tar.gz,debug-symbols-$(RENDERER)-$(MLN_ANDROID_APK_SUFFIX).tar.gz)