diff --git a/.github/ISSUE_TEMPLATE/certification.yml b/.github/ISSUE_TEMPLATE/certification.yml
index 51469999..2c0a37bd 100644
--- a/.github/ISSUE_TEMPLATE/certification.yml
+++ b/.github/ISSUE_TEMPLATE/certification.yml
@@ -45,7 +45,7 @@ body:
       description: |
         SHA-256 Checksum
         This is the checksum of the TCK Distribution zip, not the checksum for the TCK jar artifact.
-        Example: `shasum -a 256 jakarta.enterprise.concurrent-tck-dist-3.1.0-dist.zip`
+        Example: `shasum -a 256 jakarta.concurrent-tck-dist-3.1.0-dist.zip`
   - type: textarea
     id: tckResults
     validations:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cc3171ec..f9d9bbb8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,21 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build project
-      run: mvn -B package --file pom.xml
+      run: mvn -B install --file pom.xml
+
+  relocate:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - name: Set up JDK 21
+      uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+      with:
+        java-version: 21
+        distribution: 'temurin'
+        cache: maven
+    - name: Build relocation
+      run: mvn -B package --file relocation/pom.xml
+
   verify:
     runs-on: ubuntu-latest
     steps:
@@ -49,4 +63,4 @@ jobs:
     - name: Analyze starters
       # Note: the starter is always 1 version ahead of what is in maven central
       # therefore, when we analyze the starters we need to force a prior version
-      run: mvn dependency:analyze -Djakarta.concurrent.version=3.1.1 --file tck-dist/src/main/starter/pom.xml
+      run: mvn dependency:analyze -Djakarta.concurrent.groupid=jakarta.enterprise.concurrent -Djakarta.concurrent.version=3.1.1 --file tck-dist/src/main/starter/pom.xml
diff --git a/.github/workflows/specification.yml b/.github/workflows/specification.yml
index f71c06b6..60966ab9 100644
--- a/.github/workflows/specification.yml
+++ b/.github/workflows/specification.yml
@@ -24,10 +24,9 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Generate specification docs
-      #TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
       run: |
-        mvn package -Pstaging --file api/pom.xml -Dspec.version=${{ github.event.inputs.specVersion }}
-        mvn package -Pstaging --file specification/pom.xml -Dstatus=FINAL -Dspec.version=${{ github.event.inputs.specVersion }}
+        mvn package --file api/pom.xml -Dspec.version=${{ github.event.inputs.specVersion }}
+        mvn package --file specification/pom.xml -Dstatus=FINAL -Dspec.version=${{ github.event.inputs.specVersion }}
     - name: Assemble documentation
       run: |
         mkdir documentation/
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index a66f9856..36673891 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -27,10 +27,9 @@ jobs:
       id: checkout
       run: .github/scripts/checkout.sh update-generated-files-${{ github.sha }}
     - name: Generate signatures
-      #TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
       run: |
-        mvn install -Pstaging --file api/pom.xml
-        mvn package -Pstaging -Psignature-generation --file tck/pom.xml
+        mvn install --file api/pom.xml
+        mvn package -Psignature-generation --file tck/pom.xml
     ## Add any other automated update steps here
     - name: Needs updates
       id: update
diff --git a/api/pom.xml b/api/pom.xml
index 0c8302f0..07cca1d4 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -21,18 +21,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jakarta.enterprise.concurrent-api</artifactId>
-
+    <artifactId>jakarta.concurrent-api</artifactId>
     <name>Jakarta Concurrency</name>
     <description>
         Jakarta Concurrency provides a specification for using concurrency from application 
         components without compromising container integrity while still preserving the Jakarta EE 
-        platform’s fundamental benefits.
+        platform's fundamental benefits.
     </description>
     <url>https://github.com/jakartaee/concurrency</url>
 
diff --git a/pom.xml b/pom.xml
index 7cae6ab9..77e38a28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,8 +23,8 @@
         <version>1.0.9</version>
     </parent>
 
-    <groupId>jakarta.enterprise.concurrent</groupId>
-    <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+    <groupId>jakarta.concurrent</groupId>
+    <artifactId>jakarta.concurrent.parent</artifactId>
     <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
diff --git a/relocation/api/pom.xml b/relocation/api/pom.xml
new file mode 100644
index 00000000..a725d381
--- /dev/null
+++ b/relocation/api/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
+ 
+    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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>jakarta.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+    <packaging>pom</packaging>
+    
+    <name>Jakarta Concurrency</name>
+    <description>
+        Jakarta Concurrency provides a specification for using concurrency from application 
+        components without compromising container integrity while still preserving the Jakarta EE 
+        platform's fundamental benefits.
+    </description>
+
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.concurrent</groupId>
+          <artifactId>jakarta.concurrent-api</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocation/pom.xml b/relocation/pom.xml
new file mode 100644
index 00000000..60ddda74
--- /dev/null
+++ b/relocation/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
+ 
+    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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.9</version>
+        <relativePath />
+    </parent>
+
+    <groupId>jakarta.enterprise.concurrent</groupId>
+    <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+    <version>3.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Jakarta Concurrency</name>
+    <description>Jakarta Concurrency Parent</description>
+
+    <licenses>
+        <license>
+            <name>EPL 2.0</name>
+            <url>http://www.eclipse.org/legal/epl-2.0</url>
+            <distribution>repo</distribution>
+        </license>
+        <license>
+            <name>GPL2 w/ CPE</name>
+            <url>https://www.gnu.org/software/classpath/license.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.concurrent</groupId>
+          <artifactId>jakarta.concurrent.parent</artifactId>
+        </relocation>
+    </distributionManagement>
+
+    <modules>
+        <module>api</module>
+        <module>specification</module>
+        <module>tck</module>
+        <module>tck-dist</module>
+    </modules>
+
+</project>
\ No newline at end of file
diff --git a/relocation/specification/pom.xml b/relocation/specification/pom.xml
new file mode 100644
index 00000000..9ea4637a
--- /dev/null
+++ b/relocation/specification/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
+ 
+    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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>jakarta.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>concurrency-spec</artifactId>
+    <packaging>pom</packaging>
+    
+    <name>Jakarta Concurrency Specification</name>
+
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.concurrent</groupId>
+          <artifactId>jakarta.concurrent-spec</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocation/tck-dist/pom.xml b/relocation/tck-dist/pom.xml
new file mode 100644
index 00000000..b4a41ff1
--- /dev/null
+++ b/relocation/tck-dist/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
+ 
+    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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>jakarta.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Jakarta Concurrency TCK Distribution</name>
+    <description>Jakarta Concurrency TCK Distribution</description>
+
+    <distributionManagement>
+        <relocation>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent-tck-dist</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/relocation/tck/pom.xml b/relocation/tck/pom.xml
new file mode 100644
index 00000000..693b44a0
--- /dev/null
+++ b/relocation/tck/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 
+    Copyright (c) 2024 Contributors to the Eclipse Foundation
+ 
+    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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>jakarta.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jakarta.concurrent-tck</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Jakarta Concurrency TCK</name>
+    <description>Jakarta Concurrency TCK Tests</description>
+
+    <distributionManagement>
+        <relocation>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent-tck</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>
\ No newline at end of file
diff --git a/specification/pom.xml b/specification/pom.xml
index c48b7a1e..37a00132 100644
--- a/specification/pom.xml
+++ b/specification/pom.xml
@@ -20,16 +20,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>concurrency-spec</artifactId>
+    <artifactId>jakarta.concurrent-spec</artifactId>
     <packaging>pom</packaging>
-
     <name>Jakarta Concurrency Specification</name>
 
+    <distributionManagement>
+        <site>
+            <url>scm:git:git@github.com:jakartaee/jakarta-concurrency.git</url>
+        </site>
+    </distributionManagement>
+
     <scm>
         <connection>scm:git:git@github.com:eclipse-ee4j/jakarta-concurrency.git</connection>
         <developerConnection>scm:git:git@github.com:eclipse-ee4j/jakarta-concurrency.git</developerConnection>
@@ -37,12 +42,6 @@
         <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-        <site>
-            <url>scm:git:git@github.com:eclipse-ee4j/jakarta-concurrency.git</url>
-        </site>
-    </distributionManagement>
-
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
 
diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml
index fb60ae63..266b8c15 100644
--- a/tck-dist/pom.xml
+++ b/tck-dist/pom.xml
@@ -20,12 +20,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
+    <artifactId>jakarta.concurrent-tck-dist</artifactId>
     <name>Jakarta Concurrency TCK Distribution</name>
     <description>Jakarta Concurrency TCK Distribution</description>
 
@@ -45,19 +45,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent.parent</artifactId>
             <version>${jakarta.concurrent.version}</version>
             <type>pom</type>
         </dependency>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-api</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-tck</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
     </dependencies>
@@ -95,7 +95,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>jakarta.enterprise.concurrent-tck</includeArtifactIds>
+                            <includeArtifactIds>jakarta.concurrent-tck</includeArtifactIds>
                             <classifier>sources</classifier>
                             <prependGroupId>true</prependGroupId>
                             <outputDirectory>${project.build.directory}/copied-sources/</outputDirectory>
@@ -123,7 +123,7 @@
                     <arguments>
                         <argument>false</argument> <!-- debug? -->
                         <argument>
-                            ${jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-tck:jar}</argument>
+                            ${jakarta.concurrent:jakarta.concurrent-tck:jar}</argument>
                         <argument>
                             ${project.basedir}/src/main/asciidoc/generated</argument>
                     </arguments>
diff --git a/tck-dist/src/main/artifacts/artifact-install.sh b/tck-dist/src/main/artifacts/artifact-install.sh
index 6d8e06fc..3e1657d8 100755
--- a/tck-dist/src/main/artifacts/artifact-install.sh
+++ b/tck-dist/src/main/artifacts/artifact-install.sh
@@ -5,15 +5,15 @@
 POM=$(ls *.pom)
 TCK=$(ls *.jar | grep -v sources)
 
-NO_EXT=${POM%.*}      # jakarta.enterprise.concurrent-parent-3.1.0-SNAPSHOT.pom > jakarta.enterprise.concurrent-parent-3.1.0-SNAPSHOT
-NO_REPO=${NO_EXT#*-}  # jakarta.enterprise.concurrent-parent-3.1.0-SNAPSHOT > parent-3.1.0-SNAPSHOT
+NO_EXT=${POM%.*}      # jakarta.concurrent-parent-3.1.0-SNAPSHOT.pom > jakarta.concurrent-parent-3.1.0-SNAPSHOT
+NO_REPO=${NO_EXT#*-}  # jakarta.concurrent-parent-3.1.0-SNAPSHOT > parent-3.1.0-SNAPSHOT
 VERSION=${NO_REPO#*-} # parent-3.1.0-SNAPSHOT > 3.1.0-SNAPSHOT
 
 echo "Installing $POM with version $VERSION"
 mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
 -Dfile=$POM \
--DgroupId=jakarta.enterprise.concurrent \
--DartifactId=jakarta.enterprise.concurrent.parent \
+-DgroupId=jakarta.concurrent \
+-DartifactId=jakarta.concurrent.parent \
 -Dversion=$VERSION \
 -Dpackaging=pom
 
diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml
index 94aaf36c..1f93d8f0 100644
--- a/tck-dist/src/main/assembly/assembly.xml
+++ b/tck-dist/src/main/assembly/assembly.xml
@@ -42,10 +42,10 @@
             <destName>README.md</destName>
         </file>
 
-        <!-- The jakarta.enterprise.concurrent-parent pom file -->
+        <!-- The jakarta.concurrent-parent pom file -->
         <file>
             <source>../pom.xml</source>
-            <destName>artifacts/jakarta.enterprise.concurrent-parent-${project.version}.pom</destName>
+            <destName>artifacts/jakarta.concurrent-parent-${project.version}.pom</destName>
         </file>
 
     </files>
@@ -99,7 +99,7 @@
     <dependencySets>
         <dependencySet>
             <includes>
-                <include>jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-tck</include>
+                <include>jakarta.concurrent:jakarta.concurrent-tck</include>
             </includes>
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <outputDirectory>artifacts</outputDirectory>
diff --git a/tck-dist/src/main/starter/pom.xml b/tck-dist/src/main/starter/pom.xml
index 3b7e0ebb..eba99c47 100644
--- a/tck-dist/src/main/starter/pom.xml
+++ b/tck-dist/src/main/starter/pom.xml
@@ -22,7 +22,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>jakarta.enterprise.concurrent</groupId>
+    <groupId>jakarta.concurrent</groupId>
     <artifactId>concurrency.tck.runner</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>Jakarta Concurrency TCK Runner</name>
@@ -34,6 +34,7 @@
         <maven.compiler.target>21</maven.compiler.target>
 
         <!-- Dependency and Plugin Versions -->
+        <jakarta.concurrent.groupid>jakarta.concurrent</jakarta.concurrent.groupid>
         <jakarta.concurrent.version>3.2.0</jakarta.concurrent.version>
         <jakarta.servlet.version>6.1.0</jakarta.servlet.version>
 
@@ -112,14 +113,14 @@
     <dependencies>
         <!-- The TCK -->
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+            <groupId>${jakarta.concurrent.groupid}</groupId>
+            <artifactId>${jakarta.concurrent.groupid}-tck</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
         <!-- The API -->
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <groupId>${jakarta.concurrent.groupid}</groupId>
+            <artifactId>${jakarta.concurrent.groupid}-api</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
         <!-- Arquillian Implementation for JUnit5 -->
diff --git a/tck/pom.xml b/tck/pom.xml
index c5f898f0..0d219b13 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -23,12 +23,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+    <artifactId>jakarta.concurrent-tck</artifactId>
     <packaging>jar</packaging>
 
     <name>Jakarta Concurrency TCK</name>
@@ -48,8 +48,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-api</artifactId>
             <version>${jakarta.concurrent.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -216,8 +216,8 @@
                                 <configuration>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>jakarta.enterprise.concurrent</groupId>
-                                            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+                                            <groupId>jakarta.concurrent</groupId>
+                                            <artifactId>jakarta.concurrent-api</artifactId>
                                             <version>${jakarta.concurrent.api.version}</version>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>