diff --git a/releng/org.eclipse.emf.diffmerge.coevolution.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.coevolution.configuration/pom.xml
index 33e9fbd..bdcdcac 100644
--- a/releng/org.eclipse.emf.diffmerge.coevolution.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.coevolution.configuration/pom.xml
@@ -41,6 +41,8 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
+					<targetDefinitionIncludeSource>ignore</targetDefinitionIncludeSource>
+					<executionEnvironment>JavaSE-17</executionEnvironment>
 					<target>
 						<artifact>
 							<groupId>org.eclipse.emf.diffmerge</groupId>
@@ -91,7 +93,7 @@
 							<configuration>
 								<toolchains>
 									<jdk>
-										<id>JavaSE-${java.version}</id>
+										<id>JavaSE-17</id>
 									</jdk>
 								</toolchains>
 							</configuration>
diff --git a/releng/org.eclipse.emf.diffmerge.coevolution.configuration/toolchains-hipp.xml b/releng/org.eclipse.emf.diffmerge.coevolution.configuration/toolchains-hipp.xml
index cbfbd2b..027cd80 100644
--- a/releng/org.eclipse.emf.diffmerge.coevolution.configuration/toolchains-hipp.xml
+++ b/releng/org.eclipse.emf.diffmerge.coevolution.configuration/toolchains-hipp.xml
@@ -1,75 +1,20 @@
-<toolchains>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <id>JavaSE-11</id>
-    </provides>
-    <configuration>
-      <jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <id>JavaSE-1.8</id>
-    </provides>
-    <configuration>
-      <jdkHome>/opt/tools/java/oracle/jdk-8/latest</jdkHome>
-      <bootClassPath>
-        <includes>
-          <include>jre/lib/*</include>
-          <include>jre/lib/ext/*</include>
-          <include>jre/lib/endorsed*</include>
-        </includes>
-      </bootClassPath>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <id>JavaSE-1.7</id>
-    </provides>
-    <configuration>
-      <jdkHome>/opt/tools/java/oracle/jdk-7/latest</jdkHome>
-      <bootClassPath>
-        <includes>
-          <include>jre/lib/*</include>
-          <include>jre/lib/ext/*</include>
-          <include>jre/lib/endorsed*</include>
-        </includes>
-      </bootClassPath>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <id>JavaSE-1.6</id>
-    </provides>
-    <configuration>
-      <jdkHome>/opt/tools/java/oracle/jdk-6/latest</jdkHome>
-      <bootClassPath>
-        <includes>
-          <include>jre/lib/*</include>
-          <include>jre/lib/ext/*</include>
-          <include>jre/lib/endorsed*</include>
-        </includes>
-      </bootClassPath>
-    </configuration>
-  </toolchain>
-  <toolchain>
-    <type>jdk</type>
-    <provides>
-      <id>J2SE-1.5</id>
-    </provides>
-    <configuration>
-      <jdkHome>/opt/tools/java/oracle/jdk-5/latest</jdkHome>
-      <bootClassPath>
-        <includes>
-          <include>jre/lib/*</include>
-          <include>jre/lib/ext/*</include>
-          <include>jre/lib/endorsed*</include>
-        </includes>
-      </bootClassPath>
-    </configuration>
-  </toolchain>
-</toolchains>
+<toolchains>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <id>JavaSE-11</id>
+    </provides>
+    <configuration>
+      <jdkHome>/opt/tools/java/openjdk/jdk-11/latest</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <id>JavaSE-17</id>
+    </provides>
+    <configuration>
+      <jdkHome>/opt/tools/java/openjdk/jdk-17/latest</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>
diff --git a/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.target b/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.target
index c72e2a7..22d2d0c 100644
--- a/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.target
+++ b/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.target
@@ -5,12 +5,17 @@
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-      <repository id="GMF-Notation-1.13.1" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/>
+      <repository id="GMF-Notation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.gmf.runtime.thirdparty.feature.group" version="0.0.0"/>
-      <repository id="GMF-Runtime-1.15.3" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
+      <repository id="GMF-Runtime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202401081627"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
+      <repository id="GEF-Classic" location="https://download.eclipse.org/tools/gef/classic/releases/3.17.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
@@ -35,14 +40,13 @@
       <unit id="org.eclipse.emf.transaction.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.validation.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.gef.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
       <repository location="https://download.eclipse.org/releases/2023-03"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-      <unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="0.0.0"/>
-      <repository id="sirius" location="https://download.eclipse.org/sirius/updates/stable/7.2.0-S20230411-075209/2023-03"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240408-053509/2023-03"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.eef.runtime" version="0.0.0"/>
diff --git a/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.tpd b/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.tpd
index 8f3983a..536d74e 100644
--- a/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.tpd
+++ b/releng/org.eclipse.emf.diffmerge.coevolution.target/org.eclipse.emf.diffmerge.coevolution.target.tpd
@@ -1,14 +1,19 @@
 target "org.eclipse.emf.diffmerge.coevolution" with source, requirements
 
-location GMF-Notation-1.13.1 "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" {
+location GMF-Notation "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334" {
     org.eclipse.gmf.runtime.notation.sdk.feature.group lazy
 }
 
-location GMF-Runtime-1.15.3 "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/" {
+location GMF-Runtime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202311130907" {
     org.eclipse.gmf.runtime.sdk.feature.group lazy
     org.eclipse.gmf.runtime.thirdparty.feature.group lazy
 }
 
+location GEF-Classic  "https://download.eclipse.org/tools/gef/classic/releases/3.17.0" {
+    org.eclipse.gef.feature.group lazy
+    org.eclipse.draw2d.feature.group lazy
+}
+
 location "https://download.eclipse.org/cbi/updates/license/" {
 	org.eclipse.license.feature.group [2.0.2.v20181016-2210,2.0.2.v20181016-2210]
 }
@@ -32,13 +37,12 @@ location "https://download.eclipse.org/releases/2023-03" {
 	org.eclipse.emf.transaction.feature.group lazy
 	org.eclipse.emf.validation.feature.group lazy
 	org.eclipse.emf.edit.feature.group lazy
-  	org.eclipse.gef.feature.group lazy
 	org.eclipse.uml2.sdk.feature.group lazy
 }
 
-location sirius "https://download.eclipse.org/sirius/updates/stable/7.2.0-S20230411-075209/2023-03" {
+location "https://download.eclipse.org/sirius/updates/stable/7.4.1-S20240408-053509/2023-03" {
 	org.eclipse.sirius.specifier.feature.group lazy
-    org.eclipse.sirius.specifier.ide.ui.feature.group lazy	
+	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
 }
 
 location EEF-1.5 "https://download.eclipse.org/modeling/emft/eef/updates/releases/1.5/R201601141612" {