diff --git a/tck/pom.xml b/tck/pom.xml
index 8cb2ea2e..e017b307 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -38,7 +38,8 @@
         <module>tck-tests</module>
         <module>tck-tests-pluggability</module>
         <module>tck-docs/userguide</module>
-        <module>tck-dist</module>
+        <module>tck-dist-eftl</module>
+        <module>tck-dist-epl</module>
     </modules>
 
     <licenses>
@@ -128,6 +129,11 @@
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
diff --git a/tck/tck-dist/pom.xml b/tck/tck-dist-eftl/pom.xml
similarity index 86%
rename from tck/tck-dist/pom.xml
rename to tck/tck-dist-eftl/pom.xml
index f3462902..0eb5c27d 100644
--- a/tck/tck-dist/pom.xml
+++ b/tck/tck-dist-eftl/pom.xml
@@ -28,9 +28,23 @@
     </parent>
 
     <groupId>jakarta.json</groupId>
-    <artifactId>jakarta.json-tck-dist</artifactId>
+    <artifactId>jakarta.json-tck-dist-eftl</artifactId>
     <packaging>pom</packaging>
-    <name>JSONP TCK Distribution</name>
+    <name>JSONP TCK EFTL Distribution</name>
+
+    <licenses>
+        <license>
+            <name>Eclipse Foundation Technology Compatibility Kit License - v 1.0</name>
+            <distribution>manual</distribution>
+            <url>https://www.eclipse.org/legal/tck.php</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -104,26 +118,6 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>EFTL</id>
-            <properties>
-                <license>EFTL</license>
-                <bundle-name>jakarta-jsonp-tck</bundle-name>
-            </properties>
-        </profile>
-        <profile>
-            <id>EPL</id>
-            <properties>
-                <license>EPL</license>
-                <bundle-name>jsonp-tck</bundle-name>
-            </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-    </profiles>
-
     <build>
         <plugins>
             <plugin>
@@ -140,7 +134,7 @@
                                 <descriptor>src/main/assembly/assembly.xml</descriptor>
                             </descriptors>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <finalName>${bundle-name}-${project.version}</finalName>
+                            <finalName>jakarta-jsonp-tck-${project.version}</finalName>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/tck/tck-dist/src/main/assembly/assembly.xml b/tck/tck-dist-eftl/src/main/assembly/assembly.xml
similarity index 82%
rename from tck/tck-dist/src/main/assembly/assembly.xml
rename to tck/tck-dist-eftl/src/main/assembly/assembly.xml
index d0cd672d..c79ee8f5 100644
--- a/tck/tck-dist/src/main/assembly/assembly.xml
+++ b/tck/tck-dist-eftl/src/main/assembly/assembly.xml
@@ -17,7 +17,7 @@
 
 -->
 
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<assembly xmlns="https://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>distribution</id>
     <baseDirectory>jsonp-tck</baseDirectory>
@@ -25,18 +25,19 @@
         <format>zip</format>
     </formats>
 
-    <files>
-        <!-- license -->
-        <file>
-            <source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source>
-            <destName>LICENSE.md</destName>
-        </file>
-    </files>
     <fileSets>
+        <fileSet>
+            <!-- license -->
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>${project.build.scriptSourceDirectory}</directory>
             <outputDirectory>artifacts</outputDirectory>
-            <fileMode>755</fileMode>
+            <fileMode>0755</fileMode>
             <includes>
                 <include>**/*.sh</include>
             </includes>
@@ -57,7 +58,7 @@
                 <include>jakarta.json:jakarta.json-tck-tests</include>
                 <include>jakarta.json:jakarta.json-tck-tests-pluggability</include>
             </includes>
-            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
             <outputDirectory>artifacts</outputDirectory>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/tck/tck-dist/src/main/bin/pom.xml b/tck/tck-dist-eftl/src/main/bin/pom.xml
similarity index 100%
rename from tck/tck-dist/src/main/bin/pom.xml
rename to tck/tck-dist-eftl/src/main/bin/pom.xml
diff --git a/tck/tck-dist/src/main/bin/tck-tests-pluggability/pom.xml b/tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml
similarity index 100%
rename from tck/tck-dist/src/main/bin/tck-tests-pluggability/pom.xml
rename to tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml
diff --git a/tck/tck-dist/src/main/bin/tck-tests/pom.xml b/tck/tck-dist-eftl/src/main/bin/tck-tests/pom.xml
similarity index 100%
rename from tck/tck-dist/src/main/bin/tck-tests/pom.xml
rename to tck/tck-dist-eftl/src/main/bin/tck-tests/pom.xml
diff --git a/tck/tck-dist/src/main/resources/LICENSE_EFTL.md b/tck/tck-dist-eftl/src/main/resources/LICENSE.md
similarity index 100%
rename from tck/tck-dist/src/main/resources/LICENSE_EFTL.md
rename to tck/tck-dist-eftl/src/main/resources/LICENSE.md
diff --git a/tck/tck-dist/src/main/scripts/artifact-install.sh b/tck/tck-dist-eftl/src/main/scripts/artifact-install.sh
similarity index 100%
rename from tck/tck-dist/src/main/scripts/artifact-install.sh
rename to tck/tck-dist-eftl/src/main/scripts/artifact-install.sh
diff --git a/tck/tck-dist-epl/pom.xml b/tck/tck-dist-epl/pom.xml
new file mode 100644
index 00000000..93596baa
--- /dev/null
+++ b/tck/tck-dist-epl/pom.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>jakarta.json</groupId>
+        <artifactId>jakarta.json-tck</artifactId>
+        <version>2.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>jakarta.json</groupId>
+    <artifactId>jakarta.json-tck-dist-epl</artifactId>
+    <packaging>pom</packaging>
+    <name>JSONP TCK EPL Distribution</name>
+
+    <licenses>
+        <license>
+            <name>Eclipse Public License - v 2.0</name>
+            <distribution>repo</distribution>
+            <url>https://www.eclipse.org/legal/epl-2.0/</url>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-ug</artifactId>
+            <version>${project.version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-common</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-common</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-common</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-tests</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-tests</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-tests</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-tests-pluggability</artifactId>
+            <version>${project.version}</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-tests-pluggability</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-tck-tests-pluggability</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>jakarta.json</groupId>
+                                    <artifactId>jakarta.json-tck-dist-eftl</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <excludes>**/LICENSE.md</excludes>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.directory}/generated</outputDirectory>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <finalName>jsonp-tck-${project.version}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/tck/tck-dist-epl/src/main/assembly/assembly.xml b/tck/tck-dist-epl/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..fa4d3225
--- /dev/null
+++ b/tck/tck-dist-epl/src/main/assembly/assembly.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>distribution</id>
+    <baseDirectory>jsonp-tck</baseDirectory>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <!-- license -->
+            <directory>${project.basedir}/src/main/resources</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/generated/jsonp-tck</directory>
+            <outputDirectory>.</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/tck/tck-dist/src/main/resources/LICENSE_EPL.md b/tck/tck-dist-epl/src/main/resources/LICENSE.md
similarity index 100%
rename from tck/tck-dist/src/main/resources/LICENSE_EPL.md
rename to tck/tck-dist-epl/src/main/resources/LICENSE.md
diff --git a/tck/tck-docs/LICENSE_EFTL.md b/tck/tck-docs/LICENSE_EFTL.md
deleted file mode 100644
index a2106828..00000000
--- a/tck/tck-docs/LICENSE_EFTL.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Eclipse Foundation Technology Compatibility Kit License - v 1.0
-
-Copyright (c) 2018, Eclipse Foundation, Inc. and its licensors.
-
-Redistribution and use in binary form is permitted provided that the
-following conditions are met:
-
-1.  Use of the Technology Compatibility Kit accompanying this license
-    (the "TCK") and its documentation is permitted solely for the
-    purpose of testing compatibility of an implementation (the
-    "Product") of a specification (the "Specification") made available
-    by the Eclipse Foundation, Inc. ("Eclipse").
-
-2.  Only those modifications expressly permitted by the TCK and its
-    documentation are permitted. Except in these limited circumstances,
-    no modifications to the TCK are permitted under this license.
-
-3.  A Product will be deemed to be "compatible" with the Specification
-    if it fully and completely meets and satisfies all requirements of
-    the TCK.
-
-4.  Before any claim of compatibility (or any similar claim suggesting
-    compatibility) is made based on the TCK, the testing party must:
-
-    a.  use the TCK to demonstrate that the Product fully and
-	completely meets and satisfies all requirements of the TCK;
-
-    b.  make TCK test results showing full and complete satisfaction of
-	all requirements of the TCK publicly available on the testing
-	party's website and send a link to such test results to Eclipse
-	at [tck@eclipse.org](mailto:tck@eclipse.org); and
-
-    c.  comply with any requirements stated in the Specification with
-	regard to subsetting, supersetting, modifying or extending the
-	Specification in any Product claimed to be compatible with the
-	Specification.
-
-5.  The test results must be continuously available and the link must
-    be live for at least as long as the Product is available in the
-    marketplace.
-
-6.  The TCK may not be used as a basis for any statements of partial
-    compatibility. The TCK may only be used as a basis for true,
-    factual statements of full compatibility of Products that fully
-    meet and satisfy all requirements of the TCK.
-
-7.  A determination that a Product is compatible with the TCK does not,
-    in itself, give rise to the right to use any name, mark, logo
-    associated with the TCK, Eclipse, or Eclipse's contributors or
-    licensors.
-
-8.  Upon the request of Eclipse, a tester will retract any statements
-    of compatibility (or any similar claim suggesting compatibility)
-    which Eclipse reasonably determines to be false or misleading or in
-    violation of the terms of this license.
-
-9.  Redistribution of the TCK must be under this Eclipse Foundation
-    Technology Compatibility Kit License and must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.
-
-10. Neither the name, trademarks or logos of Eclipse, nor the names,
-    trademarks or logos of its contributors or licensors may be used to
-    endorse or promote products tested with this software without
-    specific prior written permission.
-
-11. The source code for the TCK accompanying this license is available
-    from Eclipse.
-
-TO THE EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED ON
-AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER
-EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR
-CONDITIONS OF TITLE, NON- INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR
-A PARTICULAR PURPOSE. TO THE EXTENT PERMITTED BY APPLICABLE LAW,
-NEITHER THE COPYRIGHT OWNER OR ANY CONTRIBUTORS SHALL HAVE ANY
-LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE
-EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.