diff --git a/releng/org.eclipse.ocl.oomph/setups/ocl.setup b/releng/org.eclipse.ocl.oomph/setups/ocl.setup
index 98db9b1..c2c25b8 100644
--- a/releng/org.eclipse.ocl.oomph/setups/ocl.setup
+++ b/releng/org.eclipse.ocl.oomph/setups/ocl.setup
@@ -99,6 +99,8 @@
           name="org.eclipse.uml2.sdk.feature.group"/>
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.xtext.generator"/>
       <repositoryList
           name="Latest">
         <repository
@@ -109,9 +111,9 @@
       <repositoryList
           name="2022-03">
         <repository
-            url="https://download.eclipse.org/releases/latest"/>
+            url="https://download.eclipse.org/releases/2022-03"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+            url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
       </repositoryList>
       <repositoryList
           name="2021-12">
@@ -577,6 +579,8 @@
           name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
       <requirement
           name="org.eclipse.xtext.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.xtext.generator"/>
     </setupTask>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
diff --git a/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/interim.target b/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/interim.target
index 44cc6ad..ccee8e0 100644
--- a/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/interim.target
+++ b/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/interim.target
@@ -5,12 +5,12 @@
     <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
     <repository location="https://download.eclipse.org/eclipse/updates/I-builds"/>
   </location>
-  <!--location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
     <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
     <repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly"/>
     <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone"/>
-  </location-->
+  </location>
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
     <unit id="org.eclipse.emf.validation" version="0.0.0"/>
     <!--repository location="https://download.eclipse.org/modeling/emf/validation/updates/interim"/-->
@@ -37,12 +37,13 @@
     <repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315"/>
   </location-->
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-    <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-    <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
+    <!--unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/-->
+    <!--unit id="org.eclipse.emf.examples.library" version="0.0.0"/-->
     <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.xtext.generator" version="0.0.0"/>
     <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones"/>
-    <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/latest"/>
+    <!--repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/latest"/-->
     <!--repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.15.0"/-->
   </location>
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/nightly.target b/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/nightly.target
index a1f89ce..bf98307 100644
--- a/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/nightly.target
+++ b/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/nightly.target
@@ -5,12 +5,12 @@
     <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
     <repository location="https://download.eclipse.org/eclipse/updates/I-builds"/>
   </location>
-  <!--location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+  <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
     <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
     <repository location="https://download.eclipse.org/modeling/emf/emf/builds/nightly"/>
     <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone"/>
-  </location-->
+  </location>
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
     <unit id="org.eclipse.emf.validation" version="0.0.0"/>
     <!--repository location="https://download.eclipse.org/modeling/emf/validation/updates/interim"/-->
@@ -39,11 +39,9 @@
     <repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315"/>
   </location-->
   <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-    <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-    <unit id="org.eclipse.emf.examples.library" version="0.0.0"/>
     <unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-    <!--repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/nightly/head"/-->
+    <unit id="org.eclipse.xtext.generator" version="0.0.0"/>
     <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/nightly"/>
     <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/milestones"/>
     <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/latest"/>
diff --git a/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/stable.target b/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/stable.target
index 582f832..1fbe7b3 100644
--- a/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/stable.target
+++ b/releng/org.eclipse.ocl.releng.tycho/targetPlatforms/stable.target
@@ -6,6 +6,7 @@
     <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
     <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+    <unit id="org.eclipse.xtext.generator" version="0.0.0"/>
     <repository location="https://download.eclipse.org/releases/latest"/>
     <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone"/>
     <repository location="https://download.eclipse.org/modeling/mdt/uml2/updates/milestones"/>