diff --git a/releng/org.eclipse.ocl.oomph/setups/ocl.setup b/releng/org.eclipse.ocl.oomph/setups/ocl.setup
index faf65da..493e633 100644
--- a/releng/org.eclipse.ocl.oomph/setups/ocl.setup
+++ b/releng/org.eclipse.ocl.oomph/setups/ocl.setup
@@ -19,7 +19,6 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="Photon"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="git:GitCloneTask"
@@ -78,22 +77,78 @@
         <requirement
             name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
         <requirement
-            name="org.eclipse.papyrus.sysml.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.papyrus.extra.marte.feature.feature.group"/>
-        <requirement
             name="lpg.runtime.java"/>
         <requirement
-            name="org.objectweb.asm"
-            versionRange="[5.0.0,7.0.0)"/>
+            name="org.objectweb.asm"/>
+        <repositoryList
+            name="Latest">
+          <repository
+              url="http://download.eclipse.org/releases/latest"/>
+          <repository
+              url="https://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+        </repositoryList>
+        <repositoryList
+            name="2020-06">
+          <repository
+              url="http://download.eclipse.org/releases/2020-06"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2020-03">
+          <repository
+              url="http://download.eclipse.org/releases/2020-03"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-12">
+          <repository
+              url="http://download.eclipse.org/releases/2019-12"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-09">
+          <repository
+              url="http://download.eclipse.org/releases/2019-09"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20190827152740/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-06">
+          <repository
+              url="http://download.eclipse.org/releases/2019-06"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20190602212107/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-03">
+          <repository
+              url="http://download.eclipse.org/releases/2019-03"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2018-12">
+          <repository
+              url="http://download.eclipse.org/releases/2018-12"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/>
+        </repositoryList>
+        <repositoryList
+            name="2018-09">
+          <repository
+              url="http://download.eclipse.org/releases/2018-09"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/repository/"/>
+        </repositoryList>
         <repositoryList
             name="Photon">
           <repository
               url="http://download.eclipse.org/releases/photon"/>
           <repository
-              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180531190352/repository/"/>
-          <repository
-              url="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon"/>
+              url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
         </repositoryList>
         <repositoryList
             name="Oxygen">
@@ -101,8 +156,6 @@
               url="http://download.eclipse.org/releases/oxygen"/>
           <repository
               url="http://download.eclipse.org/tools/orbit/downloads/drops/R20180330011457/repository/"/>
-          <repository
-              url="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen"/>
         </repositoryList>
         <repositoryList
             name="Neon">
@@ -110,8 +163,6 @@
               url="http://download.eclipse.org/releases/neon"/>
           <repository
               url="http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository/"/>
-          <repository
-              url="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon"/>
         </repositoryList>
         <repositoryList
             name="Mars">
@@ -119,8 +170,6 @@
               url="http://download.eclipse.org/releases/mars"/>
           <repository
               url="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
-          <repository
-              url="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars"/>
         </repositoryList>
         <repositoryList
             name="Luna">
@@ -139,8 +188,6 @@
       <requirement
           name="org.eclipse.emf.sdk.feature.group"/>
       <requirement
-          name="org.eclipse.emf.ecoretools.sdk.feature.group"/>
-      <requirement
           name="org.eclipse.xtext.sdk.feature.group"/>
       <requirement
           name="org.eclipse.egit.feature.group"/>
@@ -150,6 +197,8 @@
           name="org.eclipse.ocl.examples.feature.group"/>
       <requirement
           name="org.eclipse.m2m.qvt.oml.sdk.feature.group"/>
+      <requirement
+          name="org.eclipse.uml2.sdk.feature.group"/>
       <description>Mandatory IDE for OCL Developers</description>
     </setupTask>
   </setupTask>
@@ -259,20 +308,83 @@
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
-          rootFolder="${ocl.git.clone.location/plugins}"
-          locateNestedProjects="true"/>
+          rootFolder="${ocl.git.clone.location/examples}"
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org.eclipse.ocl.examples.*"/>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.autogen"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.classic"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.unified"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.xtext2lpg"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
       <sourceLocator
-          rootFolder="${ocl.git.clone.location/features}"
-          locateNestedProjects="true"/>
+          rootFolder="${ocl.git.clone.location/plugins}"
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org.eclipse.ocl.*"/>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.all"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.capabilities"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.master"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
       <sourceLocator
           rootFolder="${ocl.git.clone.location/tests}"
-          locateNestedProjects="true"/>
-      <sourceLocator
-          rootFolder="${ocl.git.clone.location/examples}"
-          locateNestedProjects="true"/>
-      <sourceLocator
-          rootFolder="${ocl.git.clone.location/doc}"
-          locateNestedProjects="true"/>
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org.eclipse.ocl.*"/>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.consumers.tests"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
       <sourceLocator
           rootFolder="${emf.git.clone.location/examples}"
           locateNestedProjects="true">
@@ -288,65 +400,74 @@
           name="OCL Classic">
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.edit"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
             pattern="org.eclipse.ocl"/>
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.uml"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.ecore"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.uml.edit"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.ecore.edit"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.ui"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.uml.ui"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.tests"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.ecore.tests"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.uml.tests"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.capabilities"/>
-      </workingSet>
-      <workingSet
-          name="OCL Unified (Pivot)">
-        <predicate
-            xsi:type="predicates:NamePredicate"
             pattern="org.eclipse.ocl.common"/>
         <predicate
             xsi:type="predicates:NamePredicate"
             pattern="org.eclipse.ocl.common.ui"/>
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.pivot.*"/>
+            pattern="org.eclipse.ocl.ecore"/>
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.library"/>
+            pattern="org.eclipse.ocl.ecore.edit"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.edit"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.eventmanager"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.impactanalyzer"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.impactanalyzer.ui"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.impactanalyzer.util"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.ui"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.uml"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.uml.edit"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.uml.ui"/>
+      </workingSet>
+      <workingSet
+          name="OCL Unified (Pivot)">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.build"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.debug.*"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.xtext.console"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.pivot.*"/>
         <predicate
             xsi:type="predicates:NamePredicate"
             pattern="org.eclipse.ocl.xtext.*"/>
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.examples.xtext.tests"/>
+            pattern="org.eclipse.ocl.examples.codegen"/>
       </workingSet>
       <workingSet
           name="OCL Examples">
         <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.common"/>
+        <predicate
             xsi:type="predicates:AndPredicate">
           <operand
               xsi:type="predicates:NamePredicate"
@@ -355,7 +476,49 @@
               xsi:type="predicates:NotPredicate">
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org.eclipse.ocl.examples.xtext.tests"/>
+                pattern="org.eclipse.ocl.*.tests"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.*.test"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.build"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.codegen"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.debug.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.eventmanager"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.impactanalyzer.*"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.examples.testutils"/>
           </operand>
           <operand
               xsi:type="predicates:NotPredicate">
@@ -367,34 +530,43 @@
               xsi:type="predicates:NotPredicate">
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org.eclipse.ocl.examples.*-feature"/>
+                pattern="org.eclipse.ocl.examples.xtext.*"/>
           </operand>
         </predicate>
       </workingSet>
       <workingSet
-          name="OCL Features + Doc">
+          name="OCL Tests">
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.doc"/>
+            pattern="org.eclipse.emf.examples.library"/>
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.all"/>
+            pattern="org.eclipse.ocl.examples.validity.test"/>
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.master"/>
+            pattern="org.eclipse.ocl.examples.eventmanager.tests"/>
         <predicate
             xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.examples.unified"/>
+            pattern="org.eclipse.ocl.examples.impactanalyzer.tests"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.impactanalyzer.testmodel.*"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.impactanalyzer.testutils"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.testutils"/>
         <predicate
             xsi:type="predicates:AndPredicate">
           <operand
               xsi:type="predicates:NamePredicate"
-              pattern="org.eclipse.ocl.*-feature"/>
+              pattern="org.eclipse.ocl.*.tests"/>
           <operand
               xsi:type="predicates:NotPredicate">
             <operand
                 xsi:type="predicates:NamePredicate"
-                pattern="org.eclipse.ocl.*build-feature"/>
+                pattern="org.eclipse.ocl.examples.consumers.tests"/>
           </operand>
         </predicate>
       </workingSet>
@@ -412,6 +584,46 @@
         <requirement
             name="org.eclipse.ocl.examples.feature.group"/>
         <repositoryList
+            name="2020-06">
+          <repository
+              url="http://download.eclipse.org/releases/2020-03"/>
+        </repositoryList>
+        <repositoryList
+            name="2020-03">
+          <repository
+              url="http://download.eclipse.org/releases/2019-12"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-12">
+          <repository
+              url="http://download.eclipse.org/releases/2019-09"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-09">
+          <repository
+              url="http://download.eclipse.org/releases/2019-06"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-06">
+          <repository
+              url="http://download.eclipse.org/releases/2019-03"/>
+        </repositoryList>
+        <repositoryList
+            name="2019-03">
+          <repository
+              url="http://download.eclipse.org/releases/2018-12"/>
+        </repositoryList>
+        <repositoryList
+            name="2018-12">
+          <repository
+              url="http://download.eclipse.org/releases/2018-09"/>
+        </repositoryList>
+        <repositoryList
+            name="2018-09">
+          <repository
+              url="http://download.eclipse.org/releases/photon"/>
+        </repositoryList>
+        <repositoryList
             name="Photon">
           <repository
               url="http://download.eclipse.org/releases/oxygen"/>
@@ -426,23 +638,100 @@
           <repository
               url="http://download.eclipse.org/releases/mars"/>
         </repositoryList>
+        <repositoryList
+            name="Master">
+          <repository
+              url="http://download.eclipse.org/releases/latest"/>
+        </repositoryList>
       </targlet>
     </setupTask>
     <stream
         name="master"
-        label="Master (Photon)">
+        label="Master (Latest)">
       <setupTask
           xsi:type="setup:VariableTask"
           name="emf.branch"
           value="master"/>
     </stream>
     <stream
-        name="maintenance/R6_3"
-        label="Maintenance (Oxygen)">
+        name="6.12.0"
+        label="6.12.0 (2020-06)">
       <setupTask
           xsi:type="setup:VariableTask"
           name="emf.branch"
-          value="R2_13_maintenance"/>
+          value="R2_22_0"/>
+    </stream>
+    <stream
+        name="6.11.0"
+        label="6.11.0 (2020-03)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_21_0"/>
+    </stream>
+    <stream
+        name="6.10.0"
+        label="6.10.0 (2019-12)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_20_0"/>
+    </stream>
+    <stream
+        name="6.9.0"
+        label="6.9.0 (2019-09)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_19_0"/>
+    </stream>
+    <stream
+        name="6.8.0"
+        label="6.8.0 (2019-06)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_18_0"/>
+    </stream>
+    <stream
+        name="6.7.0"
+        label="6.7.0 (2019-03)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_17_0"/>
+    </stream>
+    <stream
+        name="6.6.0"
+        label="6.6.0 (2018-12)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_16_0"/>
+    </stream>
+    <stream
+        name="6.5.0"
+        label="6.5.0 (2018-09)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_15_0"/>
+    </stream>
+    <stream
+        name="6.4.0"
+        label="6.4.0 (Photon)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_14_0"/>
+    </stream>
+    <stream
+        name="6.3.0"
+        label="6.3.0 (Oxygen)">
+      <setupTask
+          xsi:type="setup:VariableTask"
+          name="emf.branch"
+          value="R2_13_0"/>
     </stream>
     <description>The development environment for the OCL</description>
   </project>
@@ -451,80 +740,134 @@
         xsi:type="setup.p2:P2Task"
         label="Releng Tools">
       <requirement
-          name="org.eclipse.buckminster.core.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.buckminster.git.feature.feature.group"/>
-      <requirement
-          name="org.eclipse.buckminster.pde.feature.feature.group"/>
-      <repository
-          url="http://download.eclipse.org/tools/buckminster/updates-4.5"/>
-    </setupTask>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="simrel.git.clone"
-        remoteURI="simrel/org.eclipse.simrel.build"
-        checkoutBranch="${simrel.branch}">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>SimRel Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>Simultaneous Release Git repository</description>
+          name="org.eclipse.m2e.feature.feature.group"/>
     </setupTask>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
-          rootFolder="${ocl.git.clone.location/releng}"
+          rootFolder="${ocl.git.clone.location/doc}"
           locateNestedProjects="true"/>
       <sourceLocator
-          rootFolder="${simrel.git.clone.location}"
+          rootFolder="${ocl.git.clone.location/examples}"
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.classic"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.unified"/>
+      </sourceLocator>
+      <sourceLocator
+          rootFolder="${ocl.git.clone.location/features}"
           locateNestedProjects="true"/>
-      <description>Releng projects</description>
+      <sourceLocator
+          rootFolder="${ocl.git.clone.location/plugins}"
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.all"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.capabilities"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.master"/>
+      </sourceLocator>
+      <sourceLocator
+          rootFolder="${ocl.git.clone.location/releng}"
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:NotPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org.eclipse.ocl.releng"/>
+        </predicate>
+        <predicate
+            xsi:type="predicates:NotPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org.eclipse.ocl.releng.consumers.build-feature"/>
+        </predicate>
+      </sourceLocator>
     </setupTask>
     <setupTask
         xsi:type="setup.workingsets:WorkingSetTask">
       <workingSet
-          name="OCL Releng">
+          name="OCL Features">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.*-feature"/>
+      </workingSet>
+      <workingSet
+          name="OCL Releng + Doc">
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.all"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.capabilities"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.doc"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.classic"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.examples.unified"/>
+        <predicate
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.ocl.master"/>
         <predicate
             xsi:type="predicates:NamePredicate"
             pattern="org.eclipse.ocl.oomph"/>
         <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.releng.*"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.ocl.*build-feature"/>
-        <predicate
-            xsi:type="predicates:NamePredicate"
-            pattern="org.eclipse.simrel.build"/>
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="org.eclipse.ocl.releng.*"/>
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="org.eclipse.ocl.*-feature"/>
+          </operand>
+        </predicate>
       </workingSet>
     </setupTask>
     <stream
         name="master"
-        label="Master (Photon)">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="simrel.branch"
-          value="master"/>
-    </stream>
+        label="Master (Latest)"/>
     <stream
-        name="maintenance/R6_3"
-        label="Maintenance (Oxygen)">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="simrel.branch"
-          value="Oxygen_maintenance"/>
-    </stream>
+        name="6.12.0"
+        label="6.12.0 (2020-06)"/>
+    <stream
+        name="6.11.0"
+        label="6.11.0 (2020-03)"/>
+    <stream
+        name="6.10.0"
+        label="6.10.0 (2019-12)"/>
+    <stream
+        name="6.9.0"
+        label="6.9.0 (2019-09)"/>
+    <stream
+        name="6.8.0"
+        label="6.8.0 (2019-06)"/>
+    <stream
+        name="6.7.0"
+        label="6.7.0 (2019-03)"/>
+    <stream
+        name="6.6.0"
+        label="6.6.0 (2018-12)"/>
+    <stream
+        name="6.5.0"
+        label="6.5.0 (2018-09)"/>
+    <stream
+        name="6.4.0"
+        label="6.4.0 (Photon)"/>
+    <stream
+        name="6.3.0"
+        label="6.3.0 (Oxygen)"/>
   </project>
   <logicalProjectContainer
       xsi:type="setup:ProjectCatalog"