diff --git a/.github/workflows/tck-webprofile.yml b/.github/workflows/tck-webprofile.yml
index 34a7103ee..645f63674 100644
--- a/.github/workflows/tck-webprofile.yml
+++ b/.github/workflows/tck-webprofile.yml
@@ -1,5 +1,17 @@
 name: tck-webprofile
 on:
+  push:
+    paths:
+      - 'external/webprofile-tck/**'
+    branches:
+      - '*'
+    tags-ignore:
+      - 'v*'
+  pull_request:
+    paths:
+      - 'external/webprofile-tck/**'
+    branches:
+      - '*'  
   schedule:
   - cron: "0 0 * * *"
   workflow_dispatch:
@@ -13,7 +25,7 @@ jobs:
     steps:
     - name: Checkout Sources
       uses: actions/checkout@v4
-    - name: Setup Java
+    - name: Set up Java ${{ matrix.java }}
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
@@ -22,12 +34,12 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/tck/webprofile/jsonb
+        cd external/webprofile-tck/jsonb
         mvn -B -ntp verify
     - name: Test Summary
       uses: test-summary/action@v2
       with:
-        paths: "external/tck/webprofile/jsonb/target/tck/bin/target/surefire-reports/TEST-*.xml"
+        paths: "external/webprofile-tck/jsonb/target/tck/bin/target/surefire-reports/TEST-*.xml"
       if: always()
   jsonp:
     runs-on: ${{ matrix.os }}
@@ -38,7 +50,7 @@ jobs:
     steps:
     - name: Checkout Sources
       uses: actions/checkout@v4
-    - name: Setup Java
+    - name: Set up Java ${{ matrix.java }}
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
@@ -47,12 +59,12 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/tck/coreprofile/jsonp
+        cd external/webprofile-tck/jsonp
         mvn -B -ntp verify
     - name: Test Summary
       uses: test-summary/action@v2
       with:
         paths: |
-          external/tck/coreprofile/jsonp/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
-          external/tck/coreprofile/jsonp/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
+          external/webprofile-tck/jsonp/target/tck/bin/tck-tests/target/surefire-reports/TEST-*.xml
+          external/webprofile-tck/jsonp/target/tck/bin/tck-tests-pluggability/target/surefire-reports/TEST-*.xml
       if: always()
diff --git a/external/pom.xml b/external/pom.xml
index 45b17a76b..0a6d85c6b 100644
--- a/external/pom.xml
+++ b/external/pom.xml
@@ -34,5 +34,6 @@
         <module>kickoff</module>
         <module>quicklook</module>
         <module>tck</module>
+        <module>webprofile-tck</module>
     </modules>
 </project>
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
index 40ae9d225..b08e8484b 100644
--- a/external/tck/pom.xml
+++ b/external/tck/pom.xml
@@ -17,8 +17,8 @@
 
     <modules>
         <module>el</module>
-        <module>servlet</module>
         <module>jwt</module>
+        <module>server</module>
         <module>wasp</module>
     </modules>
 </project>
diff --git a/external/tck/server/pom.xml b/external/tck/server/pom.xml
index 1dc9b50fc..8ca629006 100644
--- a/external/tck/server/pom.xml
+++ b/external/tck/server/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>cloud.piranha.external.tck</groupId>
         <artifactId>project</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.10.0-SNAPSHOT</version>
     </parent>
     <groupId>cloud.piranha.external.tck.server</groupId>
     <artifactId>project</artifactId>
diff --git a/external/tck/server/servlet/pom.xml b/external/tck/server/servlet/pom.xml
index 38e617847..5b1c0e7c2 100644
--- a/external/tck/server/servlet/pom.xml
+++ b/external/tck/server/servlet/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>cloud.piranha.external.tck.server</groupId>
         <artifactId>project</artifactId>
-        <version>24.9.0-SNAPSHOT</version>
+        <version>24.10.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>servlet-tck</artifactId>
diff --git a/external/tck/webprofile/jsonb/pom.xml b/external/webprofile-tck/jsonb/pom.xml
similarity index 96%
rename from external/tck/webprofile/jsonb/pom.xml
rename to external/webprofile-tck/jsonb/pom.xml
index b1f2fa3d0..dbc5ffa2b 100644
--- a/external/tck/webprofile/jsonb/pom.xml
+++ b/external/webprofile-tck/jsonb/pom.xml
@@ -3,17 +3,16 @@
 <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.webprofile</groupId>
+        <groupId>cloud.piranha.external.webprofiletck</groupId>
         <artifactId>project</artifactId>
         <version>24.10.0-SNAPSHOT</version>
     </parent>
     <artifactId>jsonb-tck</artifactId>
     <packaging>pom</packaging>
-    <name>Piranha Web Profile - Jakarta JSON Binding TCK</name>
+    <name>Piranha Web Profile - JSON Binding TCK</name>
     <properties>
         <jsonb.tck.version>3.0.0</jsonb.tck.version>
         <tck.home>${project.build.directory}/tck</tck.home>
-        <yasson.version>3.0.4</yasson.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/external/tck/webprofile/jsonp/pom.xml b/external/webprofile-tck/jsonp/pom.xml
similarity index 95%
rename from external/tck/webprofile/jsonp/pom.xml
rename to external/webprofile-tck/jsonp/pom.xml
index 5369b769b..eac867279 100644
--- a/external/tck/webprofile/jsonp/pom.xml
+++ b/external/webprofile-tck/jsonp/pom.xml
@@ -3,16 +3,15 @@
 <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.webprofile</groupId>
+        <groupId>cloud.piranha.external.webprofiletck</groupId>
         <artifactId>project</artifactId>
         <version>24.10.0-SNAPSHOT</version>
     </parent>
     <artifactId>jsonp-tck</artifactId>
     <packaging>pom</packaging>
-    <name>Piranha Web Profile - Jakarta JSON Processing TCK</name>
+    <name>Piranha Web Profile - JSON Processing TCK</name>
     <properties>
         <jsonp.tck.version>2.1.1</jsonp.tck.version>
-        <parsson.version>1.1.7</parsson.version>
         <tck.home>${project.build.directory}/tck</tck.home>
     </properties>
     <dependencyManagement>
diff --git a/external/tck/webprofile/pom.xml b/external/webprofile-tck/pom.xml
similarity index 76%
rename from external/tck/webprofile/pom.xml
rename to external/webprofile-tck/pom.xml
index 49fa0e457..69529c8c7 100644
--- a/external/tck/webprofile/pom.xml
+++ b/external/webprofile-tck/pom.xml
@@ -7,14 +7,14 @@
     xmlns:if="ant:if">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>cloud.piranha.external.tck</groupId>
+        <groupId>cloud.piranha.external</groupId>
         <artifactId>project</artifactId>
         <version>24.10.0-SNAPSHOT</version>
     </parent>
-    <groupId>cloud.piranha.external.tck.webprofile</groupId>
+    <groupId>cloud.piranha.external.webprofiletck</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
-    <name>Piranha - External - TCK - Web Profile - Project</name>
+    <name>Piranha - External - Web Profile TCK - Project</name>
     <modules>
         <module>jsonb</module>
         <module>jsonp</module>