diff --git a/examples/hawkbit-custom-theme-example/pom.xml b/examples/hawkbit-custom-theme-example/pom.xml
index 9baacc96c8..f747e95bb6 100644
--- a/examples/hawkbit-custom-theme-example/pom.xml
+++ b/examples/hawkbit-custom-theme-example/pom.xml
@@ -89,6 +89,10 @@
org.springframework.boot
spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-jetty
org.springframework.boot
diff --git a/examples/hawkbit-device-simulator/pom.xml b/examples/hawkbit-device-simulator/pom.xml
index 1415e4dfd1..b3f612df4a 100644
--- a/examples/hawkbit-device-simulator/pom.xml
+++ b/examples/hawkbit-device-simulator/pom.xml
@@ -71,6 +71,10 @@
org.springframework.boot
spring-boot-starter-web
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+
org.springframework.boot
spring-boot-starter-logging
diff --git a/extensions/hawkbit-extension-uaa/pom.xml b/extensions/hawkbit-extension-uaa/pom.xml
index 41516afbd6..bf9215ee95 100644
--- a/extensions/hawkbit-extension-uaa/pom.xml
+++ b/extensions/hawkbit-extension-uaa/pom.xml
@@ -45,6 +45,10 @@
org.springframework.boot
spring-boot-starter-web
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+
org.springframework.security.oauth
spring-security-oauth2
diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml
index 1832e46402..c1c2c2d270 100644
--- a/hawkbit-repository/hawkbit-repository-test/pom.xml
+++ b/hawkbit-repository/hawkbit-repository-test/pom.xml
@@ -46,12 +46,6 @@
org.springframework.boot
spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
org.springframework.boot
diff --git a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
index 043aeb49e5..d3152d977f 100644
--- a/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-ddi-api/pom.xml
@@ -24,12 +24,6 @@
org.springframework.boot
spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
org.springframework.boot
diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
index ee083cc214..356c96e6cf 100644
--- a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml
@@ -23,12 +23,6 @@
org.springframework.boot
spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
org.springframework.boot
diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
index 91c2997184..d362e0d1ed 100644
--- a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
+++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml
@@ -23,12 +23,6 @@
org.springframework.boot
spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
org.springframework.boot
diff --git a/pom.xml b/pom.xml
index 93c415e645..e31418c40a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -604,6 +604,12 @@
org.springframework.boot
spring-boot-starter-web
${spring.boot.version}
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
org.springframework.boot