diff --git a/.ci/config/matrices.yaml b/.ci/config/matrices.yaml
index cd9951e3c8f..e25644915df 100644
--- a/.ci/config/matrices.yaml
+++ b/.ci/config/matrices.yaml
@@ -56,7 +56,9 @@ sidetrack-stages:
   - 'rolling-update'
 jdk-ce-stages:
   stages:
+  - 'platform-jdk-openjdk-jdk-21-latest'
   - 'platform-jdk-openjdk-jdk-17-latest'
   - 'platform-jdk-openjdk-jdk-11-latest'
+  - 'platform-jdk-jdk-21-latest'
   - 'platform-jdk-jdk-17-latest'
   - 'platform-jdk-jdk-11-latest'
\ No newline at end of file
diff --git a/.ci/config/stage-types.yaml b/.ci/config/stage-types.yaml
index c7b99db745e..2a519bb5c1d 100644
--- a/.ci/config/stage-types.yaml
+++ b/.ci/config/stage-types.yaml
@@ -141,6 +141,14 @@ platform-jdk-openjdk-jdk-17-latest:
   nodeLabel: 'h2'
   jdkVersion: 'openjdk-jdk-17-latest'
   withNpm: true
+platform-jdk-openjdk-jdk-21-latest:
+  directory: '.'
+  command: 'install source:jar source:test-jar -pl ''!webapps/assembly'',''!webapps/assembly-jakarta'' -Pdistro,distro-ce,distro-wildfly'
+  stash:
+    runtimeStash: true
+  nodeLabel: 'h2'
+  jdkVersion: 'openjdk-jdk-21-latest'
+  withNpm: true
 platform-jdk-openjdk-jdk-11-latest:
   directory: '.'
   command: 'install source:jar source:test-jar
@@ -171,6 +179,14 @@ platform-jdk-jdk-17-latest:
   nodeLabel: 'h2'
   jdkVersion: 'jdk-17-latest'
   withNpm: true
+platform-jdk-jdk-21-latest:
+  directory: '.'
+  command: 'install source:jar source:test-jar -pl ''!webapps/assembly'',''!webapps/assembly-jakarta'' -Pdistro,distro-ce,distro-wildfly'
+  stash:
+    runtimeStash: true
+  nodeLabel: 'h2'
+  jdkVersion: 'jdk-21-latest'
+  withNpm: true
 platform-jdk-jdk-11-latest:
   directory: '.'
   command: 'install source:jar source:test-jar