diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 50d1189734..84c4e38c4e 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -119,11 +119,18 @@ jobs:
           path: .
       - name: Extract WildFly
         run: unzip wildfly.zip
-      - name: Build with Maven
+      - if: ${{ matrix.java != '11' }}
+        name: Build with Maven
         run: |
           JBOSS_HOME=`pwd`'/wildfly'
           export JBOSS_HOME=`echo $JBOSS_HOME`
           mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -pl '!jboss-tck-runner'
+      - if: ${{ matrix.java == '11' }}
+        name: Build with Maven; skipping incontainer servlet tests due to JDK 11
+        run: |
+          JBOSS_HOME=`pwd`'/wildfly'
+          export JBOSS_HOME=`echo $JBOSS_HOME`
+          mvn clean verify -Dincontainer -Dno-format -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -pl '!environments/servlet/tests/tomcat,!jboss-tck-runner'
       - name: Prepare failure archive (if maven failed)
         if: failure()
         shell: bash
@@ -332,9 +339,9 @@ jobs:
           name: test-reports-no-container-jdk${{matrix.java.name}}
           path: 'test-reports.tgz'
 
-  # Weld Examples build and test, only JDK 11
+  # Weld Examples build and test, only JDK 17
   examples-tests:
-    name: "Weld Examples build and test - JDK 11}"
+    name: "Weld Examples build and test - JDK 17}"
     runs-on: ubuntu-latest
     needs: build-jdk11
     timeout-minutes: 120
@@ -343,7 +350,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v4.2.1
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
       - name: Download Maven Repo
         uses: actions/download-artifact@v4
diff --git a/environments/servlet/tests/base/pom.xml b/environments/servlet/tests/base/pom.xml
index 9728fedd88..4a202d738b 100644
--- a/environments/servlet/tests/base/pom.xml
+++ b/environments/servlet/tests/base/pom.xml
@@ -62,16 +62,4 @@
 
     </dependencies>
 
-    <build>
-    	<plugins>
-    		<plugin>
-    			<groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration combine.self="override">
-                	<skip>true</skip>
-                </configuration>
-    		</plugin>
-    	</plugins>
-    </build>
-
 </project>
diff --git a/jboss-tck-runner/pom.xml b/jboss-tck-runner/pom.xml
index b1dfb2a9ff..3e124184dd 100644
--- a/jboss-tck-runner/pom.xml
+++ b/jboss-tck-runner/pom.xml
@@ -20,11 +20,6 @@
     </licenses>
     <url>http://weld.cdi-spec.org</url>
 
-    <properties>
-        <!-- This matches the htmlunit version in TCK -->
-        <htmlunit.version>2.50.0</htmlunit.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
@@ -177,10 +172,8 @@
                             <value>false</value>
                         </property>
                     </properties>
-                    <!-- https://issues.apache.org/jira/browse/SUREFIRE-569 -->
                     <dependenciesToScan>
                         <dependency>jakarta.enterprise:cdi-tck-core-impl</dependency>
-                        <dependency>jakarta.enterprise:cdi-tck-web-impl</dependency>
                     </dependenciesToScan>
                 </configuration>
             </plugin>
@@ -266,15 +259,6 @@
                                     <overWrite>false</overWrite>
                                     <destFileName>tck-core-suite.xml</destFileName>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>jakarta.enterprise</groupId>
-                                    <artifactId>cdi-tck-web-impl</artifactId>
-                                    <version>${cdi.tck-4-1.version}</version>
-                                    <type>xml</type>
-                                    <classifier>suite</classifier>
-                                    <overWrite>false</overWrite>
-                                    <destFileName>tck-web-suite.xml</destFileName>
-                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>target/suites</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
@@ -360,7 +344,7 @@
             </build>
         </profile>
 
-        <!-- Run the TCK in the managed container (full Java EE platform) -->
+        <!-- Run the CDI TCK in the managed container (full Java EE platform) -->
         <profile>
             <id>incontainer</id>
             <activation>
@@ -372,52 +356,10 @@
             </activation>
             <properties>
                 <excluded.groups>se</excluded.groups>
-                <cdi.tck.suite.xml.file>target/suites/tck-web-suite.xml</cdi.tck.suite.xml.file>
+                <!-- Note that this is the CDI CORE exclude list; it doesn't include TCKs living in EE platform suite -->
+                <cdi.tck.suite.xml.file>target/suites/tck-core-suite.xml</cdi.tck.suite.xml.file>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>jakarta.enterprise</groupId>
-                    <artifactId>cdi-tck-web-impl</artifactId>
-                    <version>${cdi.tck-4-1.version}</version>
-                    <type>xml</type>
-                    <classifier>suite</classifier>
-                    <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>jakarta.enterprise</groupId>
-                    <artifactId>cdi-tck-web-impl</artifactId>
-                    <version>${cdi.tck-4-1.version}</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.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
diff --git a/pom.xml b/pom.xml
index 01fd7aa5e8..f3dbae6249 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         <arquillian.tomcat.version>1.2.0.Final</arquillian.tomcat.version>
         <atinject.tck.version>2.0.1</atinject.tck.version>
         <!-- Version of the CDI 4.x release TCK -->
-        <cdi.tck-4-1.version>4.1.0-M1</cdi.tck-4-1.version>
+        <cdi.tck-4-1.version>4.1.0</cdi.tck-4-1.version>
         <!-- By default, each mvn profile uses corresponding file from TCK repo, see jboss-tck-runner/pom.xml -->
         <!-- We can also use our own file, needed for relaxed mode testing (see WeldMethodInterceptor) -->
         <!-- Our variant is under src/test/tck/tck-tests.xml -->