diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml
index b90c59d05..023bbc25d 100644
--- a/hawkbit-security-core/pom.xml
+++ b/hawkbit-security-core/pom.xml
@@ -44,16 +44,12 @@
          <artifactId>spring-security-core</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.springframework.security</groupId>
-         <artifactId>spring-security-oauth2-client</artifactId>
-      </dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+      </dependency>   
       <dependency>
-         <groupId>org.springframework.security</groupId>
-         <artifactId>spring-security-oauth2-resource-server</artifactId>
-      </dependency>
-      <dependency>
-         <groupId>org.springframework.security</groupId>
-         <artifactId>spring-security-oauth2-jose</artifactId>
+         <groupId>org.springframework.boot</groupId>
+         <artifactId>spring-boot-starter-oauth2-client</artifactId>
       </dependency>
       <dependency>
          <groupId>org.springframework.boot</groupId>
diff --git a/hawkbit-ui/pom.xml b/hawkbit-ui/pom.xml
index a9e418174..33fa4dc8a 100644
--- a/hawkbit-ui/pom.xml
+++ b/hawkbit-ui/pom.xml
@@ -202,14 +202,9 @@
          <artifactId>spring-security-web</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.springframework.security</groupId>
-         <artifactId>spring-security-oauth2-client</artifactId>
+         <groupId>org.springframework.boot</groupId>
+         <artifactId>spring-boot-starter-oauth2-client</artifactId>
       </dependency>
-      <dependency>
-         <groupId>org.springframework.security</groupId>
-         <artifactId>spring-security-oauth2-jose</artifactId>
-      </dependency>
-
       <dependency>
          <groupId>com.vaadin</groupId>
          <artifactId>vaadin-themes</artifactId>
diff --git a/pom.xml b/pom.xml
index 1338ec457..91f4e0b42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -697,7 +697,17 @@
                </exclusion>
             </exclusions>
          </dependency>
-
+         <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-client</artifactId>
+            <version>${spring.boot.version}</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>com.sun.mail</groupId>
+                  <artifactId>javax.mail</artifactId>
+               </exclusion>
+            </exclusions>
+         </dependency>    
          <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>