diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index 36736735df0d..0159fa593398 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -204,27 +204,29 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-common</artifactId>
+        <artifactId>jetty-infinispan-common</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-remote</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <artifactId>jetty-infinispan-remote</artifactId>
+        <classifier>config</classifier>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-remote-query</artifactId>
+        <artifactId>jetty-infinispan-remote-query</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-embedded</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <artifactId>jetty-infinispan-embedded</artifactId>
+        <classifier>config</classifier>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-embedded-query</artifactId>
+        <artifactId>jetty-infinispan-embedded-query</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
@@ -260,7 +262,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-keystore</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.memcached</groupId>
@@ -275,7 +277,7 @@
       <dependency>
         <groupId>org.eclipse.jetty.osgi</groupId>
         <artifactId>jetty-osgi-alpn</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.osgi</groupId>
@@ -370,7 +372,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-slf4j-impl</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-core/jetty-bom/pom.xml b/jetty-core/jetty-bom/pom.xml
index 9db0553e0d5b..da97e65e1975 100644
--- a/jetty-core/jetty-bom/pom.xml
+++ b/jetty-core/jetty-bom/pom.xml
@@ -184,27 +184,27 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-common</artifactId>
+        <artifactId>jetty-infinispan-common</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-remote</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <artifactId>jetty-infinispan-remote</artifactId>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-remote-query</artifactId>
+        <artifactId>jetty-infinispan-remote-query</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-embedded</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <artifactId>jetty-infinispan-embedded</artifactId>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>infinispan-embedded-query</artifactId>
+        <artifactId>jetty-infinispan-embedded-query</artifactId>
         <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
@@ -230,7 +230,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-keystore</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.memcached</groupId>
@@ -296,7 +296,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-slf4j-impl</artifactId>
-        <version>10.0.8-SNAPSHOT</version>
+        <version>12.0.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
diff --git a/pom.xml b/pom.xml
index 53d394a5983c..c004192689bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1234,6 +1234,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-infinispan-embedded</artifactId>
+        <classifier>config</classifier>
         <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -1244,6 +1245,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-infinispan-remote</artifactId>
+        <classifier>config</classifier>
         <version>${project.version}</version>
       </dependency>
       <dependency>