diff --git a/kura/distrib/src/main/ant/build_equinox_distrib.xml b/kura/distrib/src/main/ant/build_equinox_distrib.xml
index 7fa07c2094b..5f0882cc137 100644
--- a/kura/distrib/src/main/ant/build_equinox_distrib.xml
+++ b/kura/distrib/src/main/ant/build_equinox_distrib.xml
@@ -762,15 +762,10 @@ fi]]>
             <param name="start.level" value="5" />
             <param name="start" value="" />
         </antcall>
-        <antcall target="install-plugin">
-            <param name="bundle.file" value="org.apache.felix.http.jetty12-light_${org.apache.felix.http.jetty12.version}.jar"/>
-            <param name="start.level" value="5"/>
-            <param name="start" value=""/>
-        </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.apache.felix.http.bridge_${org.apache.felix.http.bridge.version}.jar"/>
             <param name="start.level" value="5"/>
-            <param name="start" value=""/>
+            <param name="start" value="s"/>
         </antcall>
         <antcall target="install-plugin">
             <param name="bundle.file" value="org.apache.felix.http.proxy_${org.apache.felix.http.proxy.version}.jar"/>
@@ -993,17 +988,7 @@ fi]]>
             <param name="start" value="" />
         </antcall>
         <antcall target="install-plugin">
-            <param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-security_${org.eclipse.jetty.version}.jar" />
-            <param name="start.level" value="5" />
-            <param name="start" value="s" />
-        </antcall>
-        <antcall target="install-plugin">
-            <param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-servlet_${org.eclipse.jetty.version}.jar" />
-            <param name="start.level" value="5" />
-            <param name="start" value="s" />
-        </antcall>
-        <antcall target="install-plugin">
-            <param name="bundle.file" value="org.eclipse.jetty.ee8.jetty-ee8-nested_${org.eclipse.jetty.version}.jar" />
+            <param name="bundle.file" value="org.eclipse.jetty.ee10.jetty-ee10-servlet_${org.eclipse.jetty.version}.jar" />
             <param name="start.level" value="5" />
             <param name="start" value="s" />
         </antcall>
diff --git a/kura/examples/test/pom.xml b/kura/examples/test/pom.xml
index 4d89343cd06..ceb86825cbf 100644
--- a/kura/examples/test/pom.xml
+++ b/kura/examples/test/pom.xml
@@ -497,16 +497,6 @@
                             <level>4</level>
                             <autoStart>true</autoStart>
                         </bundle>
-                        <bundle>
-                            <id>org.eclipse.kura.jetty.customizer</id>
-                            <level>2</level>
-                            <autoStart>false</autoStart>
-                        </bundle>
-                        <bundle>
-                            <id>org.eclipse.equinox.http.jetty</id>
-                            <level>3</level>
-                            <autoStart>false</autoStart>
-                        </bundle>
                         <bundle>
                             <id>org.eclipse.kura.http.server.manager</id>
                             <level>4</level>
@@ -704,16 +694,6 @@
                                 <id>org.eclipse.kura.deployment.agent</id>
                                 <versionRange>0.0.0</versionRange>
                             </requirement>
-                            <requirement>
-                                <type>eclipse-plugin</type>
-                                <id>org.eclipse.kura.jetty.customizer</id>
-                                <versionRange>0.0.0</versionRange>
-                            </requirement>
-                            <requirement>
-                                <type>eclipse-plugin</type>
-                                <id>org.eclipse.equinox.http.jetty</id>
-                                <versionRange>0.0.0</versionRange>
-                            </requirement>
                             <requirement>
                                 <type>eclipse-plugin</type>
                                 <id>org.eclipse.kura.rest.provider</id>
diff --git a/kura/org.eclipse.kura.http.server.manager/META-INF/MANIFEST.MF b/kura/org.eclipse.kura.http.server.manager/META-INF/MANIFEST.MF
index a8a76a7936e..82561b1bf64 100644
--- a/kura/org.eclipse.kura.http.server.manager/META-INF/MANIFEST.MF
+++ b/kura/org.eclipse.kura.http.server.manager/META-INF/MANIFEST.MF
@@ -5,8 +5,19 @@ Bundle-SymbolicName: org.eclipse.kura.http.server.manager
 Bundle-Version: 2.0.0.qualifier
 Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
 Service-Component: OSGI-INF/*.xml
-Import-Package: org.apache.felix.http.jetty;version="4.0.0",
- org.eclipse.jetty.server;version="12.0.0",
+Import-Package: jakarta.servlet;version="5.0.0",
+ jakarta.servlet.http;version="5.0.0",
+ javax.servlet;version="4.0.0",
+ org.eclipse.jetty.ee10.servlet;version="12.0.14",
+ org.eclipse.jetty.http;version="12.0.14",
+ org.eclipse.jetty.server;version="12.0.14",
+ org.eclipse.jetty.server.handler;version="12.0.14",
+ org.eclipse.jetty.server.handler.gzip;version="12.0.14",
+ org.eclipse.jetty.session;version="12.0.14",
+ org.eclipse.jetty.util.component;version="12.0.14",
+ org.eclipse.jetty.util.compression;version="12.0.14",
+ org.eclipse.jetty.util.ssl;version="12.0.14",
+ org.eclipse.jetty.util.thread;version="12.0.14",
  org.eclipse.kura;version="[1.5,2.0)",
  org.eclipse.kura.configuration;version="1.2.0",
  org.eclipse.kura.crypto;version="[1.2,2.0)",
diff --git a/kura/org.eclipse.kura.http.server.manager/OSGI-INF/httpService.xml b/kura/org.eclipse.kura.http.server.manager/OSGI-INF/httpService.xml
index 97dc1959bbd..a91f85b8150 100755
--- a/kura/org.eclipse.kura.http.server.manager/OSGI-INF/httpService.xml
+++ b/kura/org.eclipse.kura.http.server.manager/OSGI-INF/httpService.xml
@@ -34,4 +34,6 @@
            interface="org.eclipse.kura.security.keystore.KeystoreService"/>
    <property name="kura.ui.service.hide" type="Boolean" value="true"/>
    <property name="event.topics" type="String">org/eclipse/kura/security/keystore/KeystoreChangedEvent/KEYSTORE_CHANGED</property>
+   <reference bind="setDispatcherServlet" cardinality="1..1" interface="jakarta.servlet.http.HttpServlet" name="HttpServlet" policy="static" target="(http.felix.dispatcher=*)"/>
+   <reference bind="setEventListener" cardinality="1..1" interface="java.util.EventListener" name="EventListener" policy="static" target="(http.felix.dispatcher=*)"/>
 </scr:component>
diff --git a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/BaseSslContextFactory.java b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/BaseSslContextFactory.java
new file mode 100644
index 00000000000..23ed60d4668
--- /dev/null
+++ b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/BaseSslContextFactory.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Eurotech
+ *******************************************************************************/
+
+package org.eclipse.kura.http.server.manager;
+
+import java.security.KeyStore;
+
+import javax.net.ssl.KeyManager;
+
+import org.eclipse.jetty.util.ssl.SslContextFactory;
+import org.eclipse.kura.security.keystore.KeystoreService;
+
+public class BaseSslContextFactory extends SslContextFactory.Server {
+
+    protected final KeystoreService keystoreService;
+
+    public BaseSslContextFactory(final KeystoreService keystoreService) {
+        this.keystoreService = keystoreService;
+    }
+
+    @Override
+    protected KeyManager[] getKeyManagers(KeyStore keyStore) throws Exception {
+        return this.keystoreService.getKeyManagers(getKeyManagerFactoryAlgorithm()).toArray(new KeyManager[0]);
+    }
+
+}
diff --git a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/ClientAuthSslContextFactoryImpl.java b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/ClientAuthSslContextFactoryImpl.java
new file mode 100644
index 00000000000..f96396b4229
--- /dev/null
+++ b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/ClientAuthSslContextFactoryImpl.java
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Eurotech
+ *******************************************************************************/
+
+package org.eclipse.kura.http.server.manager;
+
+import java.security.KeyStore;
+import java.security.cert.CertPathValidator;
+import java.security.cert.CertStore;
+import java.security.cert.CollectionCertStoreParameters;
+import java.security.cert.PKIXBuilderParameters;
+import java.security.cert.PKIXRevocationChecker;
+import java.security.cert.PKIXRevocationChecker.Option;
+import java.security.cert.X509CertSelector;
+import java.util.Collection;
+import java.util.EnumSet;
+
+import org.eclipse.kura.security.keystore.KeystoreService;
+
+public final class ClientAuthSslContextFactoryImpl extends BaseSslContextFactory {
+
+    private boolean isRevocationEnabled;
+    private EnumSet<Option> revocationOptions;
+
+    public ClientAuthSslContextFactoryImpl(final KeystoreService keystoreService, final boolean isRevocationEnabled,
+            final EnumSet<PKIXRevocationChecker.Option> revocationOptions) {
+        super(keystoreService);
+
+        this.isRevocationEnabled = isRevocationEnabled;
+        this.revocationOptions = revocationOptions;
+        setValidatePeerCerts(isRevocationEnabled);
+    }
+
+    @Override
+    protected PKIXBuilderParameters newPKIXBuilderParameters(KeyStore trustStore,
+            Collection<? extends java.security.cert.CRL> crls) throws Exception {
+        PKIXBuilderParameters pbParams = new PKIXBuilderParameters(trustStore, new X509CertSelector());
+
+        pbParams.setMaxPathLength(getMaxCertPathLength());
+        pbParams.setRevocationEnabled(this.isRevocationEnabled);
+
+        final PKIXRevocationChecker revocationChecker = (PKIXRevocationChecker) CertPathValidator.getInstance("PKIX")
+                .getRevocationChecker();
+
+        revocationChecker.setOptions(this.revocationOptions);
+
+        pbParams.addCertPathChecker(revocationChecker);
+
+        if (getPkixCertPathChecker() != null) {
+            pbParams.addCertPathChecker(getPkixCertPathChecker());
+        }
+
+        try {
+            pbParams.addCertStore(this.keystoreService.getCRLStore());
+        } catch (Exception e) {
+            if (crls != null && !crls.isEmpty()) {
+                pbParams.addCertStore(CertStore.getInstance("Collection", new CollectionCertStoreParameters(crls)));
+            }
+        }
+
+        return pbParams;
+    }
+
+}
diff --git a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/HttpConnectorFactory.java b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/HttpConnectorFactory.java
deleted file mode 100644
index 671e6719938..00000000000
--- a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/HttpConnectorFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2024 Eurotech and/or its affiliates and others
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *  Eurotech
- *******************************************************************************/
-
-package org.eclipse.kura.http.server.manager;
-
-import java.util.EnumSet;
-
-import org.apache.felix.http.jetty.ConnectorFactory;
-import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.HttpConfiguration;
-import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-
-public class HttpConnectorFactory implements ConnectorFactory {
-
-    private final int port;
-
-    public HttpConnectorFactory(int port) {
-        this.port = port;
-    }
-
-    @Override
-    public Connector createConnector(Server server) {
-        HttpConnectionFactory connFactory = new HttpConnectionFactory();
-        configureHttpConnectionFactory(connFactory);
-
-        ServerConnector connector = new ServerConnector(server, config.getAcceptors(), config.getSelectors(),
-                connFactory);
-
-        HttpConfiguration httpConfiguration = new HttpConfiguration();
-        httpConfiguration.addCustomizer(new BlockHttpMethods(EnumSet.of(HttpMethod.TRACE)));
-
-        for (final int port : ports) {
-            final ServerConnector newConnector = new ServerConnector(serverConnector.getServer(),
-                    new HttpConnectionFactory(httpConfiguration));
-
-            customizeConnector(newConnector, port);
-            serverConnector.getServer().addConnector(newConnector);
-        }
-    }
-
-}
diff --git a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/HttpService.java b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/HttpService.java
index 0856faf67dd..f27e4a86eb5 100755
--- a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/HttpService.java
+++ b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/HttpService.java
@@ -12,49 +12,37 @@
  *******************************************************************************/
 package org.eclipse.kura.http.server.manager;
 
-import java.security.KeyStore;
-import java.security.cert.PKIXRevocationChecker;
-import java.util.Dictionary;
-import java.util.EnumSet;
-import java.util.Hashtable;
-import java.util.List;
+import java.util.EventListener;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.function.Function;
+import java.util.Optional;
 
-import javax.net.ssl.KeyManager;
-
-import org.eclipse.kura.KuraException;
 import org.eclipse.kura.configuration.ConfigurableComponent;
 import org.eclipse.kura.configuration.ConfigurationService;
-import org.eclipse.kura.http.server.manager.HttpServiceOptions.RevocationCheckMode;
 import org.eclipse.kura.security.keystore.KeystoreChangedEvent;
 import org.eclipse.kura.security.keystore.KeystoreService;
 import org.eclipse.kura.system.SystemService;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventHandler;
-import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
-import org.osgi.service.jakartars.whiteboard.annotations.RequireJakartarsWhiteboard;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@RequireHttpWhiteboard
-@RequireJakartarsWhiteboard
-public class HttpService implements ConfigurableComponent, EventHandler {
+import jakarta.servlet.http.HttpServlet;
 
-    private static final String KURA_JETTY_PID = "kura.default";
+public class HttpService implements ConfigurableComponent, EventHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(HttpService.class);
 
     private HttpServiceOptions options;
 
     private SystemService systemService;
-
     private KeystoreService keystoreService;
+    private HttpServlet dispatcherServlet;
+    private EventListener eventListener;
 
     private String keystoreServicePid;
 
+    private JettyServerHolder jettyServerHolder;
+
     public void setSystemService(SystemService systemService) {
         this.systemService = systemService;
     }
@@ -64,6 +52,14 @@ public void setKeystoreService(KeystoreService keystoreService, final Map<String
         this.keystoreServicePid = (String) properties.get(ConfigurationService.KURA_SERVICE_PID);
     }
 
+    public void setDispatcherServlet(HttpServlet dispatcherServlet) {
+        this.dispatcherServlet = dispatcherServlet;
+    }
+
+    public void setEventListener(EventListener eventListener) {
+        this.eventListener = eventListener;
+    }
+
     public void activate(Map<String, Object> properties) {
         logger.info("Activating {}", this.getClass().getSimpleName());
 
@@ -95,99 +91,6 @@ public void deactivate() {
         deactivateHttpService();
     }
 
-    private Dictionary<String, Object> getJettyConfig() {
-
-        final Dictionary<String, Object> jettyConfig = new Hashtable<>();
-
-        final Set<Integer> httpPorts = this.options.getHttpPorts();
-        final Set<Integer> httpsPorts = this.options.getHttpsPorts();
-        final Set<Integer> httpsWithClientAuthPorts = this.options.getHttpsClientAuthPorts();
-
-        final boolean isHttpEnabled = !httpPorts.isEmpty();
-        final boolean isHttpsEnabled = !httpsPorts.isEmpty() || !httpsWithClientAuthPorts.isEmpty();
-
-        jettyConfig.put(JettyConstants.HTTP_ENABLED, isHttpEnabled);
-
-        if (isHttpEnabled) {
-            jettyConfig.put("org.eclipse.kura.http.ports", httpPorts);
-        }
-
-        final String customizerClass = System
-                .getProperty(JettyConstants.PROPERTY_PREFIX + JettyConstants.CUSTOMIZER_CLASS);
-
-        if (customizerClass instanceof String) {
-            jettyConfig.put(JettyConstants.CUSTOMIZER_CLASS, customizerClass);
-        }
-
-        if (!isHttpsEnabled) {
-            return jettyConfig;
-        }
-
-        final KeystoreService currentKeystoreService = this.keystoreService;
-
-        if (currentKeystoreService == null) {
-            logger.warn("HTTPS is enabled but keystore service is not configured properly, disabling HTTPS");
-            jettyConfig.put(JettyConstants.HTTPS_ENABLED, false);
-            jettyConfig.put("kura.https.client.auth.enabled", false);
-            return jettyConfig;
-        }
-
-        jettyConfig.put(JettyConstants.HTTPS_ENABLED, isHttpsEnabled);
-
-        if (!httpsPorts.isEmpty()) {
-            jettyConfig.put("org.eclipse.kura.https.ports", httpsPorts);
-        }
-        if (!httpsWithClientAuthPorts.isEmpty()) {
-            jettyConfig.put("org.eclipse.kura.https.client.auth.ports", httpsWithClientAuthPorts);
-        }
-
-        jettyConfig.put(JettyConstants.HTTPS_HOST, "0.0.0.0");
-
-        jettyConfig.put("org.eclipse.kura.keystore.provider", (Callable<KeyStore>) currentKeystoreService::getKeyStore);
-        jettyConfig.put("org.eclipse.kura.keymanager.provider", (Function<String, List<KeyManager>>) a -> {
-            try {
-                return currentKeystoreService.getKeyManagers(a);
-            } catch (final Exception e) {
-                throw new IllegalStateException(e);
-            }
-        });
-        try {
-            jettyConfig.put("org.eclipse.kura.crl.store", currentKeystoreService.getCRLStore());
-        } catch (final KuraException e) {
-            logger.warn("failed to obtain CRL store", e);
-        }
-        jettyConfig.put(JettyConstants.SSL_KEYSTORE, "/tmp/foo");
-        jettyConfig.put(JettyConstants.SSL_PASSWORD, "foo");
-
-        final boolean isRevocationEnabled = this.options.isRevocationEnabled();
-
-        jettyConfig.put("org.eclipse.kura.revocation.check.enabled", isRevocationEnabled);
-
-        final RevocationCheckMode revocationCheckMode = this.options.getRevocationCheckMode();
-
-        if (isRevocationEnabled) {
-            final EnumSet<PKIXRevocationChecker.Option> checkerOptions;
-
-            if (revocationCheckMode == RevocationCheckMode.CRL_ONLY) {
-                checkerOptions = EnumSet.of(PKIXRevocationChecker.Option.PREFER_CRLS,
-                        PKIXRevocationChecker.Option.NO_FALLBACK);
-            } else if (revocationCheckMode == RevocationCheckMode.PREFER_CRL) {
-                checkerOptions = EnumSet.of(PKIXRevocationChecker.Option.PREFER_CRLS);
-            } else {
-                checkerOptions = EnumSet.noneOf(PKIXRevocationChecker.Option.class);
-            }
-
-            if (this.options.isRevocationSoftFailEnabled()) {
-                checkerOptions.add(PKIXRevocationChecker.Option.SOFT_FAIL);
-            }
-
-            jettyConfig.put("org.eclipse.kura.revocation.checker.options", checkerOptions);
-
-        }
-
-        return jettyConfig;
-    }
-
     private synchronized void restartHttpService() {
         deactivateHttpService();
         activateHttpService();
@@ -196,7 +99,8 @@ private synchronized void restartHttpService() {
     private synchronized void activateHttpService() {
         try {
             logger.info("starting Jetty instance...");
-            JettyConfigurator.startServer(KURA_JETTY_PID, getJettyConfig());
+            this.jettyServerHolder = new JettyServerHolder(this.options, Optional.ofNullable(this.keystoreService),
+                    this.dispatcherServlet, this.eventListener);
             logger.info("starting Jetty instance...done");
         } catch (final Exception e) {
             logger.error("Could not start Jetty Web server", e);
@@ -206,8 +110,7 @@ private synchronized void activateHttpService() {
     private synchronized void deactivateHttpService() {
         try {
             logger.info("stopping Jetty instance...");
-            JettyConfigurator.stopServer(KURA_JETTY_PID);
-            logger.info("stopping Jetty instance...done");
+            this.jettyServerHolder.stop();
         } catch (final Exception e) {
             logger.error("Could not stop Jetty Web server", e);
         }
diff --git a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/JettyServerHolder.java b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/JettyServerHolder.java
new file mode 100644
index 00000000000..97f292f3929
--- /dev/null
+++ b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/JettyServerHolder.java
@@ -0,0 +1,308 @@
+/*******************************************************************************
+ * Copyright (c) 2024 Eurotech and/or its affiliates and others
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *  Eurotech
+ *******************************************************************************/
+
+package org.eclipse.kura.http.server.manager;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.security.KeyStore;
+import java.security.cert.PKIXRevocationChecker;
+import java.util.EnumSet;
+import java.util.EventListener;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Deflater;
+
+import org.eclipse.jetty.ee10.servlet.ErrorHandler;
+import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
+import org.eclipse.jetty.ee10.servlet.ServletHolder;
+import org.eclipse.jetty.ee10.servlet.SessionHandler;
+import org.eclipse.jetty.http.HttpFields.Mutable;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.ConnectionFactory;
+import org.eclipse.jetty.server.ForwardedRequestCustomizer;
+import org.eclipse.jetty.server.HttpConfiguration;
+import org.eclipse.jetty.server.HttpConfiguration.Customizer;
+import org.eclipse.jetty.server.HttpConnectionFactory;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.SecureRequestCustomizer;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
+import org.eclipse.jetty.server.handler.ErrorHandler.ErrorRequest;
+import org.eclipse.jetty.server.handler.gzip.GzipHandler;
+import org.eclipse.jetty.session.DefaultSessionIdManager;
+import org.eclipse.jetty.session.HouseKeeper;
+import org.eclipse.jetty.util.compression.CompressionPool;
+import org.eclipse.jetty.util.compression.DeflaterPool;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.kura.KuraException;
+import org.eclipse.kura.http.server.manager.HttpServiceOptions.RevocationCheckMode;
+import org.eclipse.kura.security.keystore.KeystoreService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+
+public class JettyServerHolder {
+
+    private static final Logger logger = LoggerFactory.getLogger(JettyServerHolder.class);
+
+    private DeflaterPool deflaterPool = new DeflaterPool(CompressionPool.DEFAULT_CAPACITY, Deflater.BEST_COMPRESSION,
+            true);
+
+    private final HttpServiceOptions options;
+    private Server server;
+
+    public JettyServerHolder(final HttpServiceOptions options, final Optional<KeystoreService> keystoreService,
+            final HttpServlet httpServlet, final EventListener eventListener) {
+        this.options = options;
+
+        // TODO make it configurable from options
+        this.server = new Server(new QueuedThreadPool(200, 8));
+        this.server.setErrorHandler(new KuraErrorHandler());
+
+        for (int port : this.options.getHttpPorts()) {
+            ServerConnector httpConnector = createHttpConnector(port);
+            addConnector(httpConnector);
+        }
+
+        if (keystoreService.isPresent()) {
+            for (int port : this.options.getHttpsPorts()) {
+                try {
+                    ServerConnector httpsConnector = createHttpsConnector(keystoreService.get(), port, false);
+                    addConnector(httpsConnector);
+                } catch (Exception e) {
+                    logger.error("Unable to create https connector", e);
+                }
+            }
+            for (int port : this.options.getHttpsClientAuthPorts()) {
+                try {
+                    ServerConnector httpsConnector = createHttpsConnector(keystoreService.get(), port, true);
+                    addConnector(httpsConnector);
+                } catch (Exception e) {
+                    logger.error("Unable to create https connector", e);
+                }
+            }
+        }
+
+        ServletHolder holder = new ServletHolder(httpServlet);
+        holder.setInitOrder(0);
+        ServletContextHandler httpContext = createServletContextHandler();
+        httpContext.addServlet(holder, "/*");
+        httpContext.addEventListener(eventListener);
+
+        this.server.setHandler(httpContext);
+
+        DefaultSessionIdManager idMgr = new DefaultSessionIdManager(server);
+        server.addBean(idMgr, true);
+
+        HouseKeeper houseKeeper = new HouseKeeper();
+        houseKeeper.setSessionIdManager(idMgr);
+        idMgr.setSessionHouseKeeper(houseKeeper);
+        try {
+            server.start();
+            SessionHandler sessionManager = httpContext.getSessionHandler();
+            sessionManager.addEventListener(eventListener);
+        } catch (Exception e) {
+            logger.error("Unable to start Jetty server", e);
+        }
+
+    }
+
+    private ServletContextHandler createServletContextHandler() {
+
+        ServletContextHandler servletContextHandler = new ServletContextHandler();
+        servletContextHandler.setClassLoader(this.getClass().getClassLoader());
+        servletContextHandler.setContextPath("/"); // TODO evaluate configurability
+
+        BundleContext context = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
+        File jettyWorkDir = new File(context.getDataFile(""), "jettyWorkDir_"); // TODO evaluate configurability
+        jettyWorkDir.mkdir();
+
+        servletContextHandler.setAttribute("jakarta.servlet.context.tempdir", jettyWorkDir);
+        SessionHandler handler = new SessionHandler();
+        // handler.setMaxInactiveInterval(-1); // TODO evaluate configurability
+        servletContextHandler.setSessionHandler(handler);
+
+        final GzipHandler gzipHandler = new GzipHandler();
+        gzipHandler.setDeflaterPool(this.deflaterPool);
+
+        servletContextHandler.insertHandler(gzipHandler);
+
+        servletContextHandler.setErrorHandler(new ErrorHandler() {
+
+            @Override
+            protected void writeErrorPage(HttpServletRequest request, Writer writer, int code, String message,
+                    boolean showStacks) throws IOException {
+                // do nothing
+            }
+
+        });
+
+        final SessionCookieConfig cookieConfig = servletContextHandler.getSessionHandler().getSessionCookieConfig();
+
+        cookieConfig.setHttpOnly(true);
+
+        return servletContextHandler;
+
+    }
+
+    private void addConnector(ServerConnector httpConnector) {
+        try {
+            httpConnector.open();
+            this.server.addConnector(httpConnector);
+        } catch (IOException e) {
+            logger.error("Unable to start a connector {}", httpConnector, e);
+        }
+    }
+
+    public ServerConnector createHttpConnector(int port) {
+
+        HttpConfiguration httpConfiguration = new HttpConfiguration();
+        httpConfiguration.addCustomizer(new BlockHttpMethods(EnumSet.of(HttpMethod.TRACE)));
+
+        final ServerConnector newConnector = new ServerConnector(this.server,
+                new HttpConnectionFactory(httpConfiguration));
+
+        customizeConnector(newConnector, port);
+
+        return newConnector;
+    }
+
+    private void customizeConnector(final ServerConnector serverConnector, final int port) {
+        serverConnector.setPort(port);
+        // serverConnector.setHost("0.0.0.0"); // TODO evaluate configurability
+        for (final ConnectionFactory factory : serverConnector.getConnectionFactories()) {
+            if (!(factory instanceof HttpConnectionFactory)) {
+                continue;
+            }
+
+            ((HttpConnectionFactory) factory).getHttpConfiguration().setSendServerVersion(false);
+        }
+        addCustomizer(serverConnector, new ForwardedRequestCustomizer());
+    }
+
+    private void addCustomizer(final ServerConnector connector, final Customizer customizer) {
+        for (final ConnectionFactory factory : connector.getConnectionFactories()) {
+            if (!(factory instanceof HttpConnectionFactory)) {
+                continue;
+            }
+
+            final HttpConnectionFactory httpConnectionFactory = (HttpConnectionFactory) factory;
+
+            httpConnectionFactory.getHttpConfiguration().setSendServerVersion(false);
+
+            List<Customizer> customizers = httpConnectionFactory.getHttpConfiguration().getCustomizers();
+            if (customizers == null) {
+                customizers = new LinkedList<>();
+                httpConnectionFactory.getHttpConfiguration().setCustomizers(customizers);
+            }
+
+            customizers.add(customizer);
+        }
+    }
+
+    private static class BlockHttpMethods implements HttpConfiguration.Customizer {
+
+        private final Set<HttpMethod> blockedMethods;
+
+        public BlockHttpMethods(Set<HttpMethod> methods) {
+            this.blockedMethods = methods;
+        }
+
+        @Override
+        public Request customize(Request request, Mutable responseHeaders) {
+            if (this.blockedMethods.contains(HttpMethod.TRACE)) {
+                return new ErrorRequest(request, HttpStatus.METHOD_NOT_ALLOWED_405, "Method now allowed.", null);
+            }
+
+            return request;
+        }
+
+    }
+
+    private ServerConnector createHttpsConnector(final KeystoreService keystoreService, final int port,
+            final boolean enableClientAuth) throws KuraException {
+
+        final BaseSslContextFactory sslContextFactory;
+
+        if (enableClientAuth) {
+            sslContextFactory = new ClientAuthSslContextFactoryImpl(keystoreService, this.options.isRevocationEnabled(),
+                    getRevocationCheckerOptions());
+        } else {
+            sslContextFactory = new BaseSslContextFactory(keystoreService);
+        }
+
+        final KeyStore keystore = keystoreService.getKeyStore();
+
+        sslContextFactory.setKeyStore(keystore);
+        sslContextFactory.setTrustStore(keystore);
+
+        sslContextFactory.setProtocol("TLS");
+        sslContextFactory.setTrustManagerFactoryAlgorithm("PKIX");
+
+        sslContextFactory.setWantClientAuth(enableClientAuth);
+        sslContextFactory.setNeedClientAuth(enableClientAuth);
+
+        final HttpConfiguration httpsConfig = new HttpConfiguration();
+        httpsConfig.addCustomizer(new SecureRequestCustomizer());
+        httpsConfig.addCustomizer(new BlockHttpMethods(EnumSet.of(HttpMethod.TRACE)));
+
+        final ServerConnector connector = new ServerConnector(server,
+                new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(httpsConfig));
+        customizeConnector(connector, port);
+
+        return connector;
+    }
+
+    private EnumSet<PKIXRevocationChecker.Option> getRevocationCheckerOptions() {
+        if (!this.options.isRevocationEnabled()) {
+            return EnumSet.noneOf(PKIXRevocationChecker.Option.class);
+        }
+
+        final EnumSet<PKIXRevocationChecker.Option> checkerOptions;
+
+        if (this.options.getRevocationCheckMode() == RevocationCheckMode.CRL_ONLY) {
+            checkerOptions = EnumSet.of(PKIXRevocationChecker.Option.PREFER_CRLS,
+                    PKIXRevocationChecker.Option.NO_FALLBACK);
+        } else if (this.options.getRevocationCheckMode() == RevocationCheckMode.PREFER_CRL) {
+            checkerOptions = EnumSet.of(PKIXRevocationChecker.Option.PREFER_CRLS);
+        } else {
+            checkerOptions = EnumSet.noneOf(PKIXRevocationChecker.Option.class);
+        }
+
+        if (this.options.isRevocationSoftFailEnabled()) {
+            checkerOptions.add(PKIXRevocationChecker.Option.SOFT_FAIL);
+        }
+
+        return checkerOptions;
+    }
+
+    public void stop() {
+        try {
+            this.server.stop();
+        } catch (Exception e) {
+            logger.warn("Unable to stop the Jetty server", e);
+        }
+    }
+
+}
diff --git a/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/KuraErrorHandler.java b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/KuraErrorHandler.java
new file mode 100644
index 00000000000..1f9beb3b1b7
--- /dev/null
+++ b/kura/org.eclipse.kura.http.server.manager/src/main/java/org/eclipse/kura/http/server/manager/KuraErrorHandler.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2019, 2024 Eurotech and/or its affiliates and others
+ 
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Eurotech
+ *******************************************************************************/
+package org.eclipse.kura.http.server.manager;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Writer;
+import java.nio.charset.Charset;
+
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.ErrorHandler;
+
+public class KuraErrorHandler extends ErrorHandler {
+
+    @Override
+    protected void writeErrorHtml(Request request, Writer writer, Charset charset, int code, String message,
+            Throwable cause, boolean showStacks) throws IOException {
+        // do nothing
+    }
+
+    @Override
+    protected void writeErrorPlain(Request request, PrintWriter writer, int code, String message, Throwable cause,
+            boolean showStacks) {
+        // do nothing
+    }
+
+    @Override
+    protected void writeErrorJson(Request request, PrintWriter writer, int code, String message, Throwable cause,
+            boolean showStacks) {
+        // do nothing
+    }
+
+}
diff --git a/kura/test/org.eclipse.kura.rest.packages.provider.test/pom.xml b/kura/test/org.eclipse.kura.rest.packages.provider.test/pom.xml
index d0222256146..2e738229728 100644
--- a/kura/test/org.eclipse.kura.rest.packages.provider.test/pom.xml
+++ b/kura/test/org.eclipse.kura.rest.packages.provider.test/pom.xml
@@ -428,16 +428,6 @@
                             <level>4</level>
                             <autoStart>true</autoStart>
                         </bundle>
-                        <bundle>
-                            <id>org.eclipse.kura.jetty.customizer</id>
-                            <level>2</level>
-                            <autoStart>false</autoStart>
-                        </bundle>
-                        <bundle>
-                            <id>org.eclipse.equinox.http.jetty</id>
-                            <level>3</level>
-                            <autoStart>false</autoStart>
-                        </bundle>
                         <bundle>
                             <id>org.eclipse.kura.http.server.manager</id>
                             <level>4</level>
@@ -623,16 +613,6 @@
                                 <id>org.eclipse.kura.deployment.agent</id>
                                 <versionRange>0.0.0</versionRange>
                             </requirement>
-                            <requirement>
-                                <type>eclipse-plugin</type>
-                                <id>org.eclipse.kura.jetty.customizer</id>
-                                <versionRange>0.0.0</versionRange>
-                            </requirement>
-                            <requirement>
-                                <type>eclipse-plugin</type>
-                                <id>org.eclipse.equinox.http.jetty</id>
-                                <versionRange>0.0.0</versionRange>
-                            </requirement>
                             <requirement>
                                 <type>eclipse-plugin</type>
                                 <id>org.eclipse.kura.rest.provider</id>
diff --git a/kura/test/org.eclipse.kura.wire.script.filter.provider.test/pom.xml b/kura/test/org.eclipse.kura.wire.script.filter.provider.test/pom.xml
index fc7c3707b0f..2a81af7ffe9 100644
--- a/kura/test/org.eclipse.kura.wire.script.filter.provider.test/pom.xml
+++ b/kura/test/org.eclipse.kura.wire.script.filter.provider.test/pom.xml
@@ -218,16 +218,6 @@
                                 <id>org.eclipse.kura.wire.script.filter.provider</id>
                                 <versionRange>0.0.0</versionRange>
                             </requirement>
-                            <requirement>
-                                <type>eclipse-plugin</type>
-                                <id>org.eclipse.kura.jetty.customizer</id>
-                                <versionRange>0.0.0</versionRange>
-                            </requirement>
-                            <requirement>
-                                <type>eclipse-plugin</type>
-                                <id>org.eclipse.equinox.http.jetty</id>
-                                <versionRange>0.0.0</versionRange>
-                            </requirement>
                             <requirement>
                                 <type>eclipse-plugin</type>
                                 <id>org.eclipse.kura.rest.provider</id>
@@ -675,16 +665,6 @@
                             <level>4</level>
                             <autoStart>true</autoStart>
                         </bundle>
-                        <bundle>
-                            <id>org.eclipse.kura.jetty.customizer</id>
-                            <level>2</level>
-                            <autoStart>false</autoStart>
-                        </bundle>
-                        <bundle>
-                            <id>org.eclipse.equinox.http.jetty</id>
-                            <level>3</level>
-                            <autoStart>false</autoStart>
-                        </bundle>
                         <bundle>
                             <id>org.eclipse.kura.http.server.manager</id>
                             <level>4</level>
diff --git a/kura/test/pom.xml b/kura/test/pom.xml
index f3e53173f50..cd61bc5629d 100644
--- a/kura/test/pom.xml
+++ b/kura/test/pom.xml
@@ -546,11 +546,7 @@
                                 <level>4</level>
                                 <autoStart>true</autoStart>
                             </bundle>
-                            <bundle>
-                                <id>org.eclipse.kura.jetty.customizer</id>
-                                <level>2</level>
-                                <autoStart>false</autoStart>
-                            </bundle>
+
                             <bundle>
                                 <id>org.eclipse.equinox.http.jetty</id>
                                 <level>3</level>
@@ -773,11 +769,6 @@
                                     <id>org.eclipse.kura.deployment.agent</id>
                                     <versionRange>0.0.0</versionRange>
                                 </requirement>
-                                <requirement>
-                                    <type>eclipse-plugin</type>
-                                    <id>org.eclipse.kura.jetty.customizer</id>
-                                    <versionRange>0.0.0</versionRange>
-                                </requirement>
                                 <requirement>
                                     <type>eclipse-plugin</type>
                                     <id>org.eclipse.equinox.http.jetty</id>
diff --git a/target-platform/org.eclipse.kura.jetty.customizer/src/main/java/org/eclipse/kura/jetty/customizer/KuraJettyCustomizer.java b/target-platform/org.eclipse.kura.jetty.customizer/src/main/java/org/eclipse/kura/jetty/customizer/KuraJettyCustomizer.java
index e1808bd1cf5..d162c6bae7b 100644
--- a/target-platform/org.eclipse.kura.jetty.customizer/src/main/java/org/eclipse/kura/jetty/customizer/KuraJettyCustomizer.java
+++ b/target-platform/org.eclipse.kura.jetty.customizer/src/main/java/org/eclipse/kura/jetty/customizer/KuraJettyCustomizer.java
@@ -32,6 +32,7 @@
 import java.util.zip.Deflater;
 
 import javax.net.ssl.KeyManager;
+import javax.servlet.SessionCookieConfig;
 
 import org.eclipse.equinox.http.jetty.JettyConstants;
 import org.eclipse.equinox.http.jetty.JettyCustomizer;
diff --git a/target-platform/p2-repo-equinox/pom.xml b/target-platform/p2-repo-equinox/pom.xml
index fa54b4faa27..828db889c5c 100644
--- a/target-platform/p2-repo-equinox/pom.xml
+++ b/target-platform/p2-repo-equinox/pom.xml
@@ -62,13 +62,6 @@
                                     <artifactId>org.apache.felix.http.servlet-api</artifactId>
                                     <version>${org.apache.felix.http.servlet-api.version}</version>
                                 </artifactItem>
-
-                                <artifactItem>
-                                    <groupId>org.apache.felix</groupId>
-                                    <artifactId>org.apache.felix.http.jetty12</artifactId>
-                                    <classifier>light</classifier>
-                                    <version>${org.apache.felix.http.jetty12.version}</version>
-                                </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.felix</groupId>
                                     <artifactId>org.apache.felix.http.bridge</artifactId>
@@ -125,18 +118,8 @@
                                     <version>${org.eclipse.jetty.version}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.eclipse.jetty.ee8</groupId>
-                                    <artifactId>jetty-ee8-security</artifactId>
-                                    <version>${org.eclipse.jetty.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.jetty.ee8</groupId>
-                                    <artifactId>jetty-ee8-servlet</artifactId>
-                                    <version>${org.eclipse.jetty.version}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.eclipse.jetty.ee8</groupId>
-                                    <artifactId>jetty-ee8-nested</artifactId>
+                                    <groupId>org.eclipse.jetty.ee10</groupId>
+                                    <artifactId>jetty-ee10-servlet</artifactId>
                                     <version>${org.eclipse.jetty.version}</version>
                                 </artifactItem>
                                 <artifactItem>
@@ -338,12 +321,8 @@
                                     tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.jetty-util_${org.eclipse.jetty.version}.jar" />
                                 <move file="${project.build.directory}/source/plugins/jetty-io.jar"
                                     tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.jetty-io_${org.eclipse.jetty.version}.jar" />
-                                <move file="${project.build.directory}/source/plugins/jetty-ee8-security.jar" 
-                                    tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.ee8.jetty-ee8-security_${org.eclipse.jetty.version}.jar" />
-                                <move file="${project.build.directory}/source/plugins/jetty-ee8-servlet.jar"
-                                    tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.ee8.jetty-ee8-servlet_${org.eclipse.jetty.version}.jar" />
-                                <move file="${project.build.directory}/source/plugins/jetty-ee8-nested.jar"
-                                    tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.ee8.jetty-ee8-nested_${org.eclipse.jetty.version}.jar" />
+                                <move file="${project.build.directory}/source/plugins/jetty-ee10-servlet.jar"
+                                    tofile="${project.build.directory}/source/plugins/org.eclipse.jetty.ee10.jetty-ee10-servlet_${org.eclipse.jetty.version}.jar" />
                                 <move file="${project.build.directory}/source/plugins/org.eclipse.equinox.io.jar"
                                     tofile="${project.build.directory}/source/plugins/org.eclipse.equinox.io_${org.eclipse.equinox.io.version}.jar" />
                                 <move file="${project.build.directory}/source/plugins/org.eclipse.equinox.util.jar"
@@ -390,8 +369,6 @@
 
                                  <move file="${project.build.directory}/source/plugins/org.apache.felix.http.servlet-api.jar"
                                     tofile="${project.build.directory}/source/plugins/org.apache.felix.http.servlet-api_${org.apache.felix.http.servlet-api.version}.jar" />
-                                 <move file="${project.build.directory}/source/plugins/org.apache.felix.http.jetty12-light.jar" 
-                                    tofile="${project.build.directory}/source/plugins/org.apache.felix.http.jetty12-light_${org.apache.felix.http.jetty12.version}.jar" />
                                  <move file="${project.build.directory}/source/plugins/org.apache.felix.http.bridge.jar" 
                                     tofile="${project.build.directory}/source/plugins/org.apache.felix.http.bridge_${org.apache.felix.http.bridge.version}.jar" />
                                  <move file="${project.build.directory}/source/plugins/org.apache.felix.http.proxy.jar"