diff --git a/.github/workflows/concurrency-tck.yml b/.github/workflows/concurrency-tck.yml
index 5c0d514..ac202a7 100644
--- a/.github/workflows/concurrency-tck.yml
+++ b/.github/workflows/concurrency-tck.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        java: ['11', '17']
+        java: ['11', '17', '21']
 
     steps:
       - uses: actions/checkout@v4
@@ -66,5 +66,5 @@ jobs:
         if: failure()
         with:
           name: surefire-reports-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.wildfly-version }}
-          path: '**/surefire-reports/*.txt'
+          path: '**/surefire-reports/'
 
diff --git a/concurrency/concurrency-tck-runner/pom.xml b/concurrency/concurrency-tck-runner/pom.xml
index 664423f..a972c39 100644
--- a/concurrency/concurrency-tck-runner/pom.xml
+++ b/concurrency/concurrency-tck-runner/pom.xml
@@ -42,7 +42,7 @@
         <testng.version>6.14.3</testng.version>
         <jcommander.version>1.72</jcommander.version>
         <bsh.version>2.0b6</bsh.version>
-        <sigtest.version>1.6</sigtest.version>
+        <sigtest.version>2.3</sigtest.version>
         <derby.version>10.15.2.0</derby.version>
         <maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
         <!-- Location to put test application dependencies -->
@@ -166,7 +166,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>
@@ -303,7 +303,7 @@
                                     <destFileName>bsh.jar</destFileName>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.netbeans.tools</groupId>
+                                    <groupId>jakarta.tck</groupId>
                                     <artifactId>sigtest-maven-plugin</artifactId>
                                     <version>${sigtest.version}</version>
                                     <overWrite>true</overWrite>
diff --git a/concurrency/concurrency-tck-setup/pom.xml b/concurrency/concurrency-tck-setup/pom.xml
index af2bd34..2df5ece 100644
--- a/concurrency/concurrency-tck-setup/pom.xml
+++ b/concurrency/concurrency-tck-setup/pom.xml
@@ -16,7 +16,7 @@
     </description>
     <properties>
         <tck.url>https://download.eclipse.org/jakartaee/concurrency/3.0/concurrency-tck-${jakarta.concurrent.tck.version}.zip</tck.url>
-        <tck.sha256>dd1b4659b5368447bacc2ea0134472fbd4bb3400c9883cfb98ab841378b4f9ca</tck.sha256>
+        <tck.sha256>aa29bfc0bab42d9aa2da518208d9e92cdde80fc17b00dd658954dfd36064a426</tck.sha256>
         <tck.artifact.prefix>jakarta.enterprise.concurrent-tck-${jakarta.concurrent.tck.version}</tck.artifact.prefix>
         <tck.artifact.directory>${project.build.directory}/concurrency-tck-${jakarta.concurrent.tck.version}/artifacts</tck.artifact.directory>
     </properties>
diff --git a/concurrency/pom.xml b/concurrency/pom.xml
index 8aed1c7..1f55e18 100644
--- a/concurrency/pom.xml
+++ b/concurrency/pom.xml
@@ -44,7 +44,7 @@
         <!-- Properties for the TCK -->
         <!-- Dependency versions -->
         <jakarta.concurrent.version>3.0.0</jakarta.concurrent.version>
-        <jakarta.concurrent.tck.version>3.0.3</jakarta.concurrent.tck.version>
+        <jakarta.concurrent.tck.version>3.0.4</jakarta.concurrent.tck.version>
 
         <maven.repo.local>${settings.localRepository}</maven.repo.local>
     </properties>