diff --git a/.github/workflows/full-downstream.yml b/.github/workflows/full-downstream.yml
index 5ce4358fa5..ab35925728 100644
--- a/.github/workflows/full-downstream.yml
+++ b/.github/workflows/full-downstream.yml
@@ -38,8 +38,8 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        java-version: [ 11 ]
-        maven-version: [ '3.8.7' ]
+        java-version: [ 17 ]
+        maven-version: [ '3.9.11' ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} - Java ${{ matrix.java-version }} - Maven
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 4ea99cfc8a..d82d580f7a 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -44,8 +44,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        java-version: [ 17, 20 ]
-        maven-version: [ '3.8.7' ]
+        java-version: [ 17, 21 ]
+        maven-version: [ '3.9.11' ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} - Java ${{ matrix.java-version }} - Maven
diff --git a/.github/workflows/quarkus-snapshot.yml b/.github/workflows/quarkus-snapshot.yml
index 1887ace975..a2f3b2a35a 100644
--- a/.github/workflows/quarkus-snapshot.yml
+++ b/.github/workflows/quarkus-snapshot.yml
@@ -37,8 +37,8 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        java-version: [ 11 ]
-        maven-version: [ '3.8.7' ]
+        java-version: [ 17 ]
+        maven-version: [ '3.9.11' ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     if: github.actor == 'quarkusbot'
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index cbc491b146..b5b0c58266 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -39,7 +39,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
         java-version: [ 17 ]
-        maven-version: [ '3.8.7' ]
+        maven-version: [ '3.9.11' ]
       fail-fast: false
     runs-on: ${{ matrix.os }}