diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
index 592823659..cececaec2 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -135,7 +135,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2019-09"
+      defaultValue="2020-03"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup:VariableTask"
@@ -595,9 +595,9 @@
               url="https://dl.bintray.com/lorenzobettini/xtext-xdoc/updates/"/>
         </repositoryList>
         <repositoryList
-            name="2019-12">
+            name="2020-03">
           <repository
-              url="https://download.eclipse.org/releases/2019-12/"/>
+              url="https://download.eclipse.org/staging/2020-03/"/>
           <repository
               url="https://download.eclipse.org/cbi/updates/license"/>
           <repository
@@ -804,8 +804,8 @@
       <setupTask
           xsi:type="setup:VariableTask"
           name="eclipse.target.platform"
-          value="2019-12"
-          defaultValue="2019-12"
+          value="2020-03"
+          defaultValue="2020-03"
           storageURI="scope://Workspace"/>
       <setupTask
           xsi:type="setup.p2:P2Task"
@@ -813,7 +813,7 @@
           licenseConfirmationDisabled="true">
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"
-            versionRange="[2.20.0,2.21.0)"/>
+            versionRange="[2.21.0,2.22.0)"/>
         <requirement
             name="de.itemis.xtext.antlr.feature.feature.group"/>
         <repository
@@ -827,11 +827,11 @@
       <setupTask
           xsi:type="setup:VariableTask"
           name="mwe2.site"
-          value="http://download.eclipse.org/staging/2019-12/"/>
+          value="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.1"/>
       <setupTask
           xsi:type="setup:VariableTask"
           name="xtext.site"
-          value="http://download.eclipse.org/staging/2019-12/"/>
+          value="https://download.eclipse.org/modeling/tmf/xtext/updates/nightly/"/>
       <description>Branch for the next Simrel</description>
     </stream>
     <description>EMF Parsley version for RCP</description>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-staging-rap.target
new file mode 100644
index 000000000..dc4f719ec
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-staging-rap.target
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="2020-03-staging-rap" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.rap.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.sdk.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.examples.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.rap.equinox.target.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.xtext.xbase.lib.feature.group" version="0.0.0"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="javax.inject" version="0.0.0"/>
+<unit id="org.apache.log4j" version="0.0.0"/>
+<unit id="com.google.inject" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.edit.ui.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.rap.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.util.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.server.db.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.databinding.edit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.ecore.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/staging/2020-03/"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-staging.target
new file mode 100644
index 000000000..68ca73f2a
--- /dev/null
+++ b/devtools/org.eclipse.emf.parsley.targetplatform/2020-03-staging.target
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+
+<target name="2020-03-staging" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="de.itemis.xtext.antlr.feature.feature.group" version="2.1.1.v201405091103"/>
+<repository location="http://download.itemis.com/updates/releases/2.1.1/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_adapters.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_adapters.ext.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.server_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jst.web_ui.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
+<unit id="org.hamcrest.library" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/staging/2020-03/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/nightly/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" 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.11.1"/>
+</location>
+</locations>
+</target>
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2018-09-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2018-09-rap.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2018-09-rap.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2018-09-rap.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2018-09.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2018-09.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2018-09.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2018-09.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2018-12-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2018-12-staging-rap.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2018-12-staging-rap.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2018-12-staging-rap.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2018-12-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2018-12-staging.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2018-12-staging.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2018-12-staging.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-03-staging-rap.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging-rap.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-03-staging-rap.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-03-staging.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-03-staging.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-03-staging.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-06-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06-rap.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-06-rap.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06-rap.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-06-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06-staging-rap.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-06-staging-rap.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06-staging-rap.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-06-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06-staging.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-06-staging.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06-staging.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-06.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-06.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-06.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-09-staging-rap.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-09-staging-rap.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-09-staging-rap.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-09-staging-rap.target
diff --git a/devtools/org.eclipse.emf.parsley.targetplatform/2019-09-staging.target b/devtools/org.eclipse.emf.parsley.targetplatform/old/2019-09-staging.target
similarity index 100%
rename from devtools/org.eclipse.emf.parsley.targetplatform/2019-09-staging.target
rename to devtools/org.eclipse.emf.parsley.targetplatform/old/2019-09-staging.target
diff --git a/devtools/org.eclipse.emf.parsley.workspace/feature.xml b/devtools/org.eclipse.emf.parsley.workspace/feature.xml
index bd3d25263..87d7f3061 100644
--- a/devtools/org.eclipse.emf.parsley.workspace/feature.xml
+++ b/devtools/org.eclipse.emf.parsley.workspace/feature.xml
@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.xtext.sdk" version="2.20.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.sdk" version="2.21.0" match="equivalent"/>
       <import feature="org.eclipse.swtbot.eclipse" version="2.5.0.201609021837"/>
       <import feature="org.eclipse.swtbot.ide" version="2.5.0.201609021837"/>
    </requires>
diff --git a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
index 29a08a89c..efc8d94df 100644
--- a/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
+++ b/features/org.eclipse.emf.parsley.dsl.feature/feature.xml
@@ -23,8 +23,8 @@ It aims at providing a set of Components like Trees, Tables and Detail Forms tha
    </license>
 
    <requires>
-      <import feature="org.eclipse.xtext.xbase" version="2.20.0" match="equivalent"/>
-      <import feature="org.eclipse.xtext.ui" version="2.20.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.xbase" version="2.21.0" match="equivalent"/>
+      <import feature="org.eclipse.xtext.ui" version="2.21.0" match="equivalent"/>
    </requires>
 
    <plugin
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index 4a3c2f151..c2bbef79b 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -66,7 +66,7 @@
 		<findbugs-version>3.0.5</findbugs-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<xtext-version>2.20.0</xtext-version>
+		<xtext-version>2.21.0-SNAPSHOT</xtext-version>
 		<xtextVersion>${xtext-version}</xtextVersion>
 		<mwe2Version>2.11.1</mwe2Version>
 		<emf.version>(2.8,3.0)</emf.version>
@@ -174,7 +174,7 @@
 		<swtbot.tests.skip>false</swtbot.tests.skip>
 		<swtbot.cdo.tests.skip>false</swtbot.cdo.tests.skip>
 
-		<target-file-name>2019-12-staging</target-file-name>
+		<target-file-name>2020-03-staging</target-file-name>
 
 		<ant-files-path>${basedir}/../../releng/org.eclipse.emf.parsley.parent/ant</ant-files-path>
 	</properties>
@@ -299,7 +299,7 @@
 			</modules>
 			<properties>
 				<findbugs.skip>true</findbugs.skip>
-				<target-file-name>2019-12-staging-rap</target-file-name>
+				<target-file-name>2020-03-staging-rap</target-file-name>
 			</properties>
 
 		</profile>