diff --git a/assembly/pom.xml b/assembly/pom.xml
index 5fde4827f2..e746f6a5e3 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -297,6 +297,18 @@
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jndi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-plus</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
@@ -305,12 +317,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
     </dependency>
-    <!-- jetty.orbit artifact will be removed as soon as https://github.com/eclipse/jetty.project/issues/4621 is fixed -->
-    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.security.auth.message</artifactId>
-      <version>1.0.0.v201108011116</version>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>ecj</artifactId>
diff --git a/pom.xml b/pom.xml
index 6f4b60894d..9c1629dfc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,8 +71,7 @@
     <jasypt-version>1.9.3</jasypt-version>
     <jaxb-version>4.0.2</jaxb-version>
     <jaxb-bundle-version>2.3.2_1</jaxb-bundle-version>
-    <jetty11-version>11.0.15</jetty11-version>
-    <jetty-version>${jetty11-version}</jetty-version>
+    <jetty-version>11.0.17</jetty-version>
     <jmdns-version>3.5.8</jmdns-version>
     <tomcat-api-version>9.0.65</tomcat-api-version>
     <jettison-version>1.5.4</jettison-version>
@@ -1553,12 +1552,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-        <id>jetty11</id>
-        <properties>
-            <jetty-version>${jetty11-version}</jetty-version>
-        </properties>
-    </profile>
 
     <!-- Execute owasp dependency check plugin -->
     <profile>