diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a054ecc..30fb3a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,20 +4,10 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-    inputs:
-      jdk-matrix:
-        description: 'jdk matrix as json array'
-        required: false
-        default: '[ "11" ]'
 
 jobs:
-  ci:
-    uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
-
-  integration_test:
-    uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main
-    with:
-      plugin_name: 'payment-test'
-      integration_tests_goal: 'test:plugins:payment-test'
-      ddl_file: 'src/main/resources/ddl.sql'
-      integration_tests_ref: 'refs/heads/master'
+  snapshot:
+    uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@java21
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c150684..b8add17 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -7,4 +7,4 @@ on:
 
 jobs:
   analyze:
-    uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@main
+    uses: killbill/gh-actions-shared/.github/workflows/codeql-analysis.yml@java21
diff --git a/pom.xml b/pom.xml
index 61d96cc..9ec95a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.63</version>
+        <version>0.147.0-9c99329-SNAPSHOT</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>payment-test-plugin</artifactId>
@@ -72,8 +72,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
         </dependency>
         <dependency>
             <groupId>joda-time</groupId>
@@ -91,8 +91,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.jooby</groupId>
-            <artifactId>jooby</artifactId>
+            <groupId>org.kill-bill.commons</groupId>
+            <artifactId>killbill-jooby</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jooq</groupId>
@@ -142,12 +142,24 @@
         <dependency>
             <groupId>org.kill-bill.billing.plugin.java</groupId>
             <artifactId>killbill-base-plugin</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.kill-bill.commons</groupId>
+                    <artifactId>killbill-jooby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.billing.plugin.java</groupId>
             <artifactId>killbill-base-plugin</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.kill-bill.commons</groupId>
+                    <artifactId>killbill-jooby</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.kill-bill.commons</groupId>
diff --git a/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java b/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java
index 8da388e..8f54606 100644
--- a/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java
+++ b/src/main/java/org/killbill/billing/plugin/payment/PaymentTestActivator.java
@@ -16,8 +16,8 @@
 
 package org.killbill.billing.plugin.payment;
 
-import javax.servlet.Servlet;
-import javax.servlet.http.HttpServlet;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.http.HttpServlet;
 import java.util.Hashtable;
 import org.killbill.billing.osgi.api.OSGIPluginProperties;
 import org.killbill.billing.osgi.libs.killbill.KillbillActivatorBase;
diff --git a/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java b/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java
index 28d766d..32b8f6e 100644
--- a/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java
+++ b/src/main/java/org/killbill/billing/plugin/payment/TestingStates.java
@@ -28,7 +28,7 @@
 
 import javax.annotation.Nullable;
 
-public class TestingStates {
+public final class TestingStates {
 
     public static final String SLEEP_PLUGIN_CONFIG_PARAM = "sleepFor";
     public static final String AMOUNT_PLUGIN_CONFIG_PARAM = "amount";
diff --git a/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java b/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java
index 8ceebed..f34ed1d 100644
--- a/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java
+++ b/src/main/java/org/killbill/billing/plugin/payment/resources/PaymentTestResource.java
@@ -26,8 +26,8 @@
 import org.killbill.billing.plugin.payment.TestingStates;
 import org.killbill.billing.plugin.payment.model.Payload;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 @Singleton
 @Path("/")