diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8404704..eecc454 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,11 +10,7 @@
     schedule:
       interval: "daily"
     ignore:
-      # Jetty >= 12 has API changes
-      - dependency-name: "org.eclipse.jetty:jetty-*"
-        versions:
-          - ">= 12.0.0"
-      # Hibernate >=6.2 is incompatible    
+      # Hibernate >=6.2 is incompatible
       - dependency-name: "org.hibernate.orm:hibernate-*"
         versions:
           - ">= 6.2.0"
diff --git a/pom.xml b/pom.xml
index b8cb1d8..cd2b191 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
 		<!-- spring6.version is used in jersey and defined here 
 		to make sure that jersey uses the correct spring version-->
 		<spring6.version>${spring.version}</spring6.version>
-		<jetty.version>11.0.25</jetty.version>
+		<jetty.version>12.1.1</jetty.version>
 		<flyway.version>11.13.1</flyway.version>
 		<log4j.version>2.25.2</log4j.version>
 		<krill.version>[0.64.2,)</krill.version>
@@ -446,13 +446,13 @@
 			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-servlet</artifactId>
+			<groupId>org.eclipse.jetty.ee10</groupId>
+			<artifactId>jetty-ee10-servlet</artifactId>
 			<version>${jetty.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.jetty</groupId>
-			<artifactId>jetty-webapp</artifactId>
+			<groupId>org.eclipse.jetty.ee10</groupId>
+			<artifactId>jetty-ee10-webapp</artifactId>
 			<version>${jetty.version}</version>
 		</dependency>
 
diff --git a/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java b/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
index 4b1c17e..7f79e7b 100644
--- a/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
+++ b/src/main/java/de/ids_mannheim/korap/server/EmbeddedLdapServer.java
@@ -47,9 +47,9 @@
         final SSLUtil clientSslUtil = new SSLUtil(new TrustAllTrustManager());
 
         config.setListenerConfigs(
-                InMemoryListenerConfig.createLDAPConfig("LDAP", // Listener name
-                        InetAddress.getByName("localhost"), // Listen address. (null = listen on all interfaces)
-                        ldapConfig.port, // Listen port (0 = automatically choose an available port)
+                InMemoryListenerConfig.createLDAPConfig("LDAP",
+                        InetAddress.getLoopbackAddress(),
+                        ldapConfig.port,
                         clientSslUtil.createSSLSocketFactory()));
         server = new InMemoryDirectoryServer(config);
 
diff --git a/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java b/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
index 5cbd362..43ae2e0 100644
--- a/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
+++ b/src/main/java/de/ids_mannheim/korap/server/KustvaktBaseServer.java
@@ -19,8 +19,8 @@
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.HandlerList;
 import org.eclipse.jetty.server.handler.ShutdownHandler;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
 import org.glassfish.jersey.server.ServerProperties;
 import org.glassfish.jersey.servlet.ServletContainer;
 import org.springframework.web.context.ContextLoaderListener;
@@ -39,7 +39,7 @@
 public abstract class KustvaktBaseServer {
 
     private Logger log = LogManager.getLogger(KustvaktBaseServer.class);
-    
+
     protected static KustvaktConfiguration config;
     protected static String springConfig = "default-config.xml";