diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a054ecc..5294767 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,14 +8,14 @@ on:
       jdk-matrix:
         description: 'jdk matrix as json array'
         required: false
-        default: '[ "11" ]'
+        default: '[ "21" ]'
 
 jobs:
   ci:
-    uses: killbill/gh-actions-shared/.github/workflows/ci.yml@main
+    uses: killbill/gh-actions-shared/.github/workflows/ci.yml@java21
 
   integration_test:
-    uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@main
+    uses: killbill/gh-actions-shared/.github/workflows/integration_test.yml@java21
     with:
       plugin_name: 'payment-test'
       integration_tests_goal: 'test:plugins:payment-test'
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/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
new file mode 100644
index 0000000..cd51d66
--- /dev/null
+++ b/.github/workflows/snapshot.yml
@@ -0,0 +1,12 @@
+name: snapshot
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  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/README.md b/README.md
index 98aac8b..a0702fa 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,15 @@ Kill Bill compatibility
 |          6.x.y |            0.20.z |
 |          7.x.y |            0.22.z |
 |          8.x.y |            0.24.z |
+|          9.x.y |            0.26.z |
 
 
 Requirements
 -----------------------
 
-The plugin needs a database. The latest version of the schema can be found [here](https://github.com/killbill/killbill-payment-test-plugin/blob/master/src/main/resources/ddl.sql).
+The plugin needs a database. The latest version of the schema can be found [here](https://github.com/killbill/killbill-payment-test-plugin/blob/master/src/main/resources/ddl.sql). 
+
+Version `9.x.y` mark of removal Java EE `javax` namespace and use `jakarta` namespace instead.
 
 ## Build
 
diff --git a/docker/docker-compose.ci.mysql.yml b/docker/docker-compose.ci.mysql.yml
index 7e7ac6c..403607c 100644
--- a/docker/docker-compose.ci.mysql.yml
+++ b/docker/docker-compose.ci.mysql.yml
@@ -20,7 +20,7 @@ version: '3.8'
 services:
   killbill:
     network_mode: host
-    image: killbill/killbill:0.24.0
+    image: xsalefter/killbill:0.25.4
     environment:
       - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
       - KILLBILL_DAO_URL=jdbc:mysql://127.0.0.1:3306/killbill
diff --git a/docker/docker-compose.ci.postgresql.yml b/docker/docker-compose.ci.postgresql.yml
index 006d24b..8b8ed64 100644
--- a/docker/docker-compose.ci.postgresql.yml
+++ b/docker/docker-compose.ci.postgresql.yml
@@ -20,7 +20,7 @@ version: '3.8'
 services:
   killbill:
     network_mode: host
-    image: killbill/killbill:0.24.0
+    image: xsalefter/killbill:0.25.4
     environment:
       - KILLBILL_CATALOG_URI=SpyCarAdvanced.xml
       - KILLBILL_DAO_URL=jdbc:postgresql://127.0.0.1:5432/killbill
diff --git a/pom.xml b/pom.xml
index 61d96cc..7c69530 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,11 +19,11 @@
     <parent>
         <groupId>org.kill-bill.billing</groupId>
         <artifactId>killbill-oss-parent</artifactId>
-        <version>0.146.63</version>
+        <version>0.147.20</version>
     </parent>
     <groupId>org.kill-bill.billing.plugin.java</groupId>
     <artifactId>payment-test-plugin</artifactId>
-    <version>8.0.2-SNAPSHOT</version>
+    <version>9.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Kill Bill Payment Test plugin</name>
     <description>Kill Bill Payment Test plugin</description>
@@ -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("/")