diff --git a/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc b/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc
index 442d808e2..3c1b3efe8 100644
--- a/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc
+++ b/tck-dist/src/main/asciidoc/data-tck-reference-guide.adoc
@@ -14,7 +14,7 @@
 :APIGitSite: https://github.com/jakartaee/data
 
 :TCKTestPlatform: JUnit5
-:SigPluginGAV: org.netbeans.tools:sigtest-maven-plugin:1.6
+:SigPluginGAV: jakarta.tck:sigtest-maven-plugin:2.2
 
 :JavaVersion1: 17
 :JavaVersion2: 21
diff --git a/tck-dist/src/main/asciidoc/sections/04prereq.adoc b/tck-dist/src/main/asciidoc/sections/04prereq.adoc
index d8be97c92..4deba4f24 100644
--- a/tck-dist/src/main/asciidoc/sections/04prereq.adoc
+++ b/tck-dist/src/main/asciidoc/sections/04prereq.adoc
@@ -13,7 +13,7 @@ Knowledge of how these frameworks operate and interact will help during the proj
 
 1. **Arquillian** - Version 1.7.0.Alpha13 or later - The {APILongName} TCK can run in EE Mode and it uses Arquillian to execute tests within an Arquillian "container" for certifying against an EE Platform. You must configure an https://arquillian.org/guides/developing_a_container_adapter/[Arquillian adapter] for your target runtime.
 2. **JUnit5** - Version 5.9.0 or later - The {APILongName} TCK uses JUnit5 as the entry-point for tests and deployments using Arquillian.
-3. **Signature Test Plugin** - Version 1.6 exactly -  The {APILongName} TCK uses the Signature Test Plugin to verify API signatures used by an implementation and those release by the specification match. 
+3. **Signature Test Plugin** - Version 2.2 exactly -  The {APILongName} TCK uses the Signature Test Plugin to verify API signatures used by an implementation and those release by the specification match.
 +
 No action is needed here, but we note that the signature files were built and should be validated with the plugin with group:artifact:version coordinates: **{SigPluginGAV}**, as used by the sample runner included in the TCK zip. 
 This is a more specific direction than in earlier releases of the platform TCK, in which it was left more open for the user to use a compatible tool.
diff --git a/tck-dist/src/main/starter/ee-pom.xml b/tck-dist/src/main/starter/ee-pom.xml
index f17c4f06f..7a3723c0a 100644
--- a/tck-dist/src/main/starter/ee-pom.xml
+++ b/tck-dist/src/main/starter/ee-pom.xml
@@ -37,7 +37,7 @@
 
   <arquillian.version>1.7.0.Alpha13</arquillian.version>
   <junit.version>5.9.0</junit.version>
-  <sigtest.version>1.6</sigtest.version>
+  <sigtest.version>2.2</sigtest.version>
 
   <maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
   <maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>
@@ -108,7 +108,7 @@
   </dependency>
   <!-- Signature Test Plugin -->
   <dependency>
-   <groupId>org.netbeans.tools</groupId>
+   <groupId>jakarta.tck</groupId>
    <artifactId>sigtest-maven-plugin</artifactId>
    <version>${sigtest.version}</version>
   </dependency>
diff --git a/tck-dist/src/main/starter/se-pom.xml b/tck-dist/src/main/starter/se-pom.xml
index fe232a873..64c68357a 100644
--- a/tck-dist/src/main/starter/se-pom.xml
+++ b/tck-dist/src/main/starter/se-pom.xml
@@ -37,7 +37,7 @@
 
   <arquillian.version>1.7.0.Alpha13</arquillian.version>
   <junit.version>5.9.0</junit.version>
-  <sigtest.version>1.6</sigtest.version>
+  <sigtest.version>2.2</sigtest.version>
 
   <maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
   <maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>
@@ -93,7 +93,7 @@
   </dependency>
   <!-- Signature Test Plugin -->
   <dependency>
-   <groupId>org.netbeans.tools</groupId>
+   <groupId>jakarta.tck</groupId>
    <artifactId>sigtest-maven-plugin</artifactId>
    <version>${sigtest.version}</version>
   </dependency>
diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/README.md b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/README.md
index dabefe2b7..08dddcbde 100644
--- a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/README.md
+++ b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/README.md
@@ -4,7 +4,7 @@ This package is inherited from the Platform-TCK (https://github.com/eclipse-ee4j
 
 The latest signature files are updated in the Jakarta Data TCK Repository 
 (data/tck/src/main/resources/ee/jakarta/tck/data/framework/signature) 
-generated using sigtest-maven-plugin.jar (version 1.6).
+generated using sigtest-maven-plugin.jar (version 2.2).
 
 The signature tests are run using the sigtest-maven-plugin.jar and the framework available in this folder.
 
@@ -20,7 +20,7 @@ The plugin that generates the signature file has been copied below for reference
 ```xml
   <!-- Run signature plugin to generate signature file -->
   <plugin>
-    <groupId>org.netbeans.tools</groupId>
+    <groupId>jakarta.tck</groupId>
     <artifactId>sigtest-maven-plugin</artifactId>
     <version>${sigtest.version}</version>
     <executions>