diff --git a/src/server-cm/Dockerfile b/src/server-cm/Dockerfile
index cd93f632..df5e67f9 100644
--- a/src/server-cm/Dockerfile
+++ b/src/server-cm/Dockerfile
@@ -18,20 +18,26 @@ COPY server-cm/ server-cm/
 # Build only the specific module and its dependencies
 RUN mvn -B --no-transfer-progress -DskipTests clean package -pl server-cm -am
 
-FROM docker.io/library/jetty:12-jre21-eclipse-temurin
+# Create a custom Java runtime
+RUN $JAVA_HOME/bin/jlink \
+         --add-modules java.base,java.compiler,java.desktop,java.management,java.naming,java.net.http,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.xml.crypto,jdk.unsupported,java.xml,jdk.zipfs,java.instrument \
+         --strip-debug \
+         --no-man-pages \
+         --no-header-files \
+         --compress=2 \
+         --output /javaruntime
 
-# Add metadata
-LABEL org.opencontainers.image.title="OSLC RefImpl CM Server"
-LABEL org.opencontainers.image.description="OSLC Change Management Reference Implementation"
-LABEL org.opencontainers.image.source="https://github.com/oslc-op/refimpl"
-LABEL org.opencontainers.image.vendor="OSLC Open Project"
-LABEL org.opencontainers.image.licenses="EPL-2.0"
+FROM alpine:latest
 
-# WARNING DO NOT CHANGE WORKDIR or set it back to what it was before
-# $JETTY_BASE must be correct before starting Jetty
+ENV JAVA_HOME=/opt/java/openjdk
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+COPY --from=build /javaruntime $JAVA_HOME
 
-COPY --from=build /src/server-cm/target/*.war /var/lib/jetty/webapps/ROOT.war
+WORKDIR /app
 
-RUN java -jar "$JETTY_HOME/start.jar" --add-modules=ee9-deploy,ee9-jsp,ee9-jstl
+COPY --from=build /src/server-cm/target/lib/ ./lib/
+COPY --from=build /src/server-cm/target/server-cm.jar ./server-cm.jar
 
 EXPOSE 8080
+
+ENTRYPOINT ["java", "-jar", "server-cm.jar"]
diff --git a/src/server-cm/pom.xml b/src/server-cm/pom.xml
index f1da5dbb..5730bb30 100644
--- a/src/server-cm/pom.xml
+++ b/src/server-cm/pom.xml
@@ -17,7 +17,7 @@
     <groupId>co.oslc.refimpl</groupId>
     <artifactId>server-cm</artifactId>
     <version>0.3.0-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>CM</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -28,6 +28,7 @@
         <servlet.port>8801</servlet.port>
         <application.contextpath>/</application.contextpath>
         <application.filename>server-cm</application.filename>
+        <jetty.version>12.0.16</jetty.version>
         
         <!-- Start of user code properties
     -->
@@ -116,27 +117,6 @@
     </profile>
     <!-- End of user code
         -->
-        <profile>
-        <!-- some servlet containers (Tomcat) does not ship with a JSTL impl
-        In such cases, run with this profile-->
-            <id>with-jstl-impl</id>
-            <dependencies>
-              <!-- Start of user code profile_dependencies
-        -->
-        <!-- TODO: Add additional dependencies to this profile here to avoid them be overridden upon future re-generation -->
-        <!-- End of user code
-              -->
-              <dependency>
-                  <groupId>jakarta.servlet.jsp.jstl</groupId>
-                  <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-              </dependency>
-              <dependency>
-                  <groupId>org.glassfish.web</groupId>
-                  <artifactId>jakarta.servlet.jsp.jstl</artifactId>
-              </dependency>
-            </dependencies>
-        </profile>
-        
     </profiles>
     <!-- Start of user code pre_dependencies
   -->
@@ -151,6 +131,13 @@
           <scope>import</scope>
           <type>pom</type>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-bom</artifactId>
+            <version>${jetty.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
       </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -163,25 +150,21 @@
     </dependency>
     <!-- End of user code
         -->
+        <!-- Embedded Jetty 12 (EE10) -->
+        <dependency>
+            <groupId>org.eclipse.jetty.ee10</groupId>
+            <artifactId>jetty-ee10-servlet</artifactId>
+        </dependency>
+
         <!-- General dependencies -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <scope>runtime</scope>
         </dependency>
         <!-- Servlet dependencies -->
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.servlet.jsp.jstl</groupId>
-            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <!--When running with the jetty-maven-plugin, you 
-            get warnings about jsp classes being scanned from multiple locations.
-            adding the "provided" scope avoids these warnings.-->
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -245,11 +228,9 @@
             <groupId>org.eclipse.lyo.server</groupId>
             <artifactId>oauth-consumer-store</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.lyo.server</groupId>
-            <artifactId>oauth-webapp</artifactId>
-            <type>war</type>
-        </dependency>
+        <!-- Removed oauth-webapp war dependency as we are not using war overlay anymore
+             and avoiding JSP. If needed, we would need to manually handle it. -->
+
         <dependency>
             <groupId>org.eclipse.lyo</groupId>
             <artifactId>oslc-domains</artifactId>
@@ -308,56 +289,7 @@
                 </compilerArgument>
               </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.20</version>
-                <configuration>
-                  <webApp>
-                    <contextPath>${application.contextpath}</contextPath>
-                    <_initParams>
-                        <org.eclipse.jetty.servlet.Default.useFileMappedBuffer>false</org.eclipse.jetty.servlet.Default.useFileMappedBuffer>
-                    </_initParams>
-                  </webApp>
-                  <httpConnector>
-                    <port>${servlet.port}</port>
-                  </httpConnector>
-                  <scan>5</scan>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven3-plugin</artifactId>
-                <version>1.10.25</version>
-                <configuration>
-                    <!--This plugins supports the following containers-->
-                    <container>
-                        <!--These containers are know to work-->
-                        <containerId>tomcat10x</containerId>
-                        <containerId>jetty12x</containerId>
-                        <!-- <containerId>payara</containerId> -->
-                        <!-- <containerId>wildfly26x</containerId> -->
-                        <!--These containers are know to fail-->
-                        <!-- Context Root Not Found -->
-                        <!-- <containerId>liberty</containerId> -->
-                    </container>
-                    <configuration>
-                        <properties>
-                            <cargo.servlet.port>${servlet.port}</cargo.servlet.port>
-                        </properties>
-                    </configuration>
-                    <deployables>
-                        <deployable>
-                            <type>war</type>
-                            <location>${project.build.directory}/${project.build.finalName}.war</location>
-                            <properties>
-                                <context>${application.contextpath}</context>
-                            </properties>
-                        </deployable>
-                    </deployables>
-                </configuration>
-            </plugin>
-            <!-- Swagger-ui -->
+
             <plugin>
                 <!-- Download Swagger UI webjar. -->
                 <groupId>org.apache.maven.plugins</groupId>
@@ -365,6 +297,7 @@
                 <version>3.9.0</version>
                 <executions>
                     <execution>
+                        <id>unpack-swagger-ui</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -377,29 +310,68 @@
                                     <version>${swagger-ui.version}</version>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.directory}/swagger-ui</outputDirectory>
+                            <!-- Unpack to classes so it is included in the jar -->
+                            <outputDirectory>${project.build.outputDirectory}/static/swagger-ui</outputDirectory>
+                            <includes>**/*.*</includes>
+                        </configuration>
+                    </execution>
+                     <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                            <includeScope>runtime</includeScope>
+                            <useBaseVersion>true</useBaseVersion>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
-                <!-- Add Swagger UI resources to the war file. -->
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.5.1</version>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
                 <configuration>
-                    <webResources combine.children="append">
-                        <resource>
-                            <directory>${project.build.directory}/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}</directory>
-                            <includes>
-                                <include>**/*.*</include>
-                            </includes>
-                            <targetPath>/swagger-ui/dist</targetPath>
-                        </resource>
-                    </webResources>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>co.oslc.refimpl.cm.Main</mainClass>
+                            <useUniqueVersions>false</useUniqueVersions>
+                        </manifest>
+                    </archive>
                 </configuration>
             </plugin>
             
+            <!-- We also need to move the unpacked swagger-ui files to the right place.
+                 The unpack above puts them in static/swagger-ui/META-INF/resources/webjars/swagger-ui/${version}/
+                 We want them in static/swagger-ui/dist/
+            -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-swagger-ui-dist</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/static/swagger-ui/dist</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.build.outputDirectory}/static/swagger-ui/META-INF/resources/webjars/swagger-ui/${swagger-ui.version}</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <!-- Start of user code plugins
             -->
             <!-- End of user code
diff --git a/src/server-cm/src/main/java/co/oslc/refimpl/cm/Main.java b/src/server-cm/src/main/java/co/oslc/refimpl/cm/Main.java
new file mode 100644
index 00000000..f1b2161d
--- /dev/null
+++ b/src/server-cm/src/main/java/co/oslc/refimpl/cm/Main.java
@@ -0,0 +1,131 @@
+package co.oslc.refimpl.cm;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.EnumSet;
+import java.util.stream.Collectors;
+
+import org.eclipse.jetty.ee10.servlet.ResourceServlet;
+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.server.Server;
+import org.eclipse.jetty.util.resource.ResourceFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.glassfish.jersey.servlet.ServletContainer;
+
+import co.oslc.refimpl.cm.gen.servlet.Application;
+import co.oslc.refimpl.cm.gen.servlet.CredentialsFilter;
+import co.oslc.refimpl.cm.gen.servlet.ServletListener;
+
+public class Main {
+    private static final Logger logger = LoggerFactory.getLogger(Main.class);
+
+    public static void main(String[] args) throws Exception {
+        int port = 8080;
+        String portEnv = System.getenv("PORT");
+        if (portEnv != null) {
+            port = Integer.parseInt(portEnv);
+        }
+
+        Server server = new Server(port);
+
+        ServletContextHandler context = new ServletContextHandler();
+        context.setContextPath("/");
+
+        // Enable Session Handler
+        context.setSessionHandler(new SessionHandler());
+
+        server.setHandler(context);
+
+        // Set Context Parameters
+        String baseUrl = System.getenv("OSLC_BASE_URL");
+        if (baseUrl == null) {
+            baseUrl = "http://localhost:" + port + "/";
+        }
+        context.setInitParameter("co.oslc.refimpl.cm.gen.servlet.baseurl", baseUrl);
+        context.setInitParameter("co.oslc.refimpl.cm.gen.servlet.cors.friends", "*");
+
+        // Add Listener
+        context.addEventListener(new ServletListener());
+
+        // Add CredentialsFilter
+        context.addFilter(CredentialsFilter.class, "/services/*", EnumSet.of(DispatcherType.REQUEST));
+
+        // Add Jersey Servlet
+        ServletHolder jerseyServlet = new ServletHolder(new ServletContainer());
+        jerseyServlet.setName("JAX-RS Servlet"); // Explicitly set name for ServletListener
+        jerseyServlet.setInitParameter("jakarta.ws.rs.Application", Application.class.getName());
+        jerseyServlet.setInitOrder(1);
+        context.addServlet(jerseyServlet, "/services/*");
+
+        // Add Index Servlet for root path
+        context.addServlet(new ServletHolder(new IndexServlet()), "/");
+
+        // Add Static Content Servlet for other assets
+        URL staticResources = Main.class.getClassLoader().getResource("static");
+        if (staticResources != null) {
+            String externalForm = staticResources.toExternalForm();
+            logger.info("Serving static content from: " + externalForm);
+
+            context.setBaseResource(ResourceFactory.of(context).newResource(externalForm));
+
+            // Use ResourceServlet for static assets
+            ServletHolder staticServlet = new ServletHolder("default", ResourceServlet.class);
+            staticServlet.setInitParameter("dirAllowed", "true");
+            staticServlet.setInitParameter("acceptRanges", "true");
+            context.addServlet(staticServlet, "/static/*");
+            // Also map swagger-ui
+            context.addServlet(staticServlet, "/swagger-ui/*");
+        } else {
+            logger.warn("Static resources not found!");
+        }
+
+        try {
+            server.start();
+            logger.info("Server started on port " + port);
+            server.join();
+        } catch (Exception e) {
+            logger.error("Error starting server", e);
+            System.exit(1);
+        }
+    }
+
+    public static class IndexServlet extends HttpServlet {
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+            // Serve static/index.html
+            // If the path is exactly "/" or "/index.html"
+            String path = req.getServletPath();
+            if (path.equals("/") || path.equals("/index.html") || path.equals("/index.jsp")) {
+                 try (InputStream in = Main.class.getClassLoader().getResourceAsStream("static/index.html")) {
+                    if (in != null) {
+                        String content = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))
+                                .lines().collect(Collectors.joining("\n"));
+
+                        resp.setContentType("text/html");
+                        resp.setCharacterEncoding("UTF-8");
+                        resp.getWriter().write(content);
+                    } else {
+                        resp.sendError(404, "Index not found");
+                    }
+                }
+            } else {
+                resp.sendError(404);
+            }
+        }
+    }
+}
diff --git a/src/server-cm/src/main/resources/static/index.html b/src/server-cm/src/main/resources/static/index.html
new file mode 100644
index 00000000..c72529ee
--- /dev/null
+++ b/src/server-cm/src/main/resources/static/index.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<!--
+ Copyright (c) 2022 Contributors to the Eclipse Foundation
+
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is derived from Lyo Designer generated code.
+-->
+<html>
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Adaptor home</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+    <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r" crossorigin="anonymous"></script>
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js" integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy" crossorigin="anonymous"></script>
+    <!-- <link href="static/css/adaptor.css" rel="stylesheet"> -->
+</head>
+<body>
+<div class="container">
+    <div class="jumbotron">
+        <h1 class="display-3">CM</h1>
+        <p class="lead">This is a homepage of the <em>CM</em> that was generated using Eclipse Lyo Toolchain Designer.</p>
+        <hr class="my-4">
+        <p class="lead">
+            <a class="btn btn-primary btn-lg" href="services/catalog/singleton" role="button">Service Provider Catalog</a>
+        </p>
+        <p>Start from the Service Provider Catalog, to navigate your adaptor's services and resources, using the available Query capabilities, Selection and Creation Dialogs.
+            Note that these are end-user HTML pages, which is very useful for debugging your adaptor.</p>
+        <p class="lead">
+            <a class="btn btn-primary btn-lg" href="swagger-ui/" role="button">Interactive Swagger UI</a>
+        </p>
+        <p>Use Swagger UI To interact with the adaptor services dedicated for RDF.</p>
+        <p>You can also copy <a href="services/openapi.yaml">this OpenAPI specification document (yaml file) of this adaptor</a> to a <a href="https://editor.swagger.io">Swagger Editor</a> to generate client SDK code for a number of languages and platforms.</p>
+        <p>The OSLC Root Services document is available at <code>services/rootservices</code></p>
+    </div>
+</div>
+</body>
+</html>
diff --git a/src/server-cm/src/main/resources/static/swagger-ui/index.html b/src/server-cm/src/main/resources/static/swagger-ui/index.html
new file mode 100644
index 00000000..e3f3a879
--- /dev/null
+++ b/src/server-cm/src/main/resources/static/swagger-ui/index.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<!--
+ Copyright (c) 2020 Contributors to the Eclipse Foundation
+
+ See the NOTICE file(s) distributed with this work for additional
+ information regarding copyright ownership.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Distribution License 1.0 which is available at
+ http://www.eclipse.org/org/documents/edl-v10.php.
+
+ SPDX-License-Identifier: BSD-3-Simple
+
+ This file is derived from Lyo Designer generated code.
+-->
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Swagger UI</title>
+    <link rel="stylesheet" type="text/css" href="./dist/swagger-ui.css" >
+    <link rel="icon" type="image/png" href="./dist/favicon-32x32.png" sizes="32x32" />
+    <link rel="icon" type="image/png" href="./dist/favicon-16x16.png" sizes="16x16" />
+    <style>
+      html
+      {
+        box-sizing: border-box;
+        overflow: -moz-scrollbars-vertical;
+        overflow-y: scroll;
+      }
+
+      *,
+      *:before,
+      *:after
+      {
+        box-sizing: inherit;
+      }
+
+      body
+      {
+        margin:0;
+        background: #fafafa;
+      }
+    </style>
+</head>
+<body>
+    <div id="swagger-ui"></div>
+    <script src="./dist/swagger-ui-bundle.js"> </script>
+    <script src="./dist/swagger-ui-standalone-preset.js"> </script>
+    <script>
+    window.onload = function() {
+      // Calculate the OpenAPI YAML URL relative to the current location
+      // Assuming this file is served at /swagger-ui/
+      // and openapi.yaml is at /services/openapi.yaml
+      const openApiUrl = "../services/openapi.yaml";
+
+      // Begin Swagger UI call region
+      const ui = SwaggerUIBundle({
+        url: openApiUrl,
+        dom_id: '#swagger-ui',
+        deepLinking: true,
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIStandalonePreset
+        ],
+        plugins: [
+          SwaggerUIBundle.plugins.DownloadUrl
+        ],
+        layout: "StandaloneLayout"
+      })
+      // End Swagger UI call region
+
+      window.ui = ui
+    }
+  </script>
+</body>
+</html>