diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0882ab52..ea4596f8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - jakarta
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'
@@ -80,12 +79,24 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
+          java-version: 11
+          cache: 'maven'
+          cache-dependency-path: '**/pom.xml'
+
+      - name: build with docs and coverage
+        run: mvn verify -Pcoverage javadoc:javadoc
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
           java-version: 17
 
       - name: sonar
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
-        run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-jwt -Dsonar.token=$SONAR_TOKEN
+        run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}
diff --git a/pom.xml b/pom.xml
index 50e06d8d..81ca699f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,5 +212,17 @@
         <module>release</module>
       </modules>
     </profile>
+    <profile>
+      <id>sonar</id>
+      <properties>
+        <sonar.projectName>SmallRye JWT</sonar.projectName>
+        <sonar.projectKey>io.smallrye:smallrye-jwt</sonar.projectKey>
+        <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
+        <!--suppress UnresolvedMavenProperty -->
+        <sonar.coverage.jacoco.xmlReportPaths>
+          ${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml
+        </sonar.coverage.jacoco.xmlReportPaths>
+      </properties>
+    </profile>
   </profiles>
 </project>
diff --git a/testsuite/tck/pom.xml b/testsuite/tck/pom.xml
index 29b5528c..0d5d71e7 100644
--- a/testsuite/tck/pom.xml
+++ b/testsuite/tck/pom.xml
@@ -114,9 +114,10 @@
                   <artifactId>microprofile-jwt-auth-tck</artifactId>
                   <version>${version.eclipse.microprofile.jwt}</version>
                   <type>test-jar</type>
+                  <classifier>tests</classifier>
                   <overWrite>false</overWrite>
+                  <includes>**/*.xml</includes>
                   <outputDirectory>${project.build.directory}/tck-suite</outputDirectory>
-                  <includes>**/tck-base-suite.xml</includes>
                 </artifactItem>
               </artifactItems>
             </configuration>
diff --git a/to-jakarta.sh b/to-jakarta.sh
deleted file mode 100644
index 4d4fec40..00000000
--- a/to-jakarta.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# move to jakarta parent
-find . -type f -name 'pom.xml' -exec sed -i 's/smallrye-parent/smallrye-jakarta-parent/g' {} +
-# java sources
-find . -type f -name '*.java' -exec sed -i 's/javax./jakarta./g' {} +
-find . -type f -name '*.java' -exec sed -i 's/jakarta.crypto./javax.crypto./g' {} +
-find . -type f -name '*.java' -exec sed -i 's/jakarta.security.auth./javax.security.auth./g' {} +
-find . -type f -name '*.java' -exec sed -i 's/jakarta.net.ssl./javax.net.ssl./g' {} +
-# service loader files
-find . -path "*/src/main/resources/META-INF/services/javax*" | sed -e 'p;s/javax/jakarta/g' | xargs -n2 git mv
-
-mvn build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.nextMajorVersion}.0.1-SNAPSHOT -Pcoverage
-
-mvn versions:update-property -Dproperty=version.jakarta.servlet.api -DnewVersion=[5.0.0] -N
-mvn versions:update-property -Dproperty=version.jakarta.security.enterprise.api -DnewVersion=[2.0.0] -N
-mvn versions:update-property -Dproperty=version.smallrye.config -DnewVersion=[3.0.0] -N
-mvn versions:update-property -Dproperty=version.eclipse.microprofile.jwt -DnewVersion=[2.0] -N
-mvn versions:update-property -Dproperty=version.microprofile.config -DnewVersion=[3.0] -N
-mvn versions:set-property -Dproperty=artifactId.arquillian.jetty -DnewVersion=arquillian-jetty-embedded-11 -N
-mvn versions:update-property -Dproperty=version.jetty -DnewVersion=[11.0.7] -N
-mvn versions:set-property -Dproperty=version.resteasy -DnewVersion=6.0.0.Final -N
-mvn versions:set-property -Dproperty=groupId.resteasy.client -DnewVersion=org.jboss.resteasy.microprofile -N
-mvn versions:set-property -Dproperty=artifactId.resteasy.client -DnewVersion=microprofile-rest-client -N
-mvn versions:set-property -Dproperty=version.resteasy.client -DnewVersion=2.0.0.Beta1 -N