diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml
index 4efe7d8..94a88f6 100644
--- a/.github/workflows/release-macos.yml
+++ b/.github/workflows/release-macos.yml
@@ -7,11 +7,13 @@ on:
 
 jobs:
   release:
-    runs-on: macOS-13
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: [ macOS-13 ]
         directory: [ install-sdk, emulator-run-cmd ]
+        java_version: [ 17 ]
     steps:
       - uses: actions/checkout@v4
       - name: Install Docker
@@ -19,11 +21,11 @@ jobs:
           brew install docker docker-compose colima
           colima start
           docker run hello-world
-      - name: Set up JDK 17
+      - name: Set up JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: ${{ matrix.java_version }}
       - name: Prepare release
         run: ./prepare-for-release.sh
       - name: test ${{ matrix.directory }}
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index 6393083..10cdea3 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -6,14 +6,18 @@ on:
   pull_request:
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-22.04 ]
+        java_version: [ 17 ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: ${{ matrix.java_version }}
       - name: test install-sdk
         run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v16.15.0 && npm install && npm ci && npm run build
         working-directory: install-sdk
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
index 28d06d8..23a23ff 100644
--- a/.github/workflows/test-macos.yml
+++ b/.github/workflows/test-macos.yml
@@ -40,15 +40,19 @@ jobs:
 #      with:
 #        name: logcat
 #        path: artifacts/logcat.log
-  test-macos-13:
-    runs-on: macOS-13
+  test-macos:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ macOS-13 ]
+        java_version: [ 17 ]
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK ${{ matrix.java_version }}
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: ${{ matrix.java_version }}
       - name: install node
         run: |
           brew install node