diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml
index a4f21b82..fcc81452 100644
--- a/tck-dist/pom.xml
+++ b/tck-dist/pom.xml
@@ -66,7 +66,6 @@
             <properties>
                 <license>EFTL</license>
                 <bundle-name>jakarta-jsonb-tck</bundle-name>
-                <assembly-descriptor>src/main/assembly/assembly-eftl.xml</assembly-descriptor>
             </properties>
         </profile>
         <profile>
@@ -74,7 +73,6 @@
             <properties>
                 <license>EPL</license>
                 <bundle-name>jsonb-tck</bundle-name>
-                <assembly-descriptor>src/main/assembly/assembly.xml</assembly-descriptor>
             </properties>
             <activation>
                 <activeByDefault>true</activeByDefault>
@@ -97,7 +95,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>${assembly-descriptor}</descriptor>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
                             </descriptors>
                             <escapeString>\</escapeString>
                             <appendAssemblyId>false</appendAssemblyId>
diff --git a/tck-dist/src/main/assembly/assembly-eftl.xml b/tck-dist/src/main/assembly/assembly-eftl.xml
deleted file mode 100644
index 7471767c..00000000
--- a/tck-dist/src/main/assembly/assembly-eftl.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?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>jsonb-tck</baseDirectory>
-    <formats>
-        <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>
-            <directory>${project.build.scriptSourceDirectory}</directory>
-            <outputDirectory>artifacts</outputDirectory>
-            <fileMode>755</fileMode>
-            <includes>
-                <include>**/*.sh</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>${project.basedir}/src/main/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>**/*.xml</include>
-            </includes>
-            <filtered>true</filtered>
-        </fileSet>
-    </fileSets>
-    <dependencySets>
-        <dependencySet>
-            <includes>
-                <include>jakarta.json.bind:jakarta.json.bind-tck</include>
-            </includes>
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-            <outputDirectory>artifacts</outputDirectory>
-            <useProjectArtifact>false</useProjectArtifact>
-        </dependencySet>
-        <dependencySet>
-            <includes>
-                <include>jakarta.json.bind:jakarta.json.bind-tck-ug</include>
-            </includes>
-            <unpack>true</unpack>
-            <outputDirectory>.</outputDirectory>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml
index eaefc700..7471767c 100644
--- a/tck-dist/src/main/assembly/assembly.xml
+++ b/tck-dist/src/main/assembly/assembly.xml
@@ -41,6 +41,14 @@
                 <include>**/*.sh</include>
             </includes>
         </fileSet>
+        <fileSet>
+            <directory>${project.basedir}/src/main/bin</directory>
+            <outputDirectory>bin</outputDirectory>
+            <includes>
+                <include>**/*.xml</include>
+            </includes>
+            <filtered>true</filtered>
+        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>