diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a056a3..1fc6882 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: 'maven'
       - name: Setup Display
         run: |
diff --git a/releng/org.eclipse.emf.validation.releng/pom.xml b/releng/org.eclipse.emf.validation.releng/pom.xml
index 5a59d59..f994a8a 100644
--- a/releng/org.eclipse.emf.validation.releng/pom.xml
+++ b/releng/org.eclipse.emf.validation.releng/pom.xml
@@ -12,7 +12,7 @@
 
   <!-- this is the parent POM from which all modules inherit common settings -->
   <properties>
-    <tycho.version>4.0.11</tycho.version>
+    <tycho.version>4.0.12</tycho.version>
     <cbi-plugins.version>1.5.2</cbi-plugins.version>
     <cyclonedx.version>2.9.1</cyclonedx.version>
     <maven.test.failure.ignore>true</maven.test.failure.ignore>
@@ -84,6 +84,7 @@
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho.version}</version>
         <configuration>
+          <executionEnvironment>JavaSE-21</executionEnvironment>
           <!-- add target file content to target platform -->
           <target>
             <artifact>
diff --git a/releng/org.eclipse.emf.validation.target/2024-09.target b/releng/org.eclipse.emf.validation.target/2024-09.target
index 3d4fcd0..94b3ce3 100644
--- a/releng/org.eclipse.emf.validation.target/2024-09.target
+++ b/releng/org.eclipse.emf.validation.target/2024-09.target
@@ -9,18 +9,18 @@
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
       <unit id="org.eclipse.platform.ide" version="0.0.0"/>
-      <repository id="Eclipse-4.33" location="https://download.eclipse.org/eclipse/updates/4.33-I-builds/"/>
+      <repository id="Eclipse-4.33" location="https://download.eclipse.org/eclipse/updates/4.33/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.examples.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.emf.ecore.edit.feature.group" version="0.0.0"/>
-      <repository id="EMF-2.39" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
+      <repository id="EMF-2.39" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.ocl.feature.group" version="0.0.0"/>
-      <repository id="OCL-6.20" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.20.0/"/>
+      <repository id="OCL-6.22" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.22.0/"/>
     </location>
   </locations>
 </target>
diff --git a/releng/org.eclipse.emf.validation.target/2024-12.target b/releng/org.eclipse.emf.validation.target/2024-12.target
new file mode 100644
index 0000000..4143cd0
--- /dev/null
+++ b/releng/org.eclipse.emf.validation.target/2024-12.target
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<target name="emf-validation-2024-12" sequenceNumber="1660142140">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository id="Eclipse-Shared-License" location="https://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+      <unit id="org.eclipse.platform.ide" version="0.0.0"/>
+      <repository id="Eclipse-4.34" location="https://download.eclipse.org/eclipse/updates/4.34/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.examples.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.ecore.edit.feature.group" version="0.0.0"/>
+      <repository id="EMF-2.40" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.40.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.feature.group" version="0.0.0"/>
+      <repository id="OCL-6.22" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.22.0/"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/org.eclipse.emf.validation.target/2025-03.target b/releng/org.eclipse.emf.validation.target/2025-03.target
new file mode 100644
index 0000000..790c071
--- /dev/null
+++ b/releng/org.eclipse.emf.validation.target/2025-03.target
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<target name="emf-validation-2025-03" sequenceNumber="1660142140">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository id="Eclipse-Shared-License" location="https://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+      <unit id="org.eclipse.platform.ide" version="0.0.0"/>
+      <repository id="Eclipse-4.35" location="https://download.eclipse.org/eclipse/updates/4.35/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.examples.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.ecore.edit.feature.group" version="0.0.0"/>
+      <repository id="EMF-2.41" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.41.0"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.feature.group" version="0.0.0"/>
+      <repository id="OCL-6.22" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.22.0/"/>
+    </location>
+  </locations>
+</target>
diff --git a/releng/org.eclipse.emf.validation.target/2025-06.target b/releng/org.eclipse.emf.validation.target/2025-06.target
new file mode 100644
index 0000000..f91ddc0
--- /dev/null
+++ b/releng/org.eclipse.emf.validation.target/2025-06.target
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<target name="emf-validation-2025-06" sequenceNumber="1660142140">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository id="Eclipse-Shared-License" location="https://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+      <unit id="org.eclipse.platform.ide" version="0.0.0"/>
+      <repository id="Eclipse-4.36" location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.emf.edit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.examples.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.ecore.edit.feature.group" version="0.0.0"/>
+      <repository id="EMF-2.42" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.eclipse.ocl.feature.group" version="0.0.0"/>
+      <repository id="OCL-6.22" location="https://download.eclipse.org/modeling/mdt/ocl/builds/release/6.22.0/"/>
+    </location>
+  </locations>
+</target>