diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
index 6983e5c767..25d367d670 100644
--- a/.github/workflows/tck-coreprofile.yml
+++ b/.github/workflows/tck-coreprofile.yml
@@ -183,13 +183,13 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/tck/rest
+        cd external/coreprofile-tck/rest
         mvn -B -ntp -T 1 verify        
     - name: Test Summary
       uses: test-summary/action@v2
       id: test_summary
       with:
-        paths: "external/tck/rest/runner/target/failsafe-reports/**/TEST-*.xml"
+        paths: "external/coreprofile-tck/rest/runner/target/failsafe-reports/**/TEST-*.xml"
         output: test-summary.md
       if: always()
     - name: Job Summary
diff --git a/external/coreprofile-tck/annotations/pom.xml b/external/coreprofile-tck/annotations/pom.xml
index 529deff9ac..c0186896a6 100644
--- a/external/coreprofile-tck/annotations/pom.xml
+++ b/external/coreprofile-tck/annotations/pom.xml
@@ -15,11 +15,6 @@
 
     <name>Piranha - External - Core Profile TCK - Annotations - Project</name>
 
-    <properties>
-        <annotations.tck.version>3.0.0</annotations.tck.version>
-        <sigtest-maven-plugin.version>2.2</sigtest-maven-plugin.version>
-    </properties>
-
     <modules>
         <module>installer</module>
         <module>runner</module>
diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml
index 27b90565db..e2cc389864 100644
--- a/external/coreprofile-tck/pom.xml
+++ b/external/coreprofile-tck/pom.xml
@@ -16,8 +16,15 @@
     <packaging>pom</packaging>
     <name>Piranha - External - Core Profile TCK - Project</name>
     <properties>
+        <annotations.tck.version>3.0.0</annotations.tck.version>
+        <commons-httpclient.version>3.1</commons-httpclient.version>
+        <glassfish-client-ee11.version>1.6.1</glassfish-client-ee11.version>
+        <hamcrest.version>3.0</hamcrest.version>
+        <rest.tck.version>4.0.1</rest.tck.version>
+        <sigtest-maven-plugin.version>2.2</sigtest-maven-plugin.version>
     </properties>
     <modules>
         <module>annotations</module>
+	<module>rest</module>
     </modules>
 </project>
diff --git a/external/tck/rest/README.md b/external/coreprofile-tck/rest/README.md
similarity index 100%
rename from external/tck/rest/README.md
rename to external/coreprofile-tck/rest/README.md
diff --git a/external/tck/rest/installer/pom.xml b/external/coreprofile-tck/rest/installer/pom.xml
similarity index 94%
rename from external/tck/rest/installer/pom.xml
rename to external/coreprofile-tck/rest/installer/pom.xml
index 6b9a2c7a5b..c3fccaf3e2 100644
--- a/external/tck/rest/installer/pom.xml
+++ b/external/coreprofile-tck/rest/installer/pom.xml
@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck.rest</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck.rest</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-external-tck-rest-installer</artifactId>
+    <artifactId>piranha-external-coreprofiletck-rest-installer</artifactId>
     <packaging>pom</packaging>
 
     <name>Piranha - External - TCK - REST - Installer</name>
diff --git a/external/tck/rest/pom.xml b/external/coreprofile-tck/rest/pom.xml
similarity index 76%
rename from external/tck/rest/pom.xml
rename to external/coreprofile-tck/rest/pom.xml
index 5d22c2c64e..ef28aafebf 100644
--- a/external/tck/rest/pom.xml
+++ b/external/coreprofile-tck/rest/pom.xml
@@ -4,23 +4,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
  
-    <groupId>cloud.piranha.external.tck.rest</groupId>
+    <groupId>cloud.piranha.external.coreprofiletck.rest</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - REST - Project</name>
+    <name>Piranha - External - Core Profile TCK - REST - Project</name>
 
-    <properties>
-        <commons-httpclient.version>3.1</commons-httpclient.version>
-        <glassfish-client-ee11.version>1.6.1</glassfish-client-ee11.version>
-        <rest.tck.version>4.0.1</rest.tck.version>
-    </properties>
-    
     <modules>
         <module>installer</module>
         <module>runner</module>
diff --git a/external/tck/rest/runner/pom.xml b/external/coreprofile-tck/rest/runner/pom.xml
similarity index 93%
rename from external/tck/rest/runner/pom.xml
rename to external/coreprofile-tck/rest/runner/pom.xml
index e340e859fa..134b4a8535 100644
--- a/external/tck/rest/runner/pom.xml
+++ b/external/coreprofile-tck/rest/runner/pom.xml
@@ -3,12 +3,12 @@
 <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.tck.rest</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck.rest</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-external-tck-rest-runner</artifactId>
+    <artifactId>piranha-external-coreprofiletck-rest-runner</artifactId>
     <packaging>jar</packaging>
     <name>Piranha - External - TCK - REST - Runner</name>
 
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>
             <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-            <version>${arquillian.version}</version>
+            <version>${arquillian-jakarta.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
-            <version>3.0</version>
+            <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -110,7 +110,6 @@
                         <arquillian.launch>piranha</arquillian.launch>
                         <cts.harness.debug>true</cts.harness.debug>
                         <junit.log.traceflag>true</junit.log.traceflag>
-                        <optional.tech.packages.to.ignore>jakarta.xml.bind</optional.tech.packages.to.ignore>
                         <porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
                         <servlet_adaptor>org.glassfish.jersey.servlet.ServletContainer</servlet_adaptor>
                         <webServerHost>localhost</webServerHost>
diff --git a/external/tck/rest/runner/src/test/resources/arquillian.xml b/external/coreprofile-tck/rest/runner/src/test/resources/arquillian.xml
similarity index 100%
rename from external/tck/rest/runner/src/test/resources/arquillian.xml
rename to external/coreprofile-tck/rest/runner/src/test/resources/arquillian.xml
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
index 6e46947382..a37ef21b17 100644
--- a/external/tck/pom.xml
+++ b/external/tck/pom.xml
@@ -24,7 +24,6 @@
         <module>jsonb</module>
         <module>jsonp</module>
         <module>jwt</module>
-        <module>rest</module>
         <module>server</module>
         <module>wasp</module>
     </modules>