diff --git a/core-profile-tck/ca-sigtest/pom.xml b/core-profile-tck/ca-sigtest/pom.xml
index cb49223177..6b4ebd8cf5 100644
--- a/core-profile-tck/ca-sigtest/pom.xml
+++ b/core-profile-tck/ca-sigtest/pom.xml
@@ -99,7 +99,7 @@
                         </executions>
                     </plugin>
                     <plugin>
-                        <groupId>org.netbeans.tools</groupId>
+                        <groupId>jakarta.tck</groupId>
                         <artifactId>sigtest-maven-plugin</artifactId>
                         <configuration>
                             <classes>${project.build.directory}/ca-api</classes>
diff --git a/el-tck/docs/userguide/src/main/jbake/content/config.inc b/el-tck/docs/userguide/src/main/jbake/content/config.inc
index cee2e94d17..f9a22fd2a5 100644
--- a/el-tck/docs/userguide/src/main/jbake/content/config.inc
+++ b/el-tck/docs/userguide/src/main/jbake/content/config.inc
@@ -98,9 +98,9 @@ slashes as a path separator instead.
 [source,oac_no_warn]
 ----
       <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.4</version>
+            <version>2.2</version>
         </dependency>
 ----
 +
diff --git a/el-tck/docs/userguide/src/main/jbake/content/using-examples.inc b/el-tck/docs/userguide/src/main/jbake/content/using-examples.inc
index 90593c4db5..d587183e67 100644
--- a/el-tck/docs/userguide/src/main/jbake/content/using-examples.inc
+++ b/el-tck/docs/userguide/src/main/jbake/content/using-examples.inc
@@ -22,9 +22,9 @@ sigtest-maven-plugin in the TCK runner as below.
 
 =======================================================================
 <plugin>
-    <groupId>org.netbeans.tools</groupId>
+    <groupId>jakarta.tck</groupId>
     <artifactId>sigtest-maven-plugin</artifactId>
-    <version>1.5</version>
+    <version>2.2</version>
     <configuration>
         <sigfile>path-to-sig-file-provided-with-TCK</sigfile>
         <packages>jakarta.el</packages>
diff --git a/glassfish-runner/annotations-tck/pom.xml b/glassfish-runner/annotations-tck/pom.xml
index b690d1663e..d694f3a6c8 100644
--- a/glassfish-runner/annotations-tck/pom.xml
+++ b/glassfish-runner/annotations-tck/pom.xml
@@ -60,9 +60,8 @@
             <version>${tck.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.7</version>
         </dependency>
     </dependencies>
 
@@ -123,9 +122,9 @@
             </plugin>
 
             <!-- <plugin>
-                <groupId>org.netbeans.tools</groupId>
+                <groupId>jakarta.tck</groupId>
                 <artifactId>sigtest-maven-plugin</artifactId>
-                <version>1.5</version>
+                <version>2.2</version>
                 <configuration>
                     <sigfile>target/annotations-tck/jakarta.annotation.sig</sigfile>
                     <packages>jakarta.annotation,jakarta.annotation.security,jakarta.annotation.sql,akarta.annotation.Generated,jakarta.annotation.ManagedBean,jakarta.annotation.PostConstruct,jakarta.annotation.PreDestroy,jakarta.annotation.Priority,jakarta.annotation.Resource,jakarta.annotation.Resource$AuthenticationType,jakarta.annotation.Resources,jakarta.annotation.security.DeclareRoles,jakarta.annotation.security.DenyAll,jakarta.annotation.security.PermitAll,jakarta.annotation.security.RolesAllowed,jakarta.annotation.security.RunAs,jakarta.annotation.sql.DataSourceDefinition,jakarta.annotation.sql.DataSourceDefinitions</packages>
diff --git a/glassfish-runner/batch-tck/sigtests/pom.xml b/glassfish-runner/batch-tck/sigtests/pom.xml
index e97b26454f..bd2e396e71 100644
--- a/glassfish-runner/batch-tck/sigtests/pom.xml
+++ b/glassfish-runner/batch-tck/sigtests/pom.xml
@@ -103,9 +103,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.netbeans.tools</groupId>
+                <groupId>jakarta.tck</groupId>
                 <artifactId>sigtest-maven-plugin</artifactId>
-                <version>1.6</version>
                 <configuration>
                     <action>strictcheck</action>
                     <failOnError>true</failOnError>
@@ -134,7 +133,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.netbeans.tools</groupId>
+                        <groupId>jakarta.tck</groupId>
                         <artifactId>sigtest-maven-plugin</artifactId>
                         <configuration>
                             <sigfile>${project.build.directory}/sigtest-copy/sigtest/sigtest-1.6-batch.standalone.tck.sig-2.1-se11-OpenJDK-J9</sigfile>
@@ -152,7 +151,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.netbeans.tools</groupId>
+                        <groupId>jakarta.tck</groupId>
                         <artifactId>sigtest-maven-plugin</artifactId>
                         <configuration>
                             <sigfile>${project.build.directory}/sigtest-copy/sigtest/sigtest-1.6-batch.standalone.tck.sig-2.1-se17-TemurinHotSpot</sigfile>
diff --git a/glassfish-runner/concurrency-tck/pom.xml b/glassfish-runner/concurrency-tck/pom.xml
index bf5f588578..14fed0fc0b 100644
--- a/glassfish-runner/concurrency-tck/pom.xml
+++ b/glassfish-runner/concurrency-tck/pom.xml
@@ -100,9 +100,8 @@
 
         <!--  Signature Test Plugin  -->
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.7</version>
         </dependency>
     </dependencies>
 
diff --git a/glassfish-runner/jsonb-tck/pom.xml b/glassfish-runner/jsonb-tck/pom.xml
index 67768e5cf0..233c9726c4 100644
--- a/glassfish-runner/jsonb-tck/pom.xml
+++ b/glassfish-runner/jsonb-tck/pom.xml
@@ -31,9 +31,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
diff --git a/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml b/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml
index 3b239892e3..a967b1370b 100644
--- a/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml
+++ b/glassfish-runner/jsonp-tck/json-tck-tests-pluggability/pom.xml
@@ -33,9 +33,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.6</version>
         </dependency>
     </dependencies>
 
diff --git a/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml b/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml
index e658855e69..f820b0ce36 100644
--- a/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml
+++ b/glassfish-runner/jsonp-tck/json-tck-tests/pom.xml
@@ -51,9 +51,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.6</version>
         </dependency>
     </dependencies>
 
diff --git a/glassfish-runner/rest-tck/pom.xml b/glassfish-runner/rest-tck/pom.xml
index 7d5198feab..29ba50ec52 100644
--- a/glassfish-runner/rest-tck/pom.xml
+++ b/glassfish-runner/rest-tck/pom.xml
@@ -116,9 +116,8 @@ mvn clean install -Dgroups=security
         </dependency>
 
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.7</version>
         </dependency>
 
         <dependency>
diff --git a/glassfish-runner/websocket-platform-tck/pom.xml b/glassfish-runner/websocket-platform-tck/pom.xml
index 94108bd7f1..881bb0a1c9 100644
--- a/glassfish-runner/websocket-platform-tck/pom.xml
+++ b/glassfish-runner/websocket-platform-tck/pom.xml
@@ -113,9 +113,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.7</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/glassfish-runner/websocket-tck/websocket-tck-run/pom.xml b/glassfish-runner/websocket-tck/websocket-tck-run/pom.xml
index 1ce152df97..bc54962662 100644
--- a/glassfish-runner/websocket-tck/websocket-tck-run/pom.xml
+++ b/glassfish-runner/websocket-tck/websocket-tck-run/pom.xml
@@ -100,9 +100,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.7</version>
         </dependency>
 
         <dependency>
diff --git a/jpa-tck/pom.xml b/jpa-tck/pom.xml
index cbb90b9eff..f5cd8f7608 100644
--- a/jpa-tck/pom.xml
+++ b/jpa-tck/pom.xml
@@ -81,9 +81,9 @@
             <version>4.0.0</version>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.7</version>
+            <version>2.2</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/jpa/pom.xml b/jpa/pom.xml
index 2f172dfbcc..7635267283 100644
--- a/jpa/pom.xml
+++ b/jpa/pom.xml
@@ -82,9 +82,8 @@
             <version>4.0.0</version>
         </dependency>
         <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.7</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
index 48bf5b8a0f..9136816a37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -552,6 +552,11 @@
                 <artifactId>jboss-rmi-api_1.0_spec</artifactId>
                 <version>1.0.6.Final</version>
             </dependency>
+            <dependency>
+                <groupId>jakarta.tck</groupId>
+                <artifactId>sigtest-maven-plugin</artifactId>
+                <version>2.2</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>
@@ -622,9 +627,9 @@
                     </configuration>
                 </plugin>
                 <plugin>
-                    <groupId>org.netbeans.tools</groupId>
+                    <groupId>jakarta.tck</groupId>
                     <artifactId>sigtest-maven-plugin</artifactId>
-                    <version>1.5</version>
+                    <version>2.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
diff --git a/websocket/docs/userguide/src/main/jbake/content/config.inc b/websocket/docs/userguide/src/main/jbake/content/config.inc
index a93a3e156f..3da8a29cf8 100644
--- a/websocket/docs/userguide/src/main/jbake/content/config.inc
+++ b/websocket/docs/userguide/src/main/jbake/content/config.inc
@@ -112,9 +112,9 @@ slashes as a path separator instead.
 [source,oac_no_warn]
 ----
       <dependency>
-            <groupId>org.netbeans.tools</groupId>
+            <groupId>jakarta.tck</groupId>
             <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.4</version>
+            <version>2.2</version>
         </dependency>
 ----
 +