diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e994d18..1581c51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,15 +9,15 @@ on:
 
 jobs:
   build-test-matrix:
-    name: ${{ matrix.impl}}-${{ matrix.jdk }}-${{ matrix.os }}
+    name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 5
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-latest]
-        jdk: [11, 17]
-        impl: [hotspot, openj9]
+        os: [ubuntu-latest, windows-latest]
+        jdk-distribution: [temurin, adopt-openj9]
+        jdk-version: [11, 17]
     steps:
     - name: Configure runner - Linux 
       if: contains(matrix.os, 'ubuntu')
@@ -30,16 +30,16 @@ jobs:
         echo '127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4' > %SystemRoot%\System32\drivers\etc\hosts
         echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
       shell: cmd
-    - uses: actions/checkout@v2
-    - name: Set up JDK ${{ matrix.jdk }}
-      uses: AdoptOpenJDK/install-jdk@v1
+    - uses: actions/checkout@v3
+    - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
+      uses: actions/setup-java@v3
       with:
-        version: ${{ matrix.jdk }}
-        impl: ${{ matrix.impl }}
+        distribution: ${{ matrix.jdk-distribution }}
+        java-version: ${{ matrix.jdk-version }}
     - name: Run Tests
       run: mvn -ntp -U -B -fae clean install
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
-        name: surefire-reports-${{ matrix.openjdk}}-${{ matrix.jdk }}-${{ matrix.os }}
+        name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
         path: '**/surefire-reports/*.txt'
diff --git a/.github/workflows/ejb-client.yml b/.github/workflows/ejb-client.yml
index ccfe692..9d8de7c 100644
--- a/.github/workflows/ejb-client.yml
+++ b/.github/workflows/ejb-client.yml
@@ -10,15 +10,15 @@ on:
 
 jobs:
   build-test-matrix:
-    name: ${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
+    name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        jdk: [17]
-        distro: [temurin]
+        jdk-distribution: [adopt]
+        jdk-version: [17]
     steps:
     - name: Configure runner - Linux 
       if: contains(matrix.os, 'ubuntu')
@@ -32,11 +32,11 @@ jobs:
         echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
       shell: cmd
     - uses: actions/checkout@v3
-    - name: Set up JDK ${{ matrix.jdk }}
+    - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
       uses: actions/setup-java@v3
       with:
-        java-version: ${{ matrix.jdk }}
-        distribution: ${{ matrix.distro }}
+        distribution: ${{ matrix.jdk-distribution }}
+        java-version: ${{ matrix.jdk-version }}
         cache: 'maven'
     - name: Run Tests
       run: |
@@ -55,5 +55,5 @@ jobs:
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
-        name: surefire-reports-${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
+        name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
         path: '**/surefire-reports/*.txt'
diff --git a/.github/workflows/wildfly.yml b/.github/workflows/wildfly.yml
index cfeb329..503ae56 100644
--- a/.github/workflows/wildfly.yml
+++ b/.github/workflows/wildfly.yml
@@ -10,15 +10,15 @@ on:
 
 jobs:
   build-test-matrix:
-    name: ${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
+    name: ${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 45
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        jdk: [17]
-        distro: [temurin]
+        jdk-distribution: [temurin]
+        jdk-version: [17]
     steps:
     - name: Configure runner - Linux 
       if: contains(matrix.os, 'ubuntu')
@@ -32,11 +32,11 @@ jobs:
         echo '::1         localhost localhost.localdomain localhost6 localhost6.localdomain6' >> %SystemRoot%\System32\drivers\etc\hosts
       shell: cmd
     - uses: actions/checkout@v3
-    - name: Set up JDK ${{ matrix.jdk }}
+    - name: Set up JDK ${{ matrix.jdk-distribution }} ${{ matrix.jdk-version }}
       uses: actions/setup-java@v3
       with:
-        java-version: ${{ matrix.jdk }}
-        distribution: ${{ matrix.distro }}
+        distribution: ${{ matrix.jdk-distribution }}
+        java-version: ${{ matrix.jdk-version }}
         cache: 'maven'
     - name: Run Tests
       run: |
@@ -55,5 +55,5 @@ jobs:
     - uses: actions/upload-artifact@v2
       if: failure()
       with:
-        name: surefire-reports-${{ matrix.distro }}-${{ matrix.jdk }}-${{ matrix.os }}
+        name: surefire-${{ matrix.jdk-distribution }}-${{ matrix.jdk-version }}-${{ matrix.os }}
         path: '**/surefire-reports/*.txt'