diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
index 2d26bf5a18..54e6ca697c 100644
--- a/.github/workflows/tck-coreprofile.yml
+++ b/.github/workflows/tck-coreprofile.yml
@@ -49,12 +49,14 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/coreprofile-tck/cdi
+        cd external/tck/cdi
         mvn -B -ntp -T 1 verify
     - name: Test Summary
       uses: test-summary/action@v2
       with:
-        paths: "external/coreprofile-tck/cdi/runner/target/surefire-reports/junitreports/TEST-*.xml"
+        paths: |
+          external/tck/cdi/runner/core/target/surefire-reports/junit-reports/TEST-*.xml
+          external/tck/cdi/runner/model/target/surefire-reports/TEST-*.xml
       if: always()
   coreprofile:
     if: github.repository == 'piranhacloud/piranha'
@@ -159,8 +161,8 @@ jobs:
       uses: test-summary/action@v2
       with:
         paths: |
-          external/tck/jsonb/installer/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
-          external/tck/jsonb/installer/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
+          external/tck/jsonp/installer/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
+          external/tck/jsonp/installer/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
       if: always()
   rest:
     if: github.repository == 'piranhacloud/piranha'
diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml
index 126de66b23..145415cd00 100644
--- a/external/coreprofile-tck/pom.xml
+++ b/external/coreprofile-tck/pom.xml
@@ -16,17 +16,13 @@
     <name>Piranha Core Profile - Core Profile TCK project</name>
 
     <modules>
-        <module>cdi</module>
         <module>coreprofile</module>
         <module>rest</module>
     </modules>
 
     <properties>
         <!-- TCK versions -->
-        <cdi.tck.version>4.0.13</cdi.tck.version>
         <coreprofile.tck.version>10.0.3</coreprofile.tck.version>
         <rest.tck.version>3.1.5</rest.tck.version>
-        <!-- Implementation versions -->
-        <weld.version>6.0.0.Beta4</weld.version>
     </properties>
 </project>
diff --git a/external/coreprofile-tck/cdi/installer/pom.xml b/external/tck/cdi/installer/pom.xml
similarity index 92%
rename from external/coreprofile-tck/cdi/installer/pom.xml
rename to external/tck/cdi/installer/pom.xml
index e209ed5730..b25d09e1fe 100644
--- a/external/coreprofile-tck/cdi/installer/pom.xml
+++ b/external/tck/cdi/installer/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck.cditck</groupId>
+        <groupId>cloud.piranha.external.tck.cdi</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>installer</artifactId>
+    <artifactId>piranha-external-tck-cdi-installer</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha Core Profile - CDI TCK - Installer</name>
+    <name>Piranha - External - TCK - CDI - Installer</name>
 
     <dependencyManagement>
         <dependencies>
@@ -41,7 +41,7 @@
                         <configuration>
                             <target>
                                 <!-- Download, unzip and rename TCK -->
-                                <get src="https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-${cdi.tck.version}-dist.zip"
+                                <get src="https://download.eclipse.org/jakartaee/cdi/4.1/cdi-tck-${cdi.tck.version}-dist.zip"
                                      dest="${project.build.directory}/tck.zip"
                                      skipexisting="true"/>
                                 <unzip src="${project.build.directory}/tck.zip"
diff --git a/external/coreprofile-tck/cdi/pom.xml b/external/tck/cdi/pom.xml
similarity index 69%
rename from external/coreprofile-tck/cdi/pom.xml
rename to external/tck/cdi/pom.xml
index 68c16918c6..d1f4c765c7 100644
--- a/external/coreprofile-tck/cdi/pom.xml
+++ b/external/tck/cdi/pom.xml
@@ -4,16 +4,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck</groupId>
+        <groupId>cloud.piranha.external.tck</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>cloud.piranha.external.coreprofiletck.cditck</groupId>
+    <groupId>cloud.piranha.external.tck.cdi</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha Core Profile - CDI TCK - Project</name>
+    <name>Piranha - External - TCK - CDI - Project</name>
+    
+    <properties>
+        <cdi.tck.version>4.1.0</cdi.tck.version>
+    </properties>
 
     <modules>
         <module>installer</module>
diff --git a/external/coreprofile-tck/cdi/runner/core/pom.xml b/external/tck/cdi/runner/core/pom.xml
similarity index 98%
rename from external/coreprofile-tck/cdi/runner/core/pom.xml
rename to external/tck/cdi/runner/core/pom.xml
index 008b01e394..bd8a05e36b 100644
--- a/external/coreprofile-tck/cdi/runner/core/pom.xml
+++ b/external/tck/cdi/runner/core/pom.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+        <groupId>cloud.piranha.external.tck.cdi.runner</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
-    <artifactId>core</artifactId>
     
-    <name>Piranha Core Profile - CDI TCK - Runner - Core</name>
+    <artifactId>piranha-external-tck-cdi-runner-core</artifactId>
+    
+    <name>Piranha - External - TCK - CDI - Runner - Core</name>
     
     <properties>
         <piranha.version>${project.version}</piranha.version>
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaDeploymentExceptionTransformer.java b/external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaDeploymentExceptionTransformer.java
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaDeploymentExceptionTransformer.java
rename to external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaDeploymentExceptionTransformer.java
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaExtension.java b/external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaExtension.java
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaExtension.java
rename to external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/PiranhaExtension.java
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldBeansImpl.java b/external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldBeansImpl.java
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldBeansImpl.java
rename to external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldBeansImpl.java
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldContextImpl.java b/external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldContextImpl.java
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldContextImpl.java
rename to external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldContextImpl.java
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldELImpl.java b/external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldELImpl.java
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldELImpl.java
rename to external/tck/cdi/runner/core/src/test/java/org/jboss/weld/tck/piranha/WeldELImpl.java
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/resources/META-INF/cdi-tck.properties b/external/tck/cdi/runner/core/src/test/resources/META-INF/cdi-tck.properties
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/resources/META-INF/cdi-tck.properties
rename to external/tck/cdi/runner/core/src/test/resources/META-INF/cdi-tck.properties
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/external/tck/cdi/runner/core/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
rename to external/tck/cdi/runner/core/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
diff --git a/external/coreprofile-tck/cdi/runner/core/src/test/resources/arquillian.xml b/external/tck/cdi/runner/core/src/test/resources/arquillian.xml
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/core/src/test/resources/arquillian.xml
rename to external/tck/cdi/runner/core/src/test/resources/arquillian.xml
diff --git a/external/coreprofile-tck/cdi/runner/model/pom.xml b/external/tck/cdi/runner/model/pom.xml
similarity index 96%
rename from external/coreprofile-tck/cdi/runner/model/pom.xml
rename to external/tck/cdi/runner/model/pom.xml
index 1e17366d18..3a41922dae 100644
--- a/external/coreprofile-tck/cdi/runner/model/pom.xml
+++ b/external/tck/cdi/runner/model/pom.xml
@@ -20,14 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+        <groupId>cloud.piranha.external.tck.cdi.runner</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>lang-model</artifactId>
+    <artifactId>piranha-external-tck-cdi-runner-langmodel</artifactId>
 
-    <name>Piranha Core Profile - CDI TCK - Runner - Lang Model</name>
+    <name>Piranha - External - TCK - CDI - Runner - Lang Model</name>
     <description>Aggregates dependencies and runs the CDI Lang Model TCK on Piranha</description>
 
     <properties>
diff --git a/external/coreprofile-tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/CDILangModelTCKRunner.java b/external/tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/CDILangModelTCKRunner.java
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/CDILangModelTCKRunner.java
rename to external/tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/CDILangModelTCKRunner.java
diff --git a/external/coreprofile-tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/LangModelVerifierBuildCompatibleExtension.java b/external/tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/LangModelVerifierBuildCompatibleExtension.java
similarity index 100%
rename from external/coreprofile-tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/LangModelVerifierBuildCompatibleExtension.java
rename to external/tck/cdi/runner/model/src/test/java/org/glassfish/tck/cdi/lang/model/LangModelVerifierBuildCompatibleExtension.java
diff --git a/external/coreprofile-tck/cdi/runner/pom.xml b/external/tck/cdi/runner/pom.xml
similarity index 74%
rename from external/coreprofile-tck/cdi/runner/pom.xml
rename to external/tck/cdi/runner/pom.xml
index ef3db1b4e9..4778476e14 100644
--- a/external/coreprofile-tck/cdi/runner/pom.xml
+++ b/external/tck/cdi/runner/pom.xml
@@ -4,16 +4,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck.cditck</groupId>
+        <groupId>cloud.piranha.external.tck.cdi</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+    <groupId>cloud.piranha.external.tck.cdi.runner</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha Core Profile - CDI TCK - Runner - Project</name>
+    <name>Piranha - External - TCK - CDI - Runner - Project</name>
 
     <modules>
         <module>core</module>
diff --git a/external/coreprofile-tck/cdi/runner/signature/pom.xml b/external/tck/cdi/runner/signature/pom.xml
similarity index 90%
rename from external/coreprofile-tck/cdi/runner/signature/pom.xml
rename to external/tck/cdi/runner/signature/pom.xml
index c4d6befd19..514870404b 100644
--- a/external/coreprofile-tck/cdi/runner/signature/pom.xml
+++ b/external/tck/cdi/runner/signature/pom.xml
@@ -20,14 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.coreprofiletck.cditck.runner</groupId>
+        <groupId>cloud.piranha.external.tck.cdi.runner</groupId>
         <artifactId>project</artifactId>
         <version>24.11.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>signature</artifactId>
+    <artifactId>piranha-external-tck-cdi-runner-signature</artifactId>
 
-    <name>Piranha Core Profile - CDI TCK - Runner - Signature</name>
+    <name>Piranha - External - TCK - CDI - Runner - Signature</name>
     <description>Aggregates dependencies and runs the CDI Signature TCK on Piranha</description>
 
     <properties>
@@ -53,9 +53,9 @@
                                 <artifactItem>
                                     <groupId>jakarta.enterprise</groupId>
                                     <artifactId>cdi-tck-core-impl</artifactId>
-                                    <version>4.0.13</version>
+                                    <version>${cdi.tck.version}</version>
                                     <type>sig</type>
-                                    <classifier>sigtest-jdk11</classifier>
+                                    <classifier>sigtest-jdk17</classifier>
                                     <outputDirectory>${project.build.directory}/sigtest</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
@@ -79,7 +79,7 @@
                                     <version>${piranha.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>target/cdi-sigtest-classes</outputDirectory>
+                                    <outputDirectory>target/classes</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -100,9 +100,9 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <sigfile>target/sigtest/cdi-tck-core-impl-sigtest-jdk11.sig</sigfile>
+                    <sigfile>target/sigtest/cdi-tck-core-impl-sigtest-jdk17.sig</sigfile>
                     <packages>jakarta.decorator,jakarta.enterprise.**,jakarta.interceptor</packages>
-                    <classes>target/cdi-sigtest-classes</classes>
+                    <classes>target/classes</classes>
                     <report>target/cdi-sig-report.txt</report>
                 </configuration>
             </plugin>
diff --git a/external/tck/inject/runner/pom.xml b/external/tck/inject/runner/pom.xml
index 06a55dd9a4..4647e940d7 100644
--- a/external/tck/inject/runner/pom.xml
+++ b/external/tck/inject/runner/pom.xml
@@ -53,8 +53,7 @@
                             <target>
                                 <!-- Run the tests -->
                                 <exec dir="${tck.home}/example"
-                                      executable="mvn"
-                                      failonerror="true">
+                                      executable="mvn">
                                     <arg value="verify"/>
                                 </exec>
                             </target>
diff --git a/external/tck/jsonb/runner/pom.xml b/external/tck/jsonb/runner/pom.xml
index eb9d6a7a7d..fc349f4a83 100644
--- a/external/tck/jsonb/runner/pom.xml
+++ b/external/tck/jsonb/runner/pom.xml
@@ -29,6 +29,14 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>cloud.piranha.external.tck.jsonb</groupId>
+            <artifactId>piranha-external-tck-jsonb-installer</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
diff --git a/external/tck/jsonp/runner/pom.xml b/external/tck/jsonp/runner/pom.xml
index 0205d0fe05..064b0e6ee2 100644
--- a/external/tck/jsonp/runner/pom.xml
+++ b/external/tck/jsonp/runner/pom.xml
@@ -57,8 +57,7 @@
                                 <echo>Running JSON Processing TCK ${jsonp.tck.version} against Parsson ${parsson.version}</echo>
                                 <echo>----------------------------------------------------------</echo>
                                 <exec dir="${tck.home}/bin"
-                                      executable="mvn"
-                                      failonerror="true">
+                                      executable="mvn">
                                     <arg value="verify"/>
                                 </exec>
                                 <echo>----------------------------------------------------------</echo>
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
index fcd3b3b42f..c493836fbd 100644
--- a/external/tck/pom.xml
+++ b/external/tck/pom.xml
@@ -17,6 +17,7 @@
 
     <modules>
         <module>annotations</module>
+        <module>cdi</module>
         <module>el</module>
         <module>inject</module>
         <module>jsonb</module>