diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8545e7481d..b56753c99b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -1,70 +1,23 @@
-name: Build and test
-on: [push, pull_request]
+name: Java CI with Maven
+on: [ push, pull_request, workflow_dispatch ]
+
 jobs:
   os-test:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    steps:
-      - name: Setup Chrome
-        uses: browser-actions/setup-chrome@v1.7.1
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Set up Java 11
-        uses: actions/setup-java@v4
-        with:
-          java-version: '11'
-          distribution: 'temurin'
-      - name: Build and test
-        run: |
-          bash build_test.sh
-      - name: Upload test results for review
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: test-results-${{ runner.os }}-mvn-v${{ matrix.mvn }}-jvm${{ matrix.java }}
-          path: |
-            target/build.log
-          retention-days: 5
-
-  maven-version-test:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        mvn: ['3.9.8', '3.8.8', '3.6.3']
-        java: ['11']
-        include:
-          - mvn: '3.9.8'
-            java: '21'
-          - mvn: '3.8.8'
-            java: '17'
-          - mvn: '3.6.3'
-            java: '11'
+    runs-on: 'ubuntu-latest'
     steps:
-      - name: Setup Chrome
-        uses: browser-actions/setup-chrome@v1.2.3
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Java ${{ matrix.java }}
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
-          distribution: 'temurin'
-      - name: Set up maven wrapper for specified version
-        run: |
-          mvn wrapper:wrapper -Dmaven=${{ matrix.mvn }}
+          java-version: '17'
+          distribution: 'zulu'
       - name: Build and test
         run: |
-          bash build_test.sh
+          mvn -B install -f j2cl-maven-plugin/pom.xml
       - name: Upload test results for review
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v2
         if: always()
         with:
-          name: test-results-mvn-v${{ matrix.mvn }}-jvm${{ matrix.java }}
+          name: test-results-mvn-v3.8.8-jvm17
           path: |
             target/build.log
           retention-days: 5