diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 4a8b2b7f..b90f13f3 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -12,13 +12,16 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '8', '11', '16' ] # All currently supported versions
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 8
+    - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v2
       with:
-        java-version: '8'
+        java-version: ${{ matrix.java }}
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
@@ -27,6 +30,7 @@ jobs:
       id: project
     - name: 'Upload Artifact'
       uses: actions/upload-artifact@v2
+      if: ${{ matrix.java == '8' }}
       with:
         name: Bytecode-Viewer-${{ steps.project.outputs.version }}-SNAPSHOT
         path: target/Bytecode-Viewer-${{ steps.project.outputs.version }}.jar