diff --git a/.github/workflows/run-coreprofile-tck.yml b/.github/workflows/run-coreprofile-tck.yml
index 52230fb..9f49749 100644
--- a/.github/workflows/run-coreprofile-tck.yml
+++ b/.github/workflows/run-coreprofile-tck.yml
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        java: ['11', '17']
+        java: ['11', '17', '21']
 
     # Runner steps
     steps:
diff --git a/wf-core-tck-runner/pom.xml b/wf-core-tck-runner/pom.xml
index 4f26206..692e8fd 100644
--- a/wf-core-tck-runner/pom.xml
+++ b/wf-core-tck-runner/pom.xml
@@ -91,9 +91,9 @@
         <jsonp.tck.version>2.1.1</jsonp.tck.version>
         <jsonb.api.version>3.0.0</jsonb.api.version>
         <rest.api.version>3.1.0</rest.api.version>
-        <core.profile.tck.version>10.0.1</core.profile.tck.version>
-        <cdi.tck.version>4.0.11</cdi.tck.version>
-        <cdi.tck.dist.version>4.0.11</cdi.tck.dist.version>
+        <core.profile.tck.version>10.0.3</core.profile.tck.version>
+        <cdi.tck.version>4.0.12</cdi.tck.version>
+        <cdi.tck.dist.version>${cdi.tck.version}</cdi.tck.dist.version>
         <rest.tck.version>3.1.4</rest.tck.version>
 
         <!-- Test tools/dependencies -->
diff --git a/wf-core-tck-runner/tck-setup/pom.xml b/wf-core-tck-runner/tck-setup/pom.xml
index a255384..f0f17cc 100644
--- a/wf-core-tck-runner/tck-setup/pom.xml
+++ b/wf-core-tck-runner/tck-setup/pom.xml
@@ -41,7 +41,7 @@
                             <target>
                                 <mkdir dir="${tck.dir}"/>
                                 <!-- download file -->
-                                <get src="https://download.eclipse.org/jakartaee/coreprofile/10.0/jakarta-core-profile-tck-${core.profile.tck.version}.zip"
+                                <get src="https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl//jakarta-core-profile-tck-10.0.3.zip"
                                      dest="${tck.dir}/"
                                      verbose="false"
                                      usetimestamp="true"/>