diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg
deleted file mode 100644
index d2598761..00000000
Binary files a/.github/release/maven-settings.xml.gpg and /dev/null differ
diff --git a/.github/release/smallrye-sign.asc.gpg b/.github/release/smallrye-sign.asc.gpg
deleted file mode 100644
index ffd7b0f0..00000000
Binary files a/.github/release/smallrye-sign.asc.gpg and /dev/null differ
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3d8f3a69..a272eed4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,9 +3,7 @@ name: SmallRye Build
 on:
   push:
     branches:
-      - main
-      - jakarta
-      - micrometer
+      - 4.x
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'
@@ -25,17 +23,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
     name: build with jdk ${{matrix.java}}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: checkout
 
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v4
         name: set up jdk ${{matrix.java}}
         with:
+          distribution: 'temurin'
           java-version: ${{matrix.java}}
+          cache: 'maven'
+          cache-dependency-path: '**/pom.xml'
 
       - name: build with maven
         run: mvn -B formatter:validate verify --file pom.xml
@@ -44,24 +45,4 @@ jobs:
         name: tck-report
         with:
           name: tck-report
-          path: testsuite/tck/target/surefire-reports
-
-  quality:
-    needs: [build]
-    if: github.event_name == 'push' && github.repository_owner == 'smallrye'
-    runs-on: ubuntu-latest
-    name: quality
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-
-      - 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.organization=smallrye -Dsonar.projectKey=smallrye_smallrye-metrics -Dsonar.login=$SONAR_TOKEN -Dmaven.test.failure.ignore=true
+          path: testsuite/tck/target/surefire-reports-*
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
deleted file mode 100644
index 343d47e8..00000000
--- a/.github/workflows/pre-release.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: SmallRye Pre Release
-
-on:
-  pull_request:
-    paths:
-      - '.github/project.yml'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    name: pre release
-
-    steps:
-      - uses: radcortez/project-metadata-action@main
-        name: retrieve project metadata
-        id: metadata
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          metadata-file-path: '.github/project.yml'
-
-      - name: Validate version
-        if: contains(steps.metadata.outputs.current-version, 'SNAPSHOT')
-        run: |
-          echo '::error::Cannot release a SNAPSHOT version.'
-          exit 1
-
-      - uses: radcortez/milestone-review-action@main
-        name: milestone review
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          milestone-title: ${{steps.metadata.outputs.current-version}}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
deleted file mode 100644
index 80d1f903..00000000
--- a/.github/workflows/release.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: SmallRye Release
-
-on:
-  pull_request:
-    types: [closed]
-    paths:
-      - '.github/project.yml'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    name: release
-    if: ${{github.event.pull_request.merged == true}}
-    env:
-      GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}}
-
-    steps:
-      - uses: radcortez/project-metadata-action@main
-        name: retrieve project metadata
-        id: metadata
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          metadata-file-path: '.github/project.yml'
-
-      - uses: actions/checkout@v2
-        with:
-          token: ${{secrets.RELEASE_TOKEN}}
-
-      - uses: actions/setup-java@v1
-        with:
-          java-version: 11
-
-      - name: maven release ${{steps.metadata.outputs.current-version}}
-        run: |
-          java -version
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg
-          gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg
-          gpg --fast-import --no-tty --batch --yes smallrye-sign.asc
-          git config --global user.name "SmallRye CI"
-          git config --global user.email "smallrye@googlegroups.com"
-          git checkout -b release
-          mvn -B release:prepare -Prelease,coverage -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml
-          git checkout ${{github.base_ref}}
-          git rebase release
-          mvn -B release:perform -Prelease -s maven-settings.xml
-          git push
-          git push --tags
-
-      - uses: radcortez/milestone-release-action@main
-        name: milestone release
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          milestone-title: ${{steps.metadata.outputs.current-version}}
diff --git a/implementation/pom.xml b/implementation/pom.xml
index 19c0a68b..d058cb91 100644
--- a/implementation/pom.xml
+++ b/implementation/pom.xml
@@ -83,6 +83,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
 
@@ -95,6 +96,7 @@
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>jakarta.json</artifactId>
+      <version>2.0.1</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java b/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java
index c1ace319..a0a9e903 100644
--- a/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java
+++ b/implementation/src/main/java/io/smallrye/metrics/MetricRegistries.java
@@ -67,7 +67,7 @@ public void cleanUp() {
     /**
      * Drops a particular registry. If a reference to the same registry type
      * is requested later, a new empty registry will be created for that purpose.
-     * 
+     *
      * @param type Type of registry that should be dropped.
      */
     public static void drop(MetricRegistry.Type type) {
diff --git a/pom.xml b/pom.xml
index 7905d3cd..d8ecddbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>io.smallrye</groupId>
     <artifactId>smallrye-jakarta-parent</artifactId>
-    <version>34</version>
+    <version>38</version>
   </parent>
 
   <artifactId>smallrye-metrics-parent</artifactId>
@@ -42,6 +42,7 @@
     <version.jakarta.servlet>5.0.0</version.jakarta.servlet>
 
     <!-- For testing -->
+    <version.smallrye.testing>2.2.0</version.smallrye.testing>
     <version.wildfly>26.0.0.Final</version.wildfly>
 
     <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/../coverage/target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
@@ -90,6 +91,21 @@
         <version>${version.jakarta.servlet}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.smallrye.testing</groupId>
+        <artifactId>smallrye-testing-bom</artifactId>
+        <version>${version.smallrye.testing}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>io.smallrye.testing</groupId>
+        <artifactId>smallrye-testing-bom-tck</artifactId>
+        <version>${version.smallrye.testing}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+
       <dependency>
         <!-- This is the "real" dependency -->
         <groupId>io.smallrye.config</groupId>
@@ -106,13 +122,6 @@
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.jboss.weld.servlet</groupId>
-        <artifactId>weld-servlet-core</artifactId>
-        <version>${version.weld.core}</version>
-        <scope>test</scope>
-      </dependency>
-
       <dependency>
         <groupId>io.smallrye.common</groupId>
         <artifactId>smallrye-common-annotation</artifactId>
@@ -124,29 +133,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>${version.release.plugin}</version>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <tagNameFormat>@{project.version}</tagNameFormat>
-          <preparationGoals>verify</preparationGoals>
-          <pushChanges>false</pushChanges>
-          <localCheckout>true</localCheckout>
-          <remoteTagging>false</remoteTagging>
-          <arguments>-DskipTests ${release.arguments}</arguments>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>${version.gpg.plugin}</version>
-        <configuration>
-          <gpgArguments>
-            <arg>--pinentry-mode</arg>
-            <arg>loopback</arg>
-          </gpgArguments>
-        </configuration>
+        <groupId>net.revelc.code</groupId>
+        <artifactId>impsort-maven-plugin</artifactId>
+        <version>1.8.0</version>
       </plugin>
     </plugins>
   </build>
diff --git a/testsuite/extra/pom.xml b/testsuite/extra/pom.xml
index 5e4e3daa..bb987c40 100644
--- a/testsuite/extra/pom.xml
+++ b/testsuite/extra/pom.xml
@@ -69,6 +69,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
+      <version>4.13.2</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.junit</groupId>