diff --git a/pom.xml b/pom.xml
index 30d07547ae..5d525af3ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
     <postgresql.driver.version>42.6.2</postgresql.driver.version>
     <!-- When connections to older MySQL server fail because of CLIENT_PLUGIN_AUTH, downgrade to 5.1.45 -->
     <mysql.version>8.4.0</mysql.version>
-    <jetty.version>9.4.30.v20200611</jetty.version>
+    <jetty.version>11.0.26</jetty.version>
     <apache.commons.math.version>3.6.1</apache.commons.math.version>
     <junit.version>5.8.2</junit.version>
     <elasticsearch.version>8.2.0</elasticsearch.version>
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/ChannelServlet.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/ChannelServlet.java
index 04bd506a78..a53910912b 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/ChannelServlet.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/ChannelServlet.java
@@ -9,10 +9,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.Engine;
 import org.csstudio.archive.engine.model.ArchiveChannel;
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/DisconnectedServlet.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/DisconnectedServlet.java
index 045b4461ef..20496662f4 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/DisconnectedServlet.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/DisconnectedServlet.java
@@ -9,10 +9,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.Engine;
 import org.csstudio.archive.engine.model.ArchiveChannel;
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupServlet.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupServlet.java
index 54a79cb5a1..d7ffddec9d 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupServlet.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupServlet.java
@@ -9,10 +9,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.Engine;
 import org.csstudio.archive.engine.model.ArchiveChannel;
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupsServlet.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupsServlet.java
index 809f01a849..0183a9ef1d 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupsServlet.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/GroupsServlet.java
@@ -9,10 +9,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.Engine;
 import org.csstudio.archive.engine.model.ArchiveChannel;
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/HTMLWriter.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/HTMLWriter.java
index 88d972a697..7ac1ec51b3 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/HTMLWriter.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/HTMLWriter.java
@@ -11,7 +11,7 @@
 import java.io.PrintWriter;
 import java.time.Instant;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.writer.rdb.TimestampHelper;
 
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/JSONWriter.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/JSONWriter.java
index b7f1e551ac..900117c624 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/JSONWriter.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/JSONWriter.java
@@ -11,8 +11,8 @@
 import java.io.PrintWriter;
 import java.time.Instant;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.engine.model.ArchiveChannel;
 import org.csstudio.archive.engine.model.BufferStats;
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/MainServlet.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/MainServlet.java
index 7f94a637bb..96fcb9d2b5 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/MainServlet.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/MainServlet.java
@@ -11,10 +11,10 @@
 import java.time.Duration;
 import java.time.Instant;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.Engine;
 import org.csstudio.archive.Preferences;
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/RestartServlet.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/RestartServlet.java
index 41be96cf02..bd3dd6607b 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/RestartServlet.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/RestartServlet.java
@@ -9,10 +9,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.Engine;
 
diff --git a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/StopServlet.java b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/StopServlet.java
index dfe7d50576..cb7a484b04 100644
--- a/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/StopServlet.java
+++ b/services/archive-engine/src/main/java/org/csstudio/archive/engine/server/StopServlet.java
@@ -9,10 +9,10 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.archive.Engine;
 
diff --git a/services/scan-server/build.xml b/services/scan-server/build.xml
index fa4e25b52b..3b38cdef1c 100644
--- a/services/scan-server/build.xml
+++ b/services/scan-server/build.xml
@@ -30,6 +30,7 @@
         <include name="dependencies/**/org.eclipse.paho.client.mqttv*.jar"/>
         <include name="dependencies/**/epics-jackie*.jar"/>
         <include name="dependencies/**/commons-lang*.jar"/>
+        <include name="dependencies/**/slf4j-api-*.jar"/>
       	
       	<include name="core/**/core-framework-*.jar"/>
       	<include name="core/**/core-formula-*.jar"/>
@@ -74,4 +75,4 @@
       <zipfileset dir="." includes="scan-server.sh" fullpath="scan-server-${version}/scan-server.sh" filemode="755"/>
     </zip>
   </target>
-</project>
\ No newline at end of file
+</project>
diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/RequestPath.java b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/RequestPath.java
index bdbb3e2ba6..7dbae034f3 100644
--- a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/RequestPath.java
+++ b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/RequestPath.java
@@ -7,7 +7,7 @@
  ******************************************************************************/
 package org.csstudio.scan.server.httpd;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /** Helper for analyzing the request path
  *  @author Kay Kasemir
diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScanServlet.java b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScanServlet.java
index 98abe4be19..c3ff45d369 100644
--- a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScanServlet.java
+++ b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScanServlet.java
@@ -16,11 +16,11 @@
 import java.util.List;
 import java.util.logging.Level;
 
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.csstudio.scan.data.ScanData;
diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScansServlet.java b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScansServlet.java
index 0dd9181740..f34e33a385 100644
--- a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScansServlet.java
+++ b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ScansServlet.java
@@ -13,10 +13,10 @@
 import java.util.List;
 import java.util.logging.Level;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.csstudio.scan.info.ScanInfo;
diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServerServlet.java b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServerServlet.java
index 3159b01feb..faf29212f2 100644
--- a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServerServlet.java
+++ b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServerServlet.java
@@ -12,10 +12,10 @@
 import java.io.IOException;
 import java.util.logging.Level;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.csstudio.scan.info.ScanServerInfo;
diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServletHelper.java b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServletHelper.java
index 10b7aab39b..a58142b2fc 100644
--- a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServletHelper.java
+++ b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/ServletHelper.java
@@ -14,8 +14,8 @@
 import java.util.List;
 import java.util.logging.Level;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamWriter;
 
diff --git a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/SimulateServlet.java b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/SimulateServlet.java
index 03721935e5..566f5dc335 100644
--- a/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/SimulateServlet.java
+++ b/services/scan-server/src/main/java/org/csstudio/scan/server/httpd/SimulateServlet.java
@@ -14,10 +14,10 @@
 import java.io.StringWriter;
 import java.util.logging.Level;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.csstudio.scan.info.SimulationResult;
 import org.csstudio.scan.server.ScanServer;
diff --git a/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServerDemo.java b/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServerDemo.java
index 72488b3753..597f1d8359 100644
--- a/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServerDemo.java
+++ b/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServerDemo.java
@@ -12,9 +12,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
diff --git a/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServletsDemo.java b/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServletsDemo.java
index f827278782..6ec35b4b68 100644
--- a/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServletsDemo.java
+++ b/services/scan-server/src/test/java/org/csstudio/scan/server/httpd/WebServletsDemo.java
@@ -12,10 +12,10 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.DefaultServlet;