diff --git a/pom.xml b/pom.xml
index 4c5ceb095..58c22df08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
         <checkstyle.version>10.15.0</checkstyle.version>
         <checkstyle.excludes></checkstyle.excludes>
         <jacoco.maven.version>0.8.12</jacoco.maven.version>
-        <sigtest.version>1.6</sigtest.version> <!-- TODO update to 1.8 once this fix is added https://github.com/jtulach/netbeans-apitest/commit/72a3d3507202357589d77b293cb1e29349a0096e -->
+        <sigtest.version>2.2</sigtest.version> <!-- TODO update to 1.8 once this fix is added https://github.com/jtulach/netbeans-apitest/commit/72a3d3507202357589d77b293cb1e29349a0096e -->
         <sonar.jacoco.reportPath>../target/jacoco.exec</sonar.jacoco.reportPath>
         <sonar.maven.version>3.11.0.3922</sonar.maven.version>
     </properties>
diff --git a/tck/pom.xml b/tck/pom.xml
index 4258784f8..73f931482 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -128,7 +128,7 @@
     
     <!-- Test Dependencies -->
     <dependency>
-      <groupId>org.netbeans.tools</groupId>
+      <groupId>jakarta.tck</groupId>
       <artifactId>sigtest-maven-plugin</artifactId>
       <version>${sigtest.version}</version>
     </dependency>
@@ -289,7 +289,7 @@
           
           <!-- 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>
diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java b/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java
index 6cb5a2abf..f7516e671 100644
--- a/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java
+++ b/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java
@@ -92,7 +92,7 @@ private static void appendSignaturePackages(final Archive<?> applicationArchive,
             ((ClassContainer<?>) applicationArchive).addPackage(signaturePackage);
 
             // Add the sigtest plugin library
-            File sigTestDep = Maven.resolver().resolve("org.netbeans.tools:sigtest-maven-plugin:1.6").withoutTransitivity().asSingleFile();
+            File sigTestDep = Maven.resolver().resolve("jakarta.tck:sigtest-maven-plugin:2.2").withoutTransitivity().asSingleFile();
             log.info("Application Archive [" + applicationName + "] is being appended with library " + sigTestDep.getName());
             ((LibraryContainer<?>) applicationArchive).addAsLibrary(sigTestDep);
             
diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/DataSignatureTestRunner.java b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/DataSignatureTestRunner.java
index e9a6984e5..93c93b09a 100644
--- a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/DataSignatureTestRunner.java
+++ b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/DataSignatureTestRunner.java
@@ -229,8 +229,17 @@ public void signatureTest() throws Fault {
 
 //            mapFileAsProps = getSigTestDriver().loadMapFile(mapFile);
 
+            // First try to find the signature file that matches the current JDK version
+            String javaVersion = System.getProperty("java.specification.version");
+            String sigRsrc = SIG_RESOURCE_PACKAGE.replace(".", "/") + "/" + SIG_FILE_NAME;
+            sigRsrc += "_" + javaVersion;
             InputStream inStreamSigFile = DataSignatureTestRunner.class.getClassLoader()
-                    .getResourceAsStream(SIG_RESOURCE_PACKAGE.replace(".", "/") + "/" + SIG_FILE_NAME);
+                    .getResourceAsStream(sigRsrc);
+            if (inStreamSigFile == null) {
+                // If we can't find a signature file for the current JDK version, use the plain name
+                inStreamSigFile = DataSignatureTestRunner.class.getClassLoader()
+                        .getResourceAsStream(SIG_RESOURCE_PACKAGE.replace(".", "/") + "/" + SIG_FILE_NAME);
+            }
             File sigFile = writeStreamToSigFile(inStreamSigFile);
             log.info("signature File location is :" + sigFile.getCanonicalPath());
             signatureRepositoryDir = System.getProperty("java.io.tmpdir");
diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/SigTestDriver.java b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/SigTestDriver.java
index 2e3f1d361..6374ec020 100644
--- a/tck/src/main/java/ee/jakarta/tck/data/framework/signature/SigTestDriver.java
+++ b/tck/src/main/java/ee/jakarta/tck/data/framework/signature/SigTestDriver.java
@@ -100,6 +100,7 @@ protected String[] createTestArguments(String packageListFile, String mapFile, S
             command.add(SMODE_FLAG);
             // command.add("bin");
             command.add("src");
+            command.add("-BootCp");
         } else {
             System.out.println("Not Setting static mode flag to allow constant checking.");
         }