diff --git a/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml b/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml
index 9ce4adad9ff..a5f9263ed06 100644
--- a/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml
+++ b/org.eclipse.emf.mwe2.language.sdk.dummy/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.eclipse.emf.mwe2.language.sdk"
-      version="2.20.0.v20241021-1304"
+      version="2.21.0.v20241210-1535"
       label="Dummy Feature"
       provider-name="Eclipse Xtext">
 
diff --git a/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml b/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml
index a8eb5ade04a..1f5181e18cf 100644
--- a/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml
+++ b/org.eclipse.emf.mwe2.language.sdk.dummy/pom.xml
@@ -10,7 +10,7 @@
 	<packaging>eclipse-feature</packaging>
 	<groupId>org.eclipse.emf</groupId>
 	<artifactId>org.eclipse.emf.mwe2.language.sdk</artifactId>
-	<version>2.20.0.v20241021-1304</version>
+	<version>2.21.0.v20241210-1535</version>
 
 	<properties>
 		<xtext-dev-bom-version>${project.parent.version}</xtext-dev-bom-version>
diff --git a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF
index ae67fa6ba99..7aec9eadda7 100644
--- a/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtend.performance.tests/META-INF/MANIFEST.MF
@@ -7,18 +7,18 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Vendor: Eclipse Xtext
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.36.0",
- org.eclipse.emf.mwe2.lib;bundle-version="2.20.0",
- org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0",
+ org.eclipse.emf.mwe2.lib;bundle-version="2.21.0",
+ org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0",
  org.eclipse.xtend.lib;bundle-version="2.38.0",
  org.eclipse.jdt.core;bundle-version="3.37.0",
  org.eclipse.core.resources;bundle-version="3.20.100",
  org.eclipse.core.runtime;bundle-version="3.31.0",
  org.eclipse.xtend.ide.tests;bundle-version="2.38.0",
  org.junit,
- org.eclipse.emf.mwe.utils;bundle-version="1.14.0",
+ org.eclipse.emf.mwe.utils;bundle-version="1.15.0",
  org.eclipse.ui.editors;bundle-version="3.14.300",
  org.eclipse.xtext.builder;bundle-version="2.38.0",
- org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional,
+ org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional,
  org.eclipse.xtext.ui;bundle-version="2.38.0",
  org.eclipse.xtext.ui.testing;bundle-version="2.38.0",
  org.eclipse.xtend.core.tests;bundle-version="2.38.0",
diff --git a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF
index cc393651762..a07bfeb4d90 100644
--- a/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.common.types.eclipse.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.38.0",
  org.eclipse.emf.ecore;bundle-version="2.36.0",
- org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0",
+ org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0",
  org.eclipse.xtext;bundle-version="2.38.0",
  org.eclipse.core.resources;bundle-version="3.20.100",
  org.eclipse.jdt.core;bundle-version="3.37.0",
diff --git a/org.eclipse.xtext.dev-bom/pom.xml b/org.eclipse.xtext.dev-bom/pom.xml
index f010d988e58..176d2a048d1 100644
--- a/org.eclipse.xtext.dev-bom/pom.xml
+++ b/org.eclipse.xtext.dev-bom/pom.xml
@@ -127,8 +127,8 @@
 	<properties>
 		<junit-platform-version>1.10.2</junit-platform-version>
 		<junit-jupiter-version>5.10.2</junit-jupiter-version>
-		<org.eclipse.emf.mwe2-version>2.20.0</org.eclipse.emf.mwe2-version>
-		<org.eclipse.emf.mwe-version>1.14.0</org.eclipse.emf.mwe-version>
+		<org.eclipse.emf.mwe2-version>2.21.0.M0</org.eclipse.emf.mwe2-version>
+		<org.eclipse.emf.mwe-version>1.15.0.M0</org.eclipse.emf.mwe-version>
 		<org.eclipse.lsp4j-version>0.23.1</org.eclipse.lsp4j-version>
 		<org.eclipse.jdt.core-version>3.37.0</org.eclipse.jdt.core-version>
 		<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
diff --git a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
index b33adfd6cd3..abce01748d1 100644
--- a/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0",
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.eclipse.emf.mwe2.runtime;bundle-version="2.20.0",
+ org.eclipse.emf.mwe2.runtime;bundle-version="2.21.0",
  org.eclipse.xtext.ecore;bundle-version="2.38.0",
  org.eclipse.xtext.testlanguages;bundle-version="2.38.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
diff --git a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
index c967ff80d7f..165368238ff 100644
--- a/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
@@ -38,7 +38,7 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.xtext.generator;bundle-version="2.38.0",
  org.junit;bundle-version="4.13.2",
  org.eclipse.xtext.xbase;bundle-version="2.38.0",
- org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";resolution:=optional
+ org.eclipse.emf.mwe2.lib;bundle-version="2.21.0";resolution:=optional
 Import-Package: org.apache.log4j,
  org.junit;version="4.13.2",
  org.junit.rules;version="4.13.2",
diff --git a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
index ce59592aefd..c7e3588ea43 100644
--- a/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.ide.tests/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.lsp4j.jsonrpc;bundle-version="[0.23.1,0.24.0)";resolution:=optional,
  org.eclipse.xtext.testlanguages;bundle-version="2.38.0",
  org.eclipse.xtext.testlanguages.ide;bundle-version="2.38.0",
- org.eclipse.emf.mwe2.lib;bundle-version="2.20.0",
+ org.eclipse.emf.mwe2.lib;bundle-version="2.21.0",
  org.aopalliance;bundle-version="1.0.0",
  com.google.gson;bundle-version="2.10.1"
 Import-Package: org.apache.log4j;version="1.2.24"
diff --git a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF
index 724a0105198..ee1fffa6566 100644
--- a/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.junit5.tests/META-INF/MANIFEST.MF
@@ -1,3 +1,4 @@
+
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
@@ -7,10 +8,10 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0",
- org.eclipse.emf.mwe.utils;bundle-version="1.14.0",
+ org.eclipse.emf.mwe.utils;bundle-version="1.15.0",
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.testlanguages;bundle-version="2.38.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.testing;bundle-version="2.38.0",
@@ -19,8 +20,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0",
  org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional,
  org.eclipse.xtext.xbase.lib;bundle-version="2.38.0",
  org.eclipse.xtext.xtext.generator;bundle-version="2.38.0",
- org.eclipse.emf.mwe.core;bundle-version="1.14.0",
- org.eclipse.emf.mwe2.lib;bundle-version="2.20.0",
+ org.eclipse.emf.mwe.core;bundle-version="1.15.0",
+ org.eclipse.emf.mwe2.lib;bundle-version="2.21.0",
  org.junit;bundle-version="4.13.2",
  org.aopalliance;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.xtext.sdk.feature/feature.xml b/org.eclipse.xtext.sdk.feature/feature.xml
index 4f387e37f1f..2dbebb5ab43 100644
--- a/org.eclipse.xtext.sdk.feature/feature.xml
+++ b/org.eclipse.xtext.sdk.feature/feature.xml
@@ -71,7 +71,7 @@ SPDX-License-Identifier: EPL-2.0
       <import plugin="org.eclipse.emf.common" version="2.24.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.ecore.source" version="2.26.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf.common.source" version="2.24.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.emf.mwe2.language.sdk" version="2.20.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.emf.mwe2.language.sdk" version="2.21.0" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.commons-logging" version="1.3.4" match="greaterOrEqual"/>
       <import plugin="org.apache.commons.commons-logging.source" version="1.3.4" match="greaterOrEqual"/>
    </requires>
diff --git a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
index 3d3deb27445..f73b4baa815 100644
--- a/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.tests/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0",
- org.eclipse.emf.mwe.utils;bundle-version="1.14.0",
+ org.eclipse.emf.mwe.utils;bundle-version="1.15.0",
  org.eclipse.emf.ecore;bundle-version="2.36.0";visibility:=reexport,
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.testlanguages;bundle-version="2.38.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.testing;bundle-version="2.38.0",
@@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.38.0",
  org.eclipse.xtext.xtext.generator;bundle-version="2.38.0",
  org.eclipse.xtext.xtext.wizard;bundle-version="2.38.0",
- org.eclipse.emf.mwe.core;bundle-version="1.14.0",
- org.eclipse.emf.mwe2.lib;bundle-version="2.20.0",
+ org.eclipse.emf.mwe.core;bundle-version="1.15.0",
+ org.eclipse.emf.mwe2.lib;bundle-version="2.21.0",
  org.junit;bundle-version="4.13.2",
  org.aopalliance;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
index 2e4e5e53e96..5cd1c44f8f3 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/full.target/full.target.target
@@ -12,7 +12,7 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
index 1f1d8255163..287104d5d8e 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/full/full.parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<xtextVersion>unspecified</xtextVersion>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
index 7322da02f1f..604a8075ed1 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/lsMavenTychoApp.target/lsMavenTychoApp.target.target
@@ -12,7 +12,7 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
index ae92d96c44c..bf816c98be7 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoApp/lsMavenTychoApp.parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<xtextVersion>unspecified</xtextVersion>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
index 765efdb25c7..b2d8bcba144 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/lsMavenTychoFatjar.target/lsMavenTychoFatjar.target.target
@@ -12,7 +12,7 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
index a799350031c..033251fb0bb 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/lsMavenTychoFatjar/lsMavenTychoFatjar.parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<xtextVersion>unspecified</xtextVersion>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
index ce3f27b77f8..d8d78da4df1 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/mavenTycho.target/mavenTycho.target.target
@@ -12,7 +12,7 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
index 479c48103f1..38a42ecd877 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTycho/mavenTycho.parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<xtextVersion>unspecified</xtextVersion>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target
index 3924d2ea3ad..b27691fbd96 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/mavenTychoJUnit5.target/mavenTychoJUnit5.target.target
@@ -12,7 +12,7 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml
index b3b7715ad4b..19069efba34 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoJUnit5/mavenTychoJUnit5.parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<xtextVersion>unspecified</xtextVersion>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
index 21cdee8e053..580086d76c0 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/mavenTychoP2.target/mavenTychoP2.target.target
@@ -12,7 +12,7 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
index e7071322b37..5d1e033bbc6 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2/mavenTychoP2.parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<xtextVersion>unspecified</xtextVersion>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>17</maven.compiler.source>
 		<maven.compiler.target>17</maven.compiler.target>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target
index 2657ff797d2..51b941f1fec 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/mavenTychoP2J21.target/mavenTychoP2J21.target.target
@@ -12,7 +12,7 @@
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml
index 08451583298..cb1b4b69c1e 100644
--- a/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml
+++ b/org.eclipse.xtext.tests/testdata/wizard-expectations/mavenTychoP2J21/mavenTychoP2J21.parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<properties>
 		<xtextVersion>unspecified</xtextVersion>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.source>21</maven.compiler.source>
 		<maven.compiler.target>21</maven.compiler.target>
diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java
index 3116e054b76..b567b8275f5 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/XtextVersion.java
@@ -52,14 +52,14 @@ public String getXtextGradlePluginVersion() {
 	 * @noreference
 	 */
 	public String getMweVersion() {
-		return "2.20.0";
+		return "2.21.0.M0";
 	}
 
 	/**
 	 * @noreference
 	 */
 	public String getMweBuildNumber() {
-		return "";
+		return "S202412101535";
 	}
 
 	public String getAntlrGeneratorVersion() {
diff --git a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF
index 4e79d5a8b9c..ba7af9fa6cc 100644
--- a/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.generator.dependencies/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@ Require-Bundle: de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optiona
  org.eclipse.xtext.common.types;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.xtext.xtext.generator;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";visibility:=reexport,
- org.eclipse.emf.mwe.utils;bundle-version="1.14.0";visibility:=reexport,
- org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";visibility:=reexport,
- org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";visibility:=reexport,
+ org.eclipse.emf.mwe.utils;bundle-version="1.15.0";visibility:=reexport,
+ org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";visibility:=reexport,
+ org.eclipse.emf.mwe2.lib;bundle-version="2.21.0";visibility:=reexport,
  org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";visibility:=reexport,
  org.apache.commons.commons-logging;bundle-version="1.3.4";visibility:=reexport,
  org.apache.log4j;bundle-version="1.2.24";visibility:=reexport
diff --git a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
index 8c406bb3922..0d5a1aa1279 100644
--- a/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.generator/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.38.0";x-installation:=greedy
  org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";visibility:=reexport;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="2.36.0",
  org.eclipse.emf.common;bundle-version="2.30.0",
- org.eclipse.emf.mwe2.lib;bundle-version="2.20.0";resolution:=optional,
+ org.eclipse.emf.mwe2.lib;bundle-version="2.21.0";resolution:=optional,
  org.eclipse.equinox.common;bundle-version="3.19.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  de.itemis.xtext.antlr;bundle-version="2.0.0";resolution:=optional;visibility:=reexport,
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
index 36924c47de7..d9f2547a5bf 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel.releng/tp/domainmodel.target
@@ -13,7 +13,7 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+      <repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml
index 91a44875dec..0d16090e103 100644
--- a/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml
+++ b/org.eclipse.xtext.xtext.ui.examples/projects/domainmodel/org.eclipse.xtext.example.domainmodel/pom.xml
@@ -11,7 +11,7 @@
 	<packaging>eclipse-plugin</packaging>
 
 	<properties>
-		<mwe2Version>2.20.0</mwe2Version>
+		<mwe2Version>2.21.0.M0</mwe2Version>
 	</properties>
 
 	<build>
diff --git a/org.eclipse.xtext.xtext.ui.feature/feature.xml b/org.eclipse.xtext.xtext.ui.feature/feature.xml
index edad90042b1..ab920d9a23f 100644
--- a/org.eclipse.xtext.xtext.ui.feature/feature.xml
+++ b/org.eclipse.xtext.xtext.ui.feature/feature.xml
@@ -35,7 +35,7 @@ SPDX-License-Identifier: EPL-2.0
          optional="true"/>
 
    <requires>
-      <import plugin="org.eclipse.emf.mwe2.runtime" version="2.20.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.emf.mwe2.runtime" version="2.21.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF
index 141580096fd..80b7f488949 100644
--- a/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext.xtext.ui/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@ Require-Bundle: org.eclipse.xtext.ui;bundle-version="2.38.0",
  org.eclipse.xtext.ui.shared;bundle-version="2.38.0",
  org.eclipse.ui.editors;bundle-version="3.14.300",
  org.eclipse.ui;bundle-version="3.201.0",
- org.eclipse.emf.mwe.core;bundle-version="1.14.0";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.mwe2.language;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.mwe2.launch;bundle-version="2.20.0";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.mwe.core;bundle-version="1.15.0";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.mwe2.language;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.mwe2.launch;bundle-version="2.21.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.pde.ui;bundle-version="3.13.400";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtext.builder;bundle-version="2.38.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF
index 7bb29a11050..c2620a65239 100644
--- a/org.eclipse.xtext/META-INF/MANIFEST.MF
+++ b/org.eclipse.xtext/META-INF/MANIFEST.MF
@@ -207,8 +207,8 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.37.0";visibility:=re
  org.eclipse.emf.common;bundle-version="2.30.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport,
  org.objectweb.asm;bundle-version="[9.7.1,9.8.0)";resolution:=optional,
- org.eclipse.emf.mwe.core;bundle-version="1.14.0";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.mwe.utils;bundle-version="1.14.0";resolution:=optional;visibility:=reexport,
+ org.eclipse.emf.mwe.core;bundle-version="1.15.0";resolution:=optional;visibility:=reexport,
+ org.eclipse.emf.mwe.utils;bundle-version="1.15.0";resolution:=optional;visibility:=reexport,
  org.eclipse.xtext.util;bundle-version="2.38.0";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.31.0";resolution:=optional;x-installation:=greedy,
  org.eclipse.xtend.lib;bundle-version="2.38.0",
diff --git a/xtext-latest.target b/xtext-latest.target
index ec93d3b5d1d..8b94d8efd90 100644
--- a/xtext-latest.target
+++ b/xtext-latest.target
@@ -7,7 +7,7 @@
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 			<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
diff --git a/xtext-r202403.target b/xtext-r202403.target
index ec5d9c6c41b..e80fb298aac 100644
--- a/xtext-r202403.target
+++ b/xtext-r202403.target
@@ -7,7 +7,7 @@
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 			<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
diff --git a/xtext-r202406.target b/xtext-r202406.target
index 8c3a3411499..9c12344107f 100644
--- a/xtext-r202406.target
+++ b/xtext-r202406.target
@@ -7,7 +7,7 @@
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 			<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
diff --git a/xtext-r202409.target b/xtext-r202409.target
index 47f31b636a5..af775889282 100644
--- a/xtext-r202409.target
+++ b/xtext-r202409.target
@@ -7,7 +7,7 @@
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 			<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>
diff --git a/xtext-r202412.target b/xtext-r202412.target
index cb0bf37ed87..e4feb5b9dde 100644
--- a/xtext-r202412.target
+++ b/xtext-r202412.target
@@ -7,7 +7,7 @@
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202412101535/"/>
 			<unit id="org.eclipse.emf.mwe2.launch" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.launch.ui" version="0.0.0"/>
 			<unit id="org.eclipse.emf.mwe2.language.ui" version="0.0.0"/>