diff --git a/dev/com.ibm.websphere.appserver.features/visibility/public/webProfile-10.0/io.openliberty.webProfile-10.0.feature b/dev/com.ibm.websphere.appserver.features/visibility/public/webProfile-10.0/io.openliberty.webProfile-10.0.feature
index f8c1815aca84..43426e364d27 100644
--- a/dev/com.ibm.websphere.appserver.features/visibility/public/webProfile-10.0/io.openliberty.webProfile-10.0.feature
+++ b/dev/com.ibm.websphere.appserver.features/visibility/public/webProfile-10.0/io.openliberty.webProfile-10.0.feature
@@ -11,6 +11,7 @@ Subsystem-Name: Jakarta EE Web Profile 10.0
   io.openliberty.appSecurity-5.0, \
   io.openliberty.appAuthentication-3.0, \
   io.openliberty.jsonb-3.0, \
+  io.openliberty.concurrent-3.0, \
   io.openliberty.enterpriseBeansLite-4.0, \
   io.openliberty.websocket-2.1, \
   com.ibm.websphere.appserver.jdbc-4.2; ibm.tolerates:="4.3", \
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncher.java b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncherFull.java
similarity index 52%
rename from dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncher.java
rename to dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncherFull.java
index 7d812dc96782..34776c896fc7 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncher.java
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncherFull.java
@@ -12,34 +12,21 @@
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.testng.xml.XmlPackage;
-import org.testng.xml.XmlSuite;
-import org.testng.xml.XmlSuite.FailurePolicy;
-import org.testng.xml.XmlTest;
 
 import com.ibm.websphere.simplicity.PortType;
-import com.ibm.websphere.simplicity.log.Log;
 
 import componenttest.annotation.AllowedFFDC;
 import componenttest.annotation.MinimumJavaLevel;
 import componenttest.annotation.Server;
 import componenttest.custom.junit.runner.FATRunner;
-import componenttest.custom.junit.runner.Mode;
-import componenttest.custom.junit.runner.TestModeFilter;
 import componenttest.topology.impl.LibertyServer;
 import componenttest.topology.utils.MvnUtils;
 
@@ -52,22 +39,21 @@
  */
 @RunWith(FATRunner.class)
 @MinimumJavaLevel(javaLevel = 11)
-public class ConcurrentTckLauncher {
+public class ConcurrentTckLauncherFull {
 
     final static Map<String, String> additionalProps = new HashMap<>();
 
-    private static String suiteXmlFile = "tck-suite.xml"; //Default value
+    private static String suiteXmlFile = "tck-suite-full.xml"; //Default value
 
-    @Server("ConcurrentTCKServer")
+    @Server("ConcurrentTCKFullServer")
     public static LibertyServer server;
 
     @BeforeClass
     public static void setUp() throws Exception {
         //UNCOMMENT - To test against a local snapshot of TCK
         //additionalProps.put("jakarta.concurrent.tck.groupid", "jakarta.enterprise.concurrent");
-        //additionalProps.put("jakarta.concurrent.tck.version", "3.0.0-SNAPSHOT");
-
-        suiteXmlFile = createSuiteXML();
+        additionalProps.put("jakarta.concurrent.tck.version", "3.0.2-SNAPSHOT"); //TODO comment out once 3.0.2 is on maven central
+        additionalProps.put("jakarta.run.full.profile", "false"); //TODO comment out once 3.0.2 is on maven central
 
         //username and password for Arquillian to authenticate to restConnect
         additionalProps.put("tck_username", "arquillian");
@@ -109,6 +95,8 @@ public static void tearDown() throws Exception {
     @AllowedFFDC // The tested exceptions cause FFDC so we have to allow for this.
     public void launchConcurrentTCK() throws Exception {
 
+        suiteXmlFile = FATSuite.createSuiteXML(FATSuite.PROFILE.FULL);
+
         Map<String, String> resultInfo = MvnUtils.getResultInfo(server);
 
         /**
@@ -127,82 +115,8 @@ public void launchConcurrentTCK() throws Exception {
 
         resultInfo.put("results_type", "Jakarta");
         resultInfo.put("feature_name", "Concurrency");
-        resultInfo.put("feature_version", "3.0");
+        resultInfo.put("feature_version", "3.0-full");
         MvnUtils.preparePublicationFile(resultInfo);
         assertEquals(0, result);
     }
-
-    /**
-     * Programmatically create a tck-suite-programmatic.xml file based on environment variables
-     *
-     * @return String suite file name
-     * @throws IOException if we are unable to write contents of tck-suite-programmatic.xml to filesystem
-     */
-    public static String createSuiteXML() throws IOException {
-        XmlSuite suite = new XmlSuite();
-        suite.setFileName("tck-suite-programmatic.xml");
-        suite.setName("jakarta-concurrency");
-        suite.setVerbose(2);
-        suite.setConfigFailurePolicy(FailurePolicy.CONTINUE);
-
-        XmlTest test = new XmlTest(suite);
-        test.setName("jakarta-concurrency-programmatic");
-
-        XmlPackage apiPackage = new XmlPackage();
-        XmlPackage specPackage = new XmlPackage();
-
-        apiPackage.setName("ee.jakarta.tck.concurrent.api.*");
-        specPackage.setName("ee.jakarta.tck.concurrent.spec.*");
-
-        Set<String> apiExcludes = new HashSet<>();
-        Set<String> specExcludes = new HashSet<>();
-
-        /**
-         * Exclude certain tests when running in lite mode
-         */
-        if (TestModeFilter.FRAMEWORK_TEST_MODE != Mode.TestMode.FULL) {
-            Log.info(ConcurrentTckLauncher.class, "createSuiteXML", "Modifying API and Spec packages to exclude specific tests for lite mode.");
-            apiExcludes.add("ee.jakarta.tck.concurrent.api.Trigger");
-            specExcludes.addAll(Arrays.asList("ee.jakarta.tck.concurrent.spec.ManagedScheduledExecutorService.inheritedapi",
-                                              "ee.jakarta.tck.concurrent.spec.ManagedScheduledExecutorService.inheritedapi_servlet"));
-        }
-
-        /**
-         * Skip signature testing on Windows
-         * So far as I can tell the signature test plugin is not supported on windows
-         * Opened an issue against jsonb tck https://github.com/eclipse-ee4j/jsonb-api/issues/327
-         */
-        if (System.getProperty("os.name").contains("Windows")) {
-            Log.info(ConcurrentTckLauncher.class, "createSuiteXML", "Skipping Signature Tests on Windows");
-            specExcludes.add("ee.jakarta.tck.concurrent.spec.signature");
-        }
-
-        /**
-         * If JDK is not in the supported list for signature testing, skip it.
-         */
-        int javaSpecVersion = Integer.parseInt(System.getProperty("java.specification.version"));
-        if (!(javaSpecVersion == 11 || javaSpecVersion == 17)) {
-            Log.info(ConcurrentTckLauncher.class, "createSuiteXML", "Skipping Signature Tests on unsupported JDK");
-            specExcludes.add("ee.jakarta.tck.concurrent.spec.signature");
-        }
-
-        apiPackage.setExclude(new ArrayList<String>(apiExcludes));
-        specPackage.setExclude(new ArrayList<String>(specExcludes));
-
-        test.setPackages(Arrays.asList(apiPackage, specPackage));
-
-        suite.setTests(Arrays.asList(test));
-
-        Log.info(ConcurrentTckLauncher.class, "createSuiteXML", suite.toXml());
-
-        //When this code runs it is running as part of an ant task already in the autoFVT directory.
-        //Therefore, use a relative path to this file.
-        String suiteXmlFileLocation = "publish/tckRunner/tck/" + suite.getFileName();
-        try (FileWriter suiteXmlWriter = new FileWriter(suiteXmlFileLocation);) {
-            suiteXmlWriter.write(suite.toXml());
-            Log.info(ConcurrentTckLauncher.class, "createSuiteXML", "Wrote to " + suiteXmlFileLocation);
-        }
-
-        return suite.getFileName();
-    }
 }
\ No newline at end of file
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncherWeb.java b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncherWeb.java
new file mode 100644
index 000000000000..ae9e935775f5
--- /dev/null
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/ConcurrentTckLauncherWeb.java
@@ -0,0 +1,121 @@
+/*******************************************************************************
+ * Copyright (c) 2022 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package io.openliberty.jakarta.enterprise.concurrent.tck;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.ibm.websphere.simplicity.PortType;
+
+import componenttest.annotation.AllowedFFDC;
+import componenttest.annotation.MinimumJavaLevel;
+import componenttest.annotation.Server;
+import componenttest.custom.junit.runner.FATRunner;
+import componenttest.topology.impl.LibertyServer;
+import componenttest.topology.utils.MvnUtils;
+
+/**
+ * This is a test class that runs the whole Jakarta Concurrency TCK. The TCK results
+ * are copied in the results/junit directory before the Simplicity FAT framework
+ * generates the html report - so there is detailed information on individual
+ * tests as if they were running as simplicity junit FAT tests in the standard
+ * location.
+ */
+@RunWith(FATRunner.class)
+@MinimumJavaLevel(javaLevel = 11)
+public class ConcurrentTckLauncherWeb {
+
+    final static Map<String, String> additionalProps = new HashMap<>();
+
+    private static String suiteXmlFile = "tck-suite-web.xml"; //Default value
+
+    @Server("ConcurrentTCKWebServer")
+    public static LibertyServer server;
+
+    @BeforeClass
+    public static void setUp() throws Exception {
+        //UNCOMMENT - To test against a local snapshot of TCK
+        //additionalProps.put("jakarta.concurrent.tck.groupid", "jakarta.enterprise.concurrent");
+        additionalProps.put("jakarta.concurrent.tck.version", "3.0.2-SNAPSHOT"); //TODO comment out once 3.0.2 is on maven central
+
+        //username and password for Arquillian to authenticate to restConnect
+        additionalProps.put("tck_username", "arquillian");
+        additionalProps.put("tck_password", "arquillianPassword");
+
+        //Logging properties for java.util.logging to use for mvn output
+        additionalProps.put("java.util.logging.config.file", server.getServerRoot() + "/resources/logging/logging.properties");
+
+        //username and password to set on quickStartSecurity
+        server.addEnvVar("tck_username", "arquillian");
+        server.addEnvVar("tck_password", "arquillianPassword");
+
+        //Ports liberty should be using for testing
+        server.addEnvVar("tck_port", "" + server.getPort(PortType.WC_defaulthost));
+        server.addEnvVar("tck_port_secure", "" + server.getPort(PortType.WC_defaulthost_secure));
+
+        Map<String, String> opts = server.getJvmOptionsAsMap();
+        //Path that jimage will output modules for signature testing
+        opts.put("-Djimage.dir", server.getServerSharedPath() + "jimage/output/");
+        server.setJvmOptions(opts);
+
+        //Finally start the server
+        server.startServer();
+    }
+
+    @AfterClass
+    public static void tearDown() throws Exception {
+        server.stopServer(
+                          "WLTC0032W", //Transaction rollback warning.
+                          "WLTC0033W", //Transaction rollback warning.
+                          "CWWKS0901E" //Quickstart security
+        );
+    }
+
+    /**
+     * Run the TCK (controlled by autoFVT/publish/tckRunner/tck/*)
+     */
+    @Test
+    @AllowedFFDC // The tested exceptions cause FFDC so we have to allow for this.
+    public void launchConcurrentTCK() throws Exception {
+
+        suiteXmlFile = FATSuite.createSuiteXML(FATSuite.PROFILE.WEB);
+
+        Map<String, String> resultInfo = MvnUtils.getResultInfo(server);
+
+        /**
+         * The runTCKMvnCmd will set the following properties for use by arquillian
+         * [ wlp, tck_server, tck_port, tck_failSafeUndeployment, tck_appDeployTimeout, tck_appUndeployTimeout ]
+         * and then run the mvn test command.
+         */
+        int result = MvnUtils.runTCKMvnCmd(
+                                           server, //server to run on
+                                           "io.openliberty.jakarta.concurrency.3.0_fat_tck", //bucket name
+                                           this.getClass() + ":launchConcurrentTCK", //launching method
+                                           suiteXmlFile, //tck suite
+                                           additionalProps, //additional props
+                                           Collections.emptySet() //additional jars
+        );
+
+        resultInfo.put("results_type", "Jakarta");
+        resultInfo.put("feature_name", "Concurrency");
+        resultInfo.put("feature_version", "3.0-Web");
+        MvnUtils.preparePublicationFile(resultInfo);
+        assertEquals(0, result);
+    }
+}
\ No newline at end of file
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/FATSuite.java b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/FATSuite.java
index 924eb0488913..1f5b577556a3 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/FATSuite.java
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/fat/src/io/openliberty/jakarta/enterprise/concurrent/tck/FATSuite.java
@@ -10,16 +10,123 @@
  *******************************************************************************/
 package io.openliberty.jakarta.enterprise.concurrent.tck;
 
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
+import org.testng.xml.XmlPackage;
+import org.testng.xml.XmlSuite;
+import org.testng.xml.XmlSuite.FailurePolicy;
+import org.testng.xml.XmlTest;
+
+import com.ibm.websphere.simplicity.log.Log;
 
 import componenttest.custom.junit.runner.AlwaysPassesTest;
+import componenttest.custom.junit.runner.Mode;
+import componenttest.custom.junit.runner.TestModeFilter;
 
 @RunWith(Suite.class)
 @SuiteClasses({
                 AlwaysPassesTest.class, //Need to have a passing test while normal tests are disabled
-                ConcurrentTckLauncher.class
+                ConcurrentTckLauncherFull.class,
+                ConcurrentTckLauncherWeb.class
 })
 public class FATSuite {
+
+    static enum PROFILE {
+        FULL("eefull"),
+        WEB("eeweb");
+
+        String value;
+
+        PROFILE(String value) {
+            this.value = value;
+        }
+    }
+
+    /**
+     * Programmatically create a tck-suite-programmatic.xml file based on environment variables
+     *
+     * @return String suite file name
+     * @throws IOException if we are unable to write contents of tck-suite-programmatic.xml to filesystem
+     */
+    public static String createSuiteXML(PROFILE profile) throws IOException {
+        XmlSuite suite = new XmlSuite();
+        suite.setFileName("tck-suite-programmatic.xml");
+        suite.setName("jakarta-concurrency");
+        suite.setVerbose(2);
+        suite.setConfigFailurePolicy(FailurePolicy.CONTINUE);
+
+        XmlTest test = new XmlTest(suite);
+        test.setName("jakarta-concurrency-programmatic");
+
+        XmlPackage apiPackage = new XmlPackage();
+        XmlPackage specPackage = new XmlPackage();
+
+        apiPackage.setName("ee.jakarta.tck.concurrent.api.*");
+        specPackage.setName("ee.jakarta.tck.concurrent.spec.*");
+
+        Set<String> apiExcludes = new HashSet<>();
+        Set<String> specExcludes = new HashSet<>();
+
+        /**
+         * Exclude certain tests when running in lite mode
+         */
+        if (TestModeFilter.FRAMEWORK_TEST_MODE != Mode.TestMode.FULL) {
+            Log.info(ConcurrentTckLauncherFull.class, "createSuiteXML", "Modifying API and Spec packages to exclude specific tests for lite mode.");
+            apiExcludes.add("ee.jakarta.tck.concurrent.api.Trigger");
+            specExcludes.addAll(Arrays.asList("ee.jakarta.tck.concurrent.spec.ManagedScheduledExecutorService.inheritedapi",
+                                              "ee.jakarta.tck.concurrent.spec.ManagedScheduledExecutorService.inheritedapi_servlet"));
+        }
+
+        /**
+         * Skip signature testing on Windows
+         * So far as I can tell the signature test plugin is not supported on windows
+         * Opened an issue against jsonb tck https://github.com/eclipse-ee4j/jsonb-api/issues/327
+         */
+        if (System.getProperty("os.name").contains("Windows")) {
+            Log.info(ConcurrentTckLauncherFull.class, "createSuiteXML", "Skipping Signature Tests on Windows");
+            specExcludes.add("ee.jakarta.tck.concurrent.spec.signature");
+        }
+
+        /**
+         * If JDK is not in the supported list for signature testing, skip it.
+         */
+        int javaSpecVersion = Integer.parseInt(System.getProperty("java.specification.version"));
+        if (!(javaSpecVersion == 11 || javaSpecVersion == 17)) {
+            Log.info(ConcurrentTckLauncherFull.class, "createSuiteXML", "Skipping Signature Tests on unsupported JDK");
+            specExcludes.add("ee.jakarta.tck.concurrent.spec.signature");
+        }
+
+        apiPackage.setExclude(new ArrayList<String>(apiExcludes));
+        specPackage.setExclude(new ArrayList<String>(specExcludes));
+
+        test.setPackages(Arrays.asList(apiPackage, specPackage));
+
+        if (profile == PROFILE.FULL)
+            test.setExcludedGroups(Arrays.asList(PROFILE.WEB.value));
+        else
+            test.setExcludedGroups(Arrays.asList(PROFILE.FULL.value));
+
+        suite.setTests(Arrays.asList(test));
+
+        Log.info(ConcurrentTckLauncherFull.class, "createSuiteXML", suite.toXml());
+
+        //When this code runs it is running as part of an ant task already in the autoFVT directory.
+        //Therefore, use a relative path to this file.
+        String suiteXmlFileLocation = "publish/tckRunner/tck/" + suite.getFileName();
+        try (FileWriter suiteXmlWriter = new FileWriter(suiteXmlFileLocation);) {
+            suiteXmlWriter.write(suite.toXml());
+            Log.info(ConcurrentTckLauncherFull.class, "createSuiteXML", "Wrote to " + suiteXmlFileLocation);
+        }
+
+        return suite.getFileName();
+    }
+
 }
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/bootstrap.properties b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/bootstrap.properties
similarity index 100%
rename from dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/bootstrap.properties
rename to dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/bootstrap.properties
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/configDropins/defaults/test.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/configDropins/defaults/test.xml
similarity index 100%
rename from dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/configDropins/defaults/test.xml
rename to dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/configDropins/defaults/test.xml
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/jvm.options b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/jvm.options
similarity index 100%
rename from dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/jvm.options
rename to dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/jvm.options
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/resources/logging/logging.properties b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/resources/logging/logging.properties
similarity index 100%
rename from dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/resources/logging/logging.properties
rename to dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/resources/logging/logging.properties
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/server.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/server.xml
similarity index 89%
rename from dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/server.xml
rename to dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/server.xml
index f383d1ef0c46..95010a9b7eba 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKServer/server.xml
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKFullServer/server.xml
@@ -11,15 +11,7 @@
 <server>
     <featureManager>
         <!-- Features being tested -->
-        <!--TODO once all of EE 10 is beta, could enable <feature>jakartaee-10.0</feature> or leave the individual features -->
-        <feature>concurrent-3.0</feature>
-        <feature>jdbc-4.2</feature>
-        <feature>enterpriseBeans-4.0</feature>
-        <feature>cdi-4.0</feature>
-        <feature>pages-3.1</feature>
-        <!-- Supporting features -->
-        <feature>jndi-1.0</feature>
-        <feature>appSecurity-5.0</feature>
+		<feature>webProfile-10.0</feature>
         <!-- Features needed for arquillan support -->
         <feature>localConnector-1.0</feature>
         <feature>restConnector-2.0</feature>
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/bootstrap.properties b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/bootstrap.properties
new file mode 100644
index 000000000000..7cac674ff457
--- /dev/null
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/bootstrap.properties
@@ -0,0 +1,11 @@
+###############################################################################
+# Copyright (c) 2022 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+bootstrap.include=../testports.properties
\ No newline at end of file
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml
new file mode 100644
index 000000000000..afd711fed9a3
--- /dev/null
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml
@@ -0,0 +1,9 @@
+<server>
+    <!-- These are features that we do not want in the standalon WLP case test -->
+    <featureManager>
+	    <!-- Required by test infrastructure -->
+	    <feature>timedexit-1.0</feature>
+        <!-- Convenience feature -->
+	    <feature>arquillian-support-jakarta-2.0</feature>
+	</featureManager>
+</server>
\ No newline at end of file
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/jvm.options b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/jvm.options
new file mode 100644
index 000000000000..85f02a6a367d
--- /dev/null
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/jvm.options
@@ -0,0 +1,3 @@
+-Dcom.ibm.tools.attach.enable=yes
+--add-exports=java.base/jdk.internal.vm.annotation=ALL-UNNAMED
+--add-opens=java.base/jdk.internal.vm.annotation=ALL-UNNAMED
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/resources/logging/logging.properties b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/resources/logging/logging.properties
new file mode 100644
index 000000000000..fb2b22d234f4
--- /dev/null
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/resources/logging/logging.properties
@@ -0,0 +1,37 @@
+#Handlers we plan to use
+handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler
+
+#Global logger - By default only log warnings
+.level=WARNING
+
+#Concurrency logger - By default log everything for concurrency loggers
+ee.jakarta.tck.concurrent.level=ALL
+
+#Formatting for the simple formatter
+java.util.logging.SimpleFormatter.class.log=true
+java.util.logging.SimpleFormatter.class.full=false
+java.util.logging.SimpleFormatter.class.length=30
+
+java.util.logging.SimpleFormatter.level.log=true
+
+java.util.logging.SimpleFormatter.method.log=true
+java.util.logging.SimpleFormatter.method.length=30
+
+java.util.logging.SimpleFormatter.thread.log=true
+java.util.logging.SimpleFormatter.thread.length=3
+
+java.util.logging.SimpleFormatter.time.log=true
+java.util.logging.SimpleFormatter.time.format=[MM/dd/yyyy HH:mm:ss:SSS z]
+
+java.util.logging.SimpleFormatter.format=[%1$tF %1$tT] %4$.1s %3$s %5$s %n
+
+#File logging
+java.util.logging.FileHandler.pattern=ConcurrentTCK%g%u.log
+java.util.logging.FileHandler.limit = 500000
+java.util.logging.FileHandler.count = 5
+java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.FileHandler.level=CONFIG
+
+# Console Logging
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.ConsoleHandler.level=WARNING
\ No newline at end of file
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/server.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/server.xml
new file mode 100644
index 000000000000..9474b914dd23
--- /dev/null
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/server.xml
@@ -0,0 +1,83 @@
+<!--
+    Copyright (c) 2022 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        IBM Corporation - initial API and implementation
+ -->
+<server>
+    <featureManager>
+        <!-- Features being tested -->
+        <feature>jakartaee-10.0</feature>
+        <!-- Features needed for arquillan support -->
+        <feature>localConnector-1.0</feature>
+        <feature>restConnector-2.0</feature>
+    </featureManager>
+
+    <!-- Use logging instead of bootstrap for standalone WLP case -->
+    <logging traceSpecification="*=info:concurrent=all:concurrencyPolicy=all:context=all" />
+
+    <!-- Allow Arquillian to monitor application -->
+    <applicationMonitor updateTrigger="mbean"/>
+
+    <!-- Allow Arquillian remote access to server -->
+    <quickStartSecurity userName="${env.tck_username}" userPassword="${env.tck_password}" />
+
+    <!-- Allow Arquillian to participate in TLS handshake with server -->
+    <ssl id="defaultSSLConfig" trustDefaultCerts="true" />
+    <keyStore id="defaultKeyStore" password="libertyPassword"/>
+
+    <!-- Allow Arquillian to create a secure connection -->
+    <httpEndpoint id="defaultHttpEndpoint" host="*" httpPort="${env.tck_port}" httpsPort="${env.tck_port_secure}">
+        <sslOptions sslRef="defaultKeyStore"/>
+    </httpEndpoint>
+
+    <!-- Allow Arquillian access to dropins directory for application installation -->
+    <remoteFileAccess>
+        <writeDir>${server.config.dir}/dropins</writeDir>
+    </remoteFileAccess>
+
+    <!-- Include derby in gloabl library to make it available to all dropin apps -->
+    <library id="global">
+               <fileset dir="${shared.resource.dir}/derby" includes="*.jar"/>
+               <fileset dir="${shared.resource.dir}/testng/6.14.3" includes="*.jar"/>
+               <fileset dir="${shared.resource.dir}/sigtest/1.6" includes="*.jar"/>
+    </library>
+
+    <!--Java2 security-->
+    <javaPermission className="java.security.AllPermission"  name="*" actions="*" />
+
+    <!-- Derby Permissions -->
+    <javaPermission codeBase="${shared.resource.dir}/derby/derby.jar" className="java.security.AllPermission"/>
+    <javaPermission codeBase="${shared.resource.dir}/sigtest/sigtest-maven-plugin.jar" className="java.security.AllPermission"/>
+
+    <!-- Signature test application permissions -->
+    <javaPermission codeBase="${server.config.dir}/dropins/signatureTest.war" className="java.security.AllPermission"/>
+	
+    <!-- Signature test plugin permissions -->
+    <javaPermission codeBase="${shared.resource.dir}/sigtest/1.6/sigtest.jar" className="java.security.AllPermission" />
+    <javaPermission codeBase="${shared.resource.dir}/sigtest/1.6/sigtest.jar" className="java.lang.RuntimePermission"  name="accessClassInPackage.jdk.internal" />
+    <javaPermission codeBase="${shared.resource.dir}/sigtest/1.6/sigtest.jar" className="java.lang.RuntimePermission"  name="accessClassInPackage.jdk.internal.reflect" />
+    <javaPermission codeBase="${shared.resource.dir}/sigtest/1.6/sigtest.jar" className="java.lang.RuntimePermission"  name="accessClassInPackage.jdk.internal.vm.annotation" />
+
+    <!-- Ensure JSP can handle lamdas -->
+    <jspEngine jdkSourceLevel="18"/>
+
+    <!-- Security role(s) needed for TCK tests -->
+    <orb id="defaultOrb" orbSSLInitTimeout="60"/>
+
+    <basicRegistry id="basic" realm="default">
+        <user name="javajoe" password="javajoe"/>
+        <group name="Manager">
+          <member name="javajoe"/>
+        </group>
+    </basicRegistry>
+
+    <security-role-mapping>
+      <role-name>Manager</role-name>
+      <principal-name>javajoe</principal-name>
+    </security-role-mapping>
+</server>
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/pom.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/pom.xml
index 3bf4478d8094..f15f65a3ccbb 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/pom.xml
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/pom.xml
@@ -20,9 +20,9 @@
     <properties>
     	<!-- These properties can be overwritten by users if they want to test against a snapshot version-->
         <jakarta.concurrent.tck.groupid>jakarta.enterprise.concurrent</jakarta.concurrent.tck.groupid>
-        <jakarta.concurrent.tck.version>3.0.0</jakarta.concurrent.tck.version>
+        <jakarta.concurrent.tck.version>3.0.0</jakarta.concurrent.tck.version> <!-- TODO update to 3.0.2 when it is released on Maven Central -->
         
-        <jakarta.concurrent.version>3.0.0</jakarta.concurrent.version>
+        <jakarta.concurrent.version>3.0.0</jakarta.concurrent.version> <!-- TODO update to 3.0.2 when it is released on Maven Central -->
         
         <arquillian.version>1.7.0.Alpha10</arquillian.version>
         <arquillian-wlp.version>2.0.2</arquillian-wlp.version>
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml
index 6f79c68d1adf..443f57c475b6 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml
@@ -20,9 +20,9 @@
     <properties>
     	<!-- These properties can be overwritten by users if they want to test against a snapshot version-->
         <jakarta.concurrent.tck.groupid>jakarta.enterprise.concurrent</jakarta.concurrent.tck.groupid>
-        <jakarta.concurrent.tck.version>3.0.0</jakarta.concurrent.tck.version>
+        <jakarta.concurrent.tck.version>3.0.0</jakarta.concurrent.tck.version> <!-- TODO update to 3.0.2 -->
         
-        <jakarta.concurrent.version>3.0.0</jakarta.concurrent.version>
+        <jakarta.concurrent.version>3.0.0</jakarta.concurrent.version> <!-- TODO update to 3.0.2 -->
         
         <arquillian.version>1.7.0.Alpha10</arquillian.version>
         <arquillian-wlp.version>2.0.2</arquillian-wlp.version>
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite-full.xml
similarity index 90%
rename from dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite.xml
rename to dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite-full.xml
index 99bc0ee2dfad..44a95789129b 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite.xml
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite-full.xml
@@ -13,6 +13,11 @@
  -->
 <suite name="jakarta-concurrency" verbose="2" configfailurepolicy="continue">
     <test name="jakarta-concurrency">
+        <groups>
+	      <run>
+	        <exclude name="eeweb"/>
+	      </run>
+	    </groups>
         <packages>
             <package name="ee.jakarta.tck.concurrent.api.*"/>
             <package name="ee.jakarta.tck.concurrent.spec.*"/>
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite-web.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite-web.xml
new file mode 100644
index 000000000000..bec4d76ca94a
--- /dev/null
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/tck-suite-web.xml
@@ -0,0 +1,26 @@
+<!--Copyright (c) 2022 IBM Corporation and others. All rights reserved.
+    This program and the accompanying materials are made available under the 
+    terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+    and is available at 
+        http://www.eclipse.org/legal/epl-v10.html 
+    Contributors: 
+        IBM Corporation - initial API and implementation
+-->
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<!-- NOTE: this is not the suite executed as part of our automated testing.
+     Instead, we use a programmatically generated suite.xml
+ -->
+<suite name="jakarta-concurrency" verbose="2" configfailurepolicy="continue">
+    <test name="jakarta-concurrency">
+        <groups>
+	      <run>
+	        <exclude name="eefull"/>
+	      </run>
+	    </groups>
+        <packages>
+            <package name="ee.jakarta.tck.concurrent.api.*"/>
+            <package name="ee.jakarta.tck.concurrent.spec.*"/>
+        </packages>
+    </test>
+</suite>
\ No newline at end of file