diff --git a/adapters/oidc/spring-boot-container-bundle/pom.xml b/adapters/oidc/spring-boot-container-bundle/pom.xml
index 757aad6592..4f68494d38 100644
--- a/adapters/oidc/spring-boot-container-bundle/pom.xml
+++ b/adapters/oidc/spring-boot-container-bundle/pom.xml
@@ -52,6 +52,7 @@
                                     <include>org.keycloak:keycloak-jetty-adapter-spi</include>
                                 </includes>
                             </artifactSet>
+                            <createSourcesJar>true</createSourcesJar>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/boms/adapter/pom.xml b/boms/adapter/pom.xml
index 397b667d50..ccc35042fb 100644
--- a/boms/adapter/pom.xml
+++ b/boms/adapter/pom.xml
@@ -53,7 +53,7 @@
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-wildfly-adapter-dist</artifactId>
                 <version>3.2.0.CR1-SNAPSHOT</version>
-            </dependency>    
+            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-saml-adapter-core</artifactId>
@@ -121,7 +121,7 @@
             </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-default-spring-boot-starter</artifactId>
+                <artifactId>keycloak-spring-boot-starter</artifactId>
                 <version>3.2.0.CR1-SNAPSHOT</version>
             </dependency>
         </dependencies>
diff --git a/misc/spring-boot-starter/keycloak-default-spring-boot-starter/pom.xml b/misc/spring-boot-starter/keycloak-spring-boot-starter/pom.xml
similarity index 80%
rename from misc/spring-boot-starter/keycloak-default-spring-boot-starter/pom.xml
rename to misc/spring-boot-starter/keycloak-spring-boot-starter/pom.xml
index 83be7c6972..154d5a300f 100644
--- a/misc/spring-boot-starter/keycloak-default-spring-boot-starter/pom.xml
+++ b/misc/spring-boot-starter/keycloak-spring-boot-starter/pom.xml
@@ -6,7 +6,7 @@
         <artifactId>keycloak-spring-boot-starter-parent</artifactId>
         <version>3.2.0.CR1-SNAPSHOT</version>
     </parent>
-    <artifactId>keycloak-default-spring-boot-starter</artifactId>
+    <artifactId>keycloak-spring-boot-starter</artifactId>
     <name>Keycloak :: Spring :: Boot :: Default ::  Starter</name>
     <description>Spring Boot Default Starter for Keycloak</description>
 
@@ -15,6 +15,11 @@
           <groupId>org.keycloak</groupId>
           <artifactId>keycloak-spring-boot-adapter</artifactId>
       </dependency>
+      <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter</artifactId>
+          <version>1.5.2.RELEASE</version>
+      </dependency>    
       <dependency>
           <groupId>org.keycloak</groupId>
           <artifactId>spring-boot-container-bundle</artifactId>
@@ -24,4 +29,4 @@
           <artifactId>keycloak-spring-security-adapter</artifactId>
       </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/misc/spring-boot-starter/pom.xml b/misc/spring-boot-starter/pom.xml
index e80b8d7db3..cbea8390fc 100644
--- a/misc/spring-boot-starter/pom.xml
+++ b/misc/spring-boot-starter/pom.xml
@@ -13,7 +13,7 @@
     <description>Support for using Keycloak in Spring Boot applications.</description>
     <packaging>pom</packaging>
     <modules>
-        <module>keycloak-default-spring-boot-starter</module>
+        <module>keycloak-spring-boot-starter</module>
     </modules>
     <dependencyManagement>
       <dependencies>