diff --git a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
index 057618a94ca..bfd6e1cf920 100755
--- a/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
+++ b/java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
@@ -208,35 +208,6 @@
          version="8.5.54"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jetty.apache-jsp"
-         download-size="0"
-         install-size="0"
-         version="9.4.35.v20201120"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.apache-jsp.source"
-         download-size="0"
-         install-size="0"
-         version="9.4.35.v20201120"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.osgi.boot.jsp"
-         download-size="0"
-         install-size="0"
-         version="9.4.35.v20201120"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.osgi.boot.jsp.source"
-         download-size="0"
-         install-size="0"
-         version="9.4.35.v20201120"
-         unpack="false"/>
-
-<!-- 9.4.36 -->
    <plugin
          id="org.eclipse.jetty.apache-jsp"
          download-size="0"
@@ -264,7 +235,6 @@
          install-size="0"
          version="9.4.36.v20210114"
          unpack="false"/>
-<!-- 9.4.36 ende -->
 
    <plugin
          id="org.eclipse.jdt.core.compiler.batch"
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.apache-jsp-9.4.35.v20201120.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.apache-jsp-9.4.35.v20201120.jar
deleted file mode 100644
index dbc12b04bd4..00000000000
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.apache-jsp-9.4.35.v20201120.jar and /dev/null differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.apache-jsp.source_9.4.35.v20201120.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.apache-jsp.source_9.4.35.v20201120.jar
deleted file mode 100644
index 279d2f237a1..00000000000
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.apache-jsp.source_9.4.35.v20201120.jar and /dev/null differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.osgi.boot.jsp-9.4.35.v20201120-source.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.osgi.boot.jsp-9.4.35.v20201120-source.jar
deleted file mode 100644
index 2b79ab5921e..00000000000
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.osgi.boot.jsp-9.4.35.v20201120-source.jar and /dev/null differ
diff --git a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.osgi.boot.jsp-9.4.35.v20201120.jar b/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.osgi.boot.jsp-9.4.35.v20201120.jar
deleted file mode 100644
index ac4c77b2a0c..00000000000
Binary files a/java/com.sap.sailing.targetplatform.base/plugins/target-base/org.eclipse.jetty.osgi.boot.jsp-9.4.35.v20201120.jar and /dev/null differ
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
index 5c02e1cb322..818475aa519 100755
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
@@ -293,7 +293,7 @@
 <plugin id="org.apache.taglibs.taglibs-standard-spec"/>
 <plugin id="org.apache.xalan"/>
 <plugin id="org.apache.xml.serializer"/>
-<plugin id="org.eclipse.jetty.osgi.boot.jsp.source" version="9.4.35.v20201120"/>
+<plugin id="org.eclipse.jetty.osgi.boot.jsp.source" version="9.4.36.v20201120"/>
 <plugin id="org.mortbay.jasper.apache-jsp.source"/>
 <plugin id="org.eclipse.jetty.osgi-servlet-api" version="3.1.0.M3"/>
 <plugin id="org.eclipse.jetty.osgi-servlet-api.source" version="3.1.0.M3"/>
diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml
index 534231cf9d5..958650268a9 100644
--- a/java/com.sap.sse.feature.runtime/feature.xml
+++ b/java/com.sap.sse.feature.runtime/feature.xml
@@ -525,7 +525,7 @@
          id="org.eclipse.jetty.osgi.boot.jsp.source"
          download-size="0"
          install-size="0"
-         version="9.4.35.v20201120"
+         version="9.4.36.v20210114"
          unpack="false"/>
 
    <plugin