diff --git a/Jenkinsfile b/Jenkinsfile
index ff31493..3e43b3f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ kind: Pod
 spec:
   containers:
   - name: ci
-    image: eclipseglsp/ci:alpine-v6.0
+    image: eclipseglsp/ci:alpine-v7.0
     resources:
       limits:
         memory: "2Gi"
@@ -65,7 +65,7 @@ pipeline {
         YARN_CACHE_FOLDER = "${env.WORKSPACE}/yarn-cache"
         SPAWN_WRAP_SHIM_ROOT = "${env.WORKSPACE}"
         EMAIL_TO= "glsp-build@eclipse.org"
-        MAVEN_VERSION = "3.9.11"
+        MAVEN_VERSION = "3.9.12"
 
     }
     
@@ -87,6 +87,14 @@ pipeline {
                 }
             }
         }
+        stage('Prepare Build') {
+            steps {
+                container('ci') {
+                    // Remove .gitignore from diagram folder to ensure artifacts are not ignored during deployment
+                    sh 'rm -f server/example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore'
+                }
+            }
+        }
         stage('Build client') {
             steps {
                 container('ci') {
diff --git a/server/example/org.eclipse.glsp.ide.workflow.editor/META-INF/MANIFEST.MF b/server/example/org.eclipse.glsp.ide.workflow.editor/META-INF/MANIFEST.MF
index 5d7dc56..d4f5c51 100644
--- a/server/example/org.eclipse.glsp.ide.workflow.editor/META-INF/MANIFEST.MF
+++ b/server/example/org.eclipse.glsp.ide.workflow.editor/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.elk.alg.common;bundle-version="0.8.1",
  org.eclipse.elk.graph;bundle-version="0.8.1",
  org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.11.0",
  org.eclipse.e4.core.contexts;bundle-version="1.8.400",
- org.eclipse.jetty.server;bundle-version="12.0.12",
+ org.eclipse.jetty.server;bundle-version="[12.1.4,13.0.0)",
  org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.ui.workbench,
  org.eclipse.e4.core.di.annotations,
diff --git a/server/example/org.eclipse.glsp.ide.workflow.editor/WorkflowEditor.launch b/server/example/org.eclipse.glsp.ide.workflow.editor/WorkflowEditor.launch
index e3691b9..a11e847 100644
--- a/server/example/org.eclipse.glsp.ide.workflow.editor/WorkflowEditor.launch
+++ b/server/example/org.eclipse.glsp.ide.workflow.editor/WorkflowEditor.launch
@@ -20,7 +20,7 @@
     <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
     <booleanAttribute key="pde.generated.config" value="false"/>
diff --git a/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF b/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF
index 100d26f..08b5562 100644
--- a/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF
+++ b/server/plugins/org.eclipse.glsp.ide.editor/META-INF/MANIFEST.MF
@@ -20,14 +20,14 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.18.0",
  org.eclipse.lsp4j;bundle-version="0.11.0",
  org.eclipse.lsp4j.websocket.jakarta;bundle-version="0.21.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.11.0",
- org.eclipse.glsp.graph;bundle-version="2.3.0",
+ org.eclipse.glsp.graph;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.glsp.server.websocket;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.glsp.server;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.e4.core.contexts;bundle-version="1.8.400",
- org.eclipse.jetty.server;bundle-version="[12.0.0,13.0.0)",
- org.eclipse.jetty.ee10.servlet;bundle-version="12.0.12",
- org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="12.0.12",
- org.eclipse.jetty.util;bundle-version="[12.0.0,13.0.0)",
+ org.eclipse.jetty.server;bundle-version="[12.1.4,13.0.0)",
+ org.eclipse.jetty.ee10.servlet;bundle-version="[12.1.4,13.0.0)",
+ org.eclipse.jetty.ee10.websocket.jakarta.server;bundle-version="[12.1.4,13.0.0)",
+ org.eclipse.jetty.util;bundle-version="[12.1.4,13.0.0)",
  org.eclipse.jface.text;bundle-version="3.0.0",
  org.eclipse.e4.ui.di,
  org.eclipse.e4.ui.model.workbench,
diff --git a/server/pom.xml b/server/pom.xml
index d225c46..cbe6985 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -59,7 +59,7 @@
 		<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
 		<checkstyle.plugin>3.4.0</checkstyle.plugin>
 		<checkstyle>8.44</checkstyle>
-		<p2.target>r2024-09</p2.target>
+		<p2.target>r2025-12</p2.target>
 	</properties>
 
 
diff --git a/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.target b/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.target
index faca374..0f02dba 100644
--- a/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.target
+++ b/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2023-12 - Minimal" sequenceNumber="1743950517">
+<target name="2023-12 - Minimal" sequenceNumber="1768798134">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="4.30.0.v20231201-0512"/>
@@ -13,10 +13,10 @@
       <repository location="http://download.eclipse.org/releases/2023-12"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee10.websocket.server" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="12.0.12"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12"/>
+      <unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.1.4"/>
+      <unit id="org.eclipse.jetty.ee10.websocket.server" version="12.1.4"/>
+      <unit id="org.eclipse.jetty.websocket.api" version="12.1.4"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="jakarta.websocket-api" version="2.2.0"/>
@@ -33,11 +33,11 @@
       <repository location="https://download.eclipse.org/glsp/server/p2/nightly/2.6"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.core" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph" version="0.8.1"/>
-      <unit id="org.eclipse.elk.graph.text" version="0.8.1"/>
-      <unit id="org.eclipse.elk.alg.layered" version="0.8.1"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
+      <unit id="org.eclipse.elk.core" version="0.11.0"/>
+      <unit id="org.eclipse.elk.graph" version="0.11.0"/>
+      <unit id="org.eclipse.elk.graph.text" version="0.11.0"/>
+      <unit id="org.eclipse.elk.alg.layered" version="0.11.0"/>
+      <repository location="https://download.eclipse.org/elk/updates/releases/0.11.0/"/>
     </location>
   </locations>
 </target>
diff --git a/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.tpd b/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.tpd
index 34fcf17..134fa69 100644
--- a/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.tpd
+++ b/server/releng/org.eclipse.glsp.ide.releng.target/r2023-12.tpd
@@ -9,7 +9,7 @@ location "http://download.eclipse.org/releases/2023-12" {
 	com.ibm.icu [74.1.0,74.1.0]
 }
 
-location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" {
+location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4" {
 	org.eclipse.jetty.ee10.websocket.jakarta.server
 	org.eclipse.jetty.ee10.websocket.server
 	org.eclipse.jetty.websocket.api	
@@ -29,7 +29,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/2.6"{
 	org.eclipse.glsp.example.workflow lazy
 }
 
-location "https://download.eclipse.org/elk/updates/releases/0.8.1/" {
+location "https://download.eclipse.org/elk/updates/releases/0.11.0/" {
 	org.eclipse.elk.core
 	org.eclipse.elk.graph
 	org.eclipse.elk.graph.text
diff --git a/server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.target b/server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.target
similarity index 75%
rename from server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.target
rename to server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.target
index bae2e82..3e60965 100644
--- a/server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.target
+++ b/server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.target
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2024-09 - Default" sequenceNumber="1757325762">
+<target name="2025-12 - Default" sequenceNumber="1768798197">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="4.33.0.v20240903-0618"/>
-      <unit id="org.eclipse.emf.sdk.feature.group" version="2.39.0.v20240731-0952"/>
-      <unit id="org.eclipse.emf.transaction.feature.group" version="1.14.0.202408231629"/>
-      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.2600.v20240722-2106"/>
-      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.500.v20240803-1337"/>
-      <repository location="http://download.eclipse.org/releases/2024-09"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.38.0.v20251201-0920"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="2.44.0.v20251106-1447"/>
+      <unit id="org.eclipse.emf.transaction.feature.group" version="1.14.2.202510231413"/>
+      <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.3100.v20251111-0406"/>
+      <unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.3.900.v20250616-0711"/>
+      <repository location="http://download.eclipse.org/releases/2025-12"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.ee10.websocket.server" version="12.0.12"/>
-      <unit id="org.eclipse.jetty.websocket.api" version="12.0.12"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12"/>
+      <unit id="org.eclipse.jetty.ee10.websocket.jakarta.server" version="12.1.4"/>
+      <unit id="org.eclipse.jetty.ee10.websocket.server" version="12.1.4"/>
+      <unit id="org.eclipse.jetty.websocket.api" version="12.1.4"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="jakarta.websocket-api" version="2.2.0"/>
       <unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
       <unit id="jakarta.servlet-api" version="6.1.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.glsp.feature.feature.group" version="0.0.0"/>
@@ -32,11 +32,11 @@
       <repository location="https://download.eclipse.org/glsp/server/p2/nightly/2.6"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.elk.core" version="0.9.1"/>
-      <unit id="org.eclipse.elk.graph" version="0.9.1"/>
-      <unit id="org.eclipse.elk.graph.text" version="0.9.1"/>
-      <unit id="org.eclipse.elk.alg.layered" version="0.9.1"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
+      <unit id="org.eclipse.elk.core" version="0.11.0"/>
+      <unit id="org.eclipse.elk.graph" version="0.11.0"/>
+      <unit id="org.eclipse.elk.graph.text" version="0.11.0"/>
+      <unit id="org.eclipse.elk.alg.layered" version="0.11.0"/>
+      <repository location="https://download.eclipse.org/elk/updates/releases/0.11.0/"/>
     </location>
   </locations>
 </target>
diff --git a/server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.tpd b/server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.tpd
similarity index 81%
rename from server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.tpd
rename to server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.tpd
index d1faea7..3fc558f 100644
--- a/server/releng/org.eclipse.glsp.ide.releng.target/r2024-09.tpd
+++ b/server/releng/org.eclipse.glsp.ide.releng.target/r2025-12.tpd
@@ -1,6 +1,6 @@
-target "2024-09 - Default" with source requirements
+target "2025-12 - Default" with source requirements
 
-location "http://download.eclipse.org/releases/2024-09" {
+location "http://download.eclipse.org/releases/2025-12" {
 	org.eclipse.platform.feature.group
 	org.eclipse.emf.sdk.feature.group 
 	org.eclipse.emf.transaction.feature.group
@@ -8,13 +8,13 @@ location "http://download.eclipse.org/releases/2024-09" {
 	org.eclipse.equinox.p2.discovery.feature.feature.group
 }
 
-location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12" {
+location "https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.1.4" {
 	org.eclipse.jetty.ee10.websocket.jakarta.server
 	org.eclipse.jetty.ee10.websocket.server
 	org.eclipse.jetty.websocket.api	
 }
 
-location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" {
+location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12" {
 	jakarta.websocket-api [2.2.0,3.0.0)
 	jakarta.inject.jakarta.inject-api [2.0.1,3.0.0)
 	jakarta.servlet-api [6.1.0,7.0.0)
@@ -28,7 +28,7 @@ location "https://download.eclipse.org/glsp/server/p2/nightly/2.6"{
 	org.eclipse.glsp.example.workflow lazy
 }
 
-location "https://download.eclipse.org/elk/updates/releases/0.9.1/" {
+location "https://download.eclipse.org/elk/updates/releases/0.11.0/" {
 	org.eclipse.elk.core
 	org.eclipse.elk.graph
 	org.eclipse.elk.graph.text
diff --git a/server/releng/org.eclipse.glsp.ide.repository/category.xml b/server/releng/org.eclipse.glsp.ide.repository/category.xml
index 67a7f9c..5d4ba8e 100644
--- a/server/releng/org.eclipse.glsp.ide.repository/category.xml
+++ b/server/releng/org.eclipse.glsp.ide.repository/category.xml
@@ -13,6 +13,6 @@
    <category-def name="org.eclipse.glsp.example" label="Workflow Example integration">
       <category name="org.eclipse.glsp"/>
    </category-def>
-   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" name="Eclipse Orbit" enabled="true" />
    <repository-reference location="https://download.eclipse.org/glsp/server/p2/nightly/2.6" name="GLSP" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12" name="Eclipse Orbit" enabled="true" />
 </site>
diff --git a/server/releng/org.eclipse.glsp.ide.repository/pom.xml b/server/releng/org.eclipse.glsp.ide.repository/pom.xml
index 69679c6..1fb3953 100644
--- a/server/releng/org.eclipse.glsp.ide.repository/pom.xml
+++ b/server/releng/org.eclipse.glsp.ide.repository/pom.xml
@@ -30,43 +30,6 @@
 					<skip>true</skip>
 				</configuration>
 			</plugin>
-			<!-- Temporarily remove .gitignore during p2 updatesite build to ensure
-				gitignored files are included in the repository -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>${maven-antrun-plugin.version}</version>
-				<executions>
-					<execution>
-						<id>remove-gitignore</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<move file="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore"
-								      tofile="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore.bak"
-								      failonerror="true"/>
-							</target>
-						</configuration>
-					</execution>
-					<execution>
-						<id>restore-gitignore</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<target>
-								<move file="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore.bak"
-								      tofile="${project.basedir}/../../example/org.eclipse.glsp.ide.workflow.editor/diagram/.gitignore"
-								      failonerror="true"/>
-							</target>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>