diff --git a/adapters/oidc/pom.xml b/adapters/oidc/pom.xml
index bd75558a88..07180eb697 100755
--- a/adapters/oidc/pom.xml
+++ b/adapters/oidc/pom.xml
@@ -44,6 +44,7 @@
         <module>spring-boot2</module>
         <module>spring-boot-adapter-core</module>
         <module>spring-boot-container-bundle</module>
+        <module>spring-boot-legacy-container-bundle</module>
         <module>spring-security</module>
         <module>tomcat</module>
         <module>undertow</module>
diff --git a/adapters/oidc/spring-boot-adapter-core/pom.xml b/adapters/oidc/spring-boot-adapter-core/pom.xml
index a725b1c636..62dae084cf 100755
--- a/adapters/oidc/spring-boot-adapter-core/pom.xml
+++ b/adapters/oidc/spring-boot-adapter-core/pom.xml
@@ -50,6 +50,13 @@
       <optional>true</optional>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.keycloak</groupId>
+      <artifactId>spring-boot-legacy-container-bundle</artifactId>
+      <version>${project.version}</version>
+      <optional>true</optional>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.keycloak</groupId>
       <artifactId>keycloak-spring-security-adapter</artifactId>
diff --git a/adapters/oidc/spring-boot-container-bundle/pom.xml b/adapters/oidc/spring-boot-container-bundle/pom.xml
index 5cd0746503..52aa265530 100644
--- a/adapters/oidc/spring-boot-container-bundle/pom.xml
+++ b/adapters/oidc/spring-boot-container-bundle/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
          <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-jetty93-adapter</artifactId>
+            <artifactId>keycloak-jetty94-adapter</artifactId>
             <scope>compile</scope>
         </dependency>
     </dependencies>
@@ -43,7 +43,7 @@
                                 <includes>
                                     <include>org.keycloak:keycloak-tomcat-adapter</include>
                                     <include>org.keycloak:keycloak-undertow-adapter</include>
-                                    <include>org.keycloak:keycloak-jetty93-adapter</include>
+                                    <include>org.keycloak:keycloak-jetty94-adapter</include>
                                     <include>org.keycloak:keycloak-tomcat-core-adapter</include>
                                     <include>org.keycloak:keycloak-tomcat-adapter-spi</include>
                                     <include>org.keycloak:keycloak-undertow-adapter</include>
diff --git a/adapters/oidc/spring-boot-legacy-container-bundle/pom.xml b/adapters/oidc/spring-boot-legacy-container-bundle/pom.xml
new file mode 100644
index 0000000000..44cf38f376
--- /dev/null
+++ b/adapters/oidc/spring-boot-legacy-container-bundle/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+      <artifactId>keycloak-parent</artifactId>
+      <groupId>org.keycloak</groupId>
+      <version>8.0.0-SNAPSHOT</version>
+      <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <artifactId>spring-boot-legacy-container-bundle</artifactId>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-tomcat-adapter</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-undertow-adapter</artifactId>
+            <scope>compile</scope>
+        </dependency>
+         <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-jetty93-adapter</artifactId>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.keycloak:keycloak-tomcat-adapter</include>
+                                    <include>org.keycloak:keycloak-undertow-adapter</include>
+                                    <include>org.keycloak:keycloak-jetty93-adapter</include>
+                                    <include>org.keycloak:keycloak-tomcat-core-adapter</include>
+                                    <include>org.keycloak:keycloak-tomcat-adapter-spi</include>
+                                    <include>org.keycloak:keycloak-undertow-adapter</include>
+                                    <include>org.keycloak:keycloak-undertow-adapter-spi</include>
+                                    <include>org.keycloak:keycloak-jetty-core</include>
+                                    <include>org.keycloak:keycloak-jetty-adapter-spi</include>
+                                </includes>
+                            </artifactSet>
+                            <createSourcesJar>true</createSourcesJar>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/adapters/oidc/spring-boot/pom.xml b/adapters/oidc/spring-boot/pom.xml
index 3e9bed8bba..65b73569dc 100755
--- a/adapters/oidc/spring-boot/pom.xml
+++ b/adapters/oidc/spring-boot/pom.xml
@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>org.keycloak</groupId>
-      <artifactId>spring-boot-container-bundle</artifactId>
+      <artifactId>spring-boot-legacy-container-bundle</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
       <scope>compile</scope>
diff --git a/boms/adapter/pom.xml b/boms/adapter/pom.xml
index 8231beccf4..52629502e3 100644
--- a/boms/adapter/pom.xml
+++ b/boms/adapter/pom.xml
@@ -104,6 +104,11 @@
                 <artifactId>spring-boot-container-bundle</artifactId>
                 <version>8.0.0-SNAPSHOT</version>
             </dependency>
+            <dependency>
+                <groupId>org.keycloak</groupId>
+                <artifactId>spring-boot-legacy-container-bundle</artifactId>
+                <version>8.0.0-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-spring-security-adapter</artifactId>
diff --git a/misc/spring-legacy-boot-starter/keycloak-legacy-spring-boot-starter/pom.xml b/misc/spring-legacy-boot-starter/keycloak-legacy-spring-boot-starter/pom.xml
index d04f282a48..e07723fe81 100644
--- a/misc/spring-legacy-boot-starter/keycloak-legacy-spring-boot-starter/pom.xml
+++ b/misc/spring-legacy-boot-starter/keycloak-legacy-spring-boot-starter/pom.xml
@@ -24,10 +24,10 @@
           <artifactId>spring-boot-starter</artifactId>
           <version>1.5.14.RELEASE</version>
       </dependency>
-      <dependency>
-          <groupId>org.keycloak</groupId>
-          <artifactId>spring-boot-container-bundle</artifactId>
-      </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>spring-boot-legacy-container-bundle</artifactId>
+        </dependency>
       <dependency>
           <groupId>org.keycloak</groupId>
           <artifactId>keycloak-spring-security-adapter</artifactId>