diff --git a/.github/workflows/tck-core-profile.yml b/.github/workflows/tck-core-profile.yml
index 87458f8bdb..1a4bcf6841 100644
--- a/.github/workflows/tck-core-profile.yml
+++ b/.github/workflows/tck-core-profile.yml
@@ -46,6 +46,48 @@ jobs:
       run: |
         cd external/tck/coreprofile/atinject
         mvn -B -ntp verify
+  cdi:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [ '21' ]
+        os: [ubuntu-latest]
+    steps:
+    - name: Checkout Sources
+      uses: actions/checkout@v3
+    - name: Set up Java ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        cache: 'maven'
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+    - name: Setup for TCK
+      run: mvn -B -DskipTests=true -ntp install
+    - name: Run TCK
+      run: |
+        cd external/tck/coreprofile/cdi
+        mvn -B -ntp verify
+  coreprofile:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [ '21' ]
+        os: [ubuntu-latest]
+    steps:
+    - name: Checkout Sources
+      uses: actions/checkout@v3
+    - name: Set up Java ${{ matrix.java }}
+      uses: actions/setup-java@v3
+      with:
+        cache: 'maven'
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+    - name: Setup for TCK
+      run: mvn -B -DskipTests=true -ntp install
+    - name: Run TCK
+      run: |
+        cd external/tck/coreprofile/coreprofile
+        mvn -B -ntp verify        
   jsonb:
     runs-on: ${{ matrix.os }}
     strategy:
diff --git a/docs/pom.xml b/docs/pom.xml
index f9e383e97d..db1c2e2c79 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -19,6 +19,14 @@
                 <artifactId>maven-site-plugin</artifactId>
                 <version>3.20.0</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>3.1.3</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <reporting>
diff --git a/external/tck/coreprofile/cdi/cdi-runner/pom.xml b/external/tck/coreprofile/cdi/cdi-runner/pom.xml
new file mode 100644
index 0000000000..dad1ef95af
--- /dev/null
+++ b/external/tck/coreprofile/cdi/cdi-runner/pom.xml
@@ -0,0 +1,155 @@
+<?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>
+    <groupId>tck</groupId>
+    <artifactId>cdi-runner</artifactId>
+    <version>1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>Piranha - External - TCK - CoreProfile - Jakarta CDI TCK - Runner</name>
+    <properties>
+        <piranha.version>24.9.0-SNAPSHOT</piranha.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>1.8.0.Final</version>
+                <scope>test</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>cloud.piranha.arquillian</groupId>
+                    <artifactId>piranha-arquillian-jarcontainer</artifactId>
+                    <version>${piranha.version}</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.testng</groupId>
+                    <artifactId>testng</artifactId>
+                    <version>6.9.8</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.enterprise</groupId>
+                    <artifactId>cdi-tck-core-impl</artifactId>
+                    <version>4.0.13</version>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>jakarta.el</groupId>
+                            <artifactId>jakarta.el-api</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>jakarta.faces</groupId>
+                            <artifactId>jakarta.faces-api</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <artifactId>container-se-api</artifactId>
+                            <groupId>org.jboss.arquillian.container</groupId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.arquillian.protocol</groupId>
+                    <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+                    <version>1.8.0.Final</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <!--
+                       
+                      Create a JAR file for the test resources and stick it in
+                      ${project.build.directory}/dependency/lib so it can be
+                      referred to by org.jboss.cdi.tck.libraryDirectory
+                      property when the time comes. Needed for 
+                      META-INF/cdi-tck.properties resolution.
+                                                                                                      
+                    -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <version>3.4.2</version>
+                        <executions>
+                            <execution>
+                                <phase>process-test-classes</phase>
+                                <goals>
+                                    <goal>test-jar</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+                                    <archive>
+                                        <manifest>
+                                            <addClasspath>false</addClasspath>
+                                        </manifest>
+                                    </archive>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>                        
+                            <dependenciesToScan>
+                                <dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
+                            </dependenciesToScan>
+                            <excludedGroups>cdi-full,se</excludedGroups>
+                            <forkCount>1</forkCount>
+                            <properties>
+                                <property>
+                                    <name>surefire.testng.verbose</name>
+                                    <value>1</value>
+                                </property>
+                            </properties>
+                            <reuseForks>false</reuseForks>
+                            <systemPropertyVariables>
+                                <org.jboss.cdi.tck.libraryDirectory>${project.build.directory}/dependency/lib</org.jboss.cdi.tck.libraryDirectory>
+                            </systemPropertyVariables>
+                            <testFailureIgnore>true</testFailureIgnore>
+                        </configuration>
+                    </plugin>                    
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-report-plugin</artifactId>
+                        <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>generate-test-report</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>report-only</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <outputDirectory>target/surefire-reports</outputDirectory>
+                            <outputName>test-report</outputName>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties
new file mode 100644
index 0000000000..2a3a900808
--- /dev/null
+++ b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/META-INF/cdi-tck.properties
@@ -0,0 +1,4 @@
+org.jboss.cdi.tck.testDataSource=java:comp/DefaultDataSource
+org.jboss.cdi.tck.testJmsConnectionFactory=java:/ConnectionFactory
+org.jboss.cdi.tck.testJmsQueue=java:/queue/test
+org.jboss.cdi.tck.testJmsTopic=java:/topic/test
diff --git a/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml
new file mode 100644
index 0000000000..16507cd026
--- /dev/null
+++ b/external/tck/coreprofile/cdi/cdi-runner/src/test/resources/arquillian.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian" xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+    <defaultProtocol type="Servlet 5.0"/>
+</arquillian>
diff --git a/external/tck/coreprofile/cdi/pom.xml b/external/tck/coreprofile/cdi/pom.xml
new file mode 100644
index 0000000000..e87492e350
--- /dev/null
+++ b/external/tck/coreprofile/cdi/pom.xml
@@ -0,0 +1,90 @@
+<?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.tck.coreprofile</groupId>
+        <artifactId>project</artifactId>
+        <version>24.9.0-SNAPSHOT</version>
+    </parent>
+    <groupId>cloud.piranha.external.tck.coreprofile.cdi</groupId>
+    <artifactId>project</artifactId>
+    <packaging>pom</packaging>
+    <name>Piranha - External - TCK - CoreProfile - Jakarta CDI TCK</name>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cloud.piranha</groupId>
+                <artifactId>bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>    
+    <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+                                        <echo>Executing UNIX profile</echo>
+                                        
+                                        <!-- Download, unzip and rename TCK -->
+                                        <get src="https://download.eclipse.org/jakartaee/cdi/4.0/cdi-tck-4.0.13-dist.zip"
+                                             dest="${project.build.directory}/tck.zip"
+                                             skipexisting="true"/>
+                                        <unzip src="${project.build.directory}/tck.zip"
+                                               dest="${project.build.directory}"/>
+                                        <move file="${project.build.directory}/cdi-tck-4.0.13"
+                                              tofile="${project.build.directory}/tck"/>
+                                        
+                                        <!-- Install the TCK artifacts into local repository -->
+                                        <exec dir="${project.build.directory}/tck/artifacts"
+                                              executable="mvn">
+                                            <arg value="install"/>
+                                        </exec>
+                                        
+                                        <!-- Copy testsuite -->
+                                    </target>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>integration-test</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Run the tests -->
+                                        <exec dir="${project.build.directory}/../cdi-runner"
+                                              executable="mvn">
+                                            <arg value="test"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/external/tck/coreprofile/coreprofile/core-tck/pom.xml b/external/tck/coreprofile/coreprofile/core-tck/pom.xml
new file mode 100644
index 0000000000..40dd6e6190
--- /dev/null
+++ b/external/tck/coreprofile/coreprofile/core-tck/pom.xml
@@ -0,0 +1,132 @@
+<?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>
+    <groupId>tck</groupId>
+    <artifactId>core-runner</artifactId>
+    <version>1-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>Piranha - External - TCK - CoreProfile - Jakarta CDI TCK - Runner</name>
+    <properties>
+        <piranha.version>24.9.0-SNAPSHOT</piranha.version>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>1.8.0.Final</version>
+                <scope>test</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>cloud.piranha.arquillian</groupId>
+                    <artifactId>piranha-arquillian-jarcontainer</artifactId>
+                    <version>${piranha.version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>jakarta.ee.tck.coreprofile</groupId>
+                    <artifactId>core-profile-tck-impl</artifactId>
+                    <version>10.0.3</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.arquillian.protocol</groupId>
+                    <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
+                    <version>1.8.0.Final</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.arquillian.junit5</groupId>
+                    <artifactId>arquillian-junit5-container</artifactId>
+                    <version>1.8.0.Final</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter</artifactId>
+                    <version>5.11.0</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-api</artifactId>
+                    <version>5.11.0</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-engine</artifactId>
+                    <version>5.11.0</version>
+                    <scope>test</scope>
+                </dependency>
+                <!-- RESTEasy required dependencies -->
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-core</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-client</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-json-binding-provider</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-jaxb-provider</artifactId>
+                    <version>6.1.0.Beta2</version>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>verify</id>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>   
+                            <dependenciesToScan>
+                                <dependency>jakarta.ee.tck.coreprofile:core-profile-tck-impl</dependency>
+                            </dependenciesToScan>
+                            <forkCount>1</forkCount>
+                            <reuseForks>false</reuseForks>
+                            <systemPropertyVariables>
+                                <arquillian.launch>piranha</arquillian.launch>
+                            </systemPropertyVariables>
+                            <testFailureIgnore>true</testFailureIgnore>
+                        </configuration>
+                    </plugin>  
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/external/tck/coreprofile/coreprofile/core-tck/src/test/resources/arquillian.xml b/external/tck/coreprofile/coreprofile/core-tck/src/test/resources/arquillian.xml
new file mode 100644
index 0000000000..bf4a6f1bef
--- /dev/null
+++ b/external/tck/coreprofile/coreprofile/core-tck/src/test/resources/arquillian.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<arquillian 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xmlns="http://jboss.org/schema/arquillian"
+    xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+    <defaultProtocol type="Servlet 5.0" />
+    <container qualifier="piranha" default="true"/>
+</arquillian>
diff --git a/external/tck/coreprofile/coreprofile/pom.xml b/external/tck/coreprofile/coreprofile/pom.xml
new file mode 100644
index 0000000000..c46a640912
--- /dev/null
+++ b/external/tck/coreprofile/coreprofile/pom.xml
@@ -0,0 +1,93 @@
+<?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.tck.coreprofile</groupId>
+        <artifactId>project</artifactId>
+        <version>24.9.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>piranha-external-tck-coreprofile-jakarta-coreprofile-tck</artifactId>
+    <packaging>pom</packaging>
+    <name>Piranha - External - TCK - CoreProfile - Jakarta CoreProfile TCK</name>
+    <properties>
+        <ant.home>${project.build.directory}/ant</ant.home>
+        <signature.home>${project.build.directory}/signature</signature.home>
+        <tck.home>${project.build.directory}/tck</tck.home>
+        <test.home>${tck.home}/src/com/sun/ts/tests</test.home>
+    </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cloud.piranha</groupId>
+                <artifactId>bom</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>    
+    <profiles>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+                                        <echo>Executing UNIX profile</echo>
+                                        
+                                        <!-- Download, unzip and rename TCK -->
+                                        <get src="https://download.eclipse.org/jakartaee/coreprofile/10.0/jakarta-core-profile-tck-10.0.3.zip"
+                                             dest="${project.build.directory}/tck.zip"
+                                             skipexisting="true"/>
+                                        <unzip src="${project.build.directory}/tck.zip"
+                                               dest="${project.build.directory}"/>
+                                        <move file="${project.build.directory}/core-profile-tck-10.0.3"
+                                              tofile="${project.build.directory}/tck"/>
+                                        
+                                        <!-- Install the TCK artifacts into local repository -->
+                                        <exec dir="${project.build.directory}/tck/artifacts"
+                                              executable="mvn">
+                                            <arg value="install"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>integration-test</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                                <configuration>
+                                    <target>
+                                        <!-- Run the tests -->
+                                        <exec dir="${project.build.directory}/../core-tck"
+                                              executable="mvn">
+                                            <arg value="verify"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>
diff --git a/external/tck/coreprofile/pom.xml b/external/tck/coreprofile/pom.xml
index 555264801d..5bb546debd 100644
--- a/external/tck/coreprofile/pom.xml
+++ b/external/tck/coreprofile/pom.xml
@@ -18,6 +18,8 @@
     <modules>
         <module>annotations</module>
         <module>atinject</module>
+        <module>cdi</module>
+        <module>coreprofile</module>
         <module>jsonb</module>
         <module>jsonp</module>
         <module>rest</module>