diff --git a/pom.xml b/pom.xml
index a4801ca377c..5d9fa1e1449 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
     <version.tomee-quartz-shade>2.5.1</version.tomee-quartz-shade>
     <version.xbean>4.30</version.xbean>
     <version.groovy>2.4.21</version.groovy>
-    <version.jetty>11.0.20</version.jetty>
+    <version.jetty>12.1.8</version.jetty>
     <version.ehcache>3.11.1</version.ehcache>
     <junit.version>4.13.2</junit.version>
     <junit.jupiter.version>5.12.0</junit.jupiter.version>
@@ -1059,13 +1059,13 @@
         <version>${version.jetty}</version>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-jsp-2.1</artifactId>
+        <groupId>org.eclipse.jetty.ee11</groupId>
+        <artifactId>jetty-ee11-apache-jsp</artifactId>
         <version>${version.jetty}</version>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-plus</artifactId>
+        <groupId>org.eclipse.jetty.ee11</groupId>
+        <artifactId>jetty-ee11-plus</artifactId>
         <version>${version.jetty}</version>
       </dependency>
       <dependency>
@@ -1074,8 +1074,8 @@
         <version>${version.jetty}</version>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-webapp</artifactId>
+        <groupId>org.eclipse.jetty.ee11</groupId>
+        <artifactId>jetty-ee11-webapp</artifactId>
         <version>${version.jetty}</version>
       </dependency>
       <dependency>
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index 0988b883361..6a974597135 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -141,8 +141,8 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <groupId>org.eclipse.jetty.ee11</groupId>
+      <artifactId>jetty-ee11-servlet</artifactId>
       <version>${version.jetty}</version>
       <optional>true</optional>
     </dependency>
@@ -175,4 +175,3 @@
     </dependency>
   </dependencies>
 </project>
-
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java
index ad09fed348b..0ef1ffec914 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/JettyHttpServer.java
@@ -19,25 +19,19 @@
 import org.apache.openejb.loader.Options;
 import org.apache.openejb.server.ServiceException;
 import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.SessionIdManager;
-import org.eclipse.jetty.server.session.DefaultSessionIdManager;
-import org.eclipse.jetty.server.session.SessionHandler;
+import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
 
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
-import java.security.SecureRandom;
 import java.util.Properties;
 
 /**
@@ -99,16 +93,15 @@ public void init(final Properties props) throws Exception {
         connector.setPort(port);
         server.setConnectors(new Connector[]{connector});
 
-        final ContextHandler context = new ContextHandler();
+        final ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
         context.setContextPath("/");
         final ServletContext servletContext = context.getServletContext();
         server.setHandler(context);
 
-        final Handler handler = new AbstractHandler() {
+        context.addServlet(new HttpServlet() {
             @Override
-            public void handle(final String target, final Request request, final HttpServletRequest req, final HttpServletResponse res) throws IOException, ServletException {
+            protected void service(final HttpServletRequest req, final HttpServletResponse res) throws IOException, ServletException {
                 try {
-                    request.setHandled(true);
                     final HttpRequest httpRequest = new ServletRequestAdapter(req, res, servletContext);
                     final HttpResponse httpResponse = new ServletResponseAdapter(res);
                     JettyHttpServer.this.listener.onMessage(httpRequest, httpResponse);
@@ -118,14 +111,7 @@ public void handle(final String target, final Request request, final HttpServlet
                     throw new ServletException(e);
                 }
             }
-        };
-
-        final SessionHandler sessionHandler = new SessionHandler();
-        final SessionIdManager sessionManager = new DefaultSessionIdManager(server, new SecureRandom());
-        sessionHandler.setSessionIdManager(sessionManager);
-        sessionHandler.setHandler(handler);
-
-        context.setHandler(sessionHandler);
+        }, "/*");
     }
 
     @Override
@@ -145,4 +131,4 @@ public void stop() throws ServiceException {
             throw new ServiceException(e);
         }
     }
-}
\ No newline at end of file
+}