diff --git a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
index f3799fb..bf79699 100644
--- a/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
+++ b/plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java
@@ -1745,7 +1745,8 @@
     {
       InputStream in = null;
 
-      final String branch = i == trains.length ? "master" : trains[i].toUpperCase();
+      final String branch = i == trains.length ? "master" : trains[i].startsWith("20") ? trains[i] + "_R" : trains[i].toUpperCase();
+
       String url = "https://git.eclipse.org/c/epp/org.eclipse.epp.packages.git/plain/packages/org.eclipse.epp.package." + name + ".feature/epp.website.xml"
           + "?h=" + branch;
       try
@@ -2067,7 +2068,8 @@
         if (filter != null)
         {
           String value = RequirementImpl.formatMatchExpression(filter);
-          if (EPP_INSTALL_ROOTS_FILTER.equals(value) && !capability.getName().startsWith("org.eclipse.justj."))
+          if (EPP_INSTALL_ROOTS_FILTER.equals(value) && !capability.getName().startsWith("org.eclipse.justj.")
+              && !capability.getName().equals("org.eclipse.oomph.setup.feature.group"))
           {
             rootInstallIUs.add(capability.getName());
           }
diff --git a/setups/interim/EPPPackages.setup b/setups/interim/EPPPackages.setup
index b382f70..7fc3a72 100644
--- a/setups/interim/EPPPackages.setup
+++ b/setups/interim/EPPPackages.setup
@@ -15,9 +15,8 @@
     label="EPP Packages">
   <setupTask
       xsi:type="jdt:JRETask"
-      version="JavaSE-1.8"
-      location="${jre.location-1.8}"
-      name="JRE for JavaSE-1.8">
+      version="JavaSE-11"
+      location="${jre.location-11}">
     <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -30,10 +29,22 @@
   <setupTask
       xsi:type="setup:ResourceCreationTask"
       excludedTriggers="STARTUP MANUAL"
-      content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
       targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
       encoding="UTF-8">
     <description>Initialize JDT's package explorer to show working sets as its root objects</description>
+    <content>
+      &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>
+      &lt;section name=&quot;Workbench&quot;>
+      	&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>
+      		&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>
+      		&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>
+      		&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>
+      		&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>
+      		&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>
+      	&lt;/section>
+      &lt;/section>
+
+    </content>
   </setupTask>
   <setupTask
       xsi:type="setup:VariableTask"
diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
index e55b60c..c872863 100644
--- a/setups/org.eclipse.all.product.setup
+++ b/setups/org.eclipse.all.product.setup
@@ -86,7 +86,7 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.19.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2021-03/202101151000">
+          url="http://download.eclipse.org/releases/2021-03/202102051000">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
@@ -194,7 +194,7 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.19.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2021-03/202101151000">
+          url="http://download.eclipse.org/releases/2021-03/202102051000">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index 01c9f7c..f94ba83 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -114,9 +114,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -238,9 +238,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1583,6 +1583,8 @@
         <requirement
             name="org.eclipse.m2e.logback.feature.feature.group"/>
         <requirement
+            name="org.eclipse.m2e.pde.feature.feature.group"/>
+        <requirement
             name="org.eclipse.m2e.wtp.feature.feature.group"/>
         <requirement
             name="org.eclipse.m2e.wtp.jaxrs.feature.feature.group"/>
@@ -1619,9 +1621,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1979,6 +1981,8 @@
         <requirement
             name="org.eclipse.m2e.logback.feature.feature.group"/>
         <requirement
+            name="org.eclipse.m2e.pde.feature.feature.group"/>
+        <requirement
             name="org.eclipse.m2e.wtp.feature.feature.group"/>
         <requirement
             name="org.eclipse.m2e.wtp.jaxrs.feature.feature.group"/>
@@ -2015,9 +2019,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -4938,9 +4942,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -5130,9 +5134,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -6839,9 +6843,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7091,9 +7095,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7305,9 +7309,9 @@
         <requirement
             name="org.eclipse.wst.server_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7433,9 +7437,9 @@
         <requirement
             name="org.eclipse.wst.server_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8540,9 +8544,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -8688,9 +8692,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -9835,6 +9839,8 @@
         <requirement
             name="org.eclipse.m2e.lemminx.feature.feature.group"/>
         <requirement
+            name="org.eclipse.m2e.pde.feature.feature.group"/>
+        <requirement
             name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
         <requirement
             name="org.eclipse.mylyn.builds.feature.group"/>
@@ -9885,9 +9891,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10055,6 +10061,8 @@
         <requirement
             name="org.eclipse.m2e.lemminx.feature.feature.group"/>
         <requirement
+            name="org.eclipse.m2e.pde.feature.feature.group"/>
+        <requirement
             name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
         <requirement
             name="org.eclipse.mylyn.builds.feature.group"/>
@@ -10105,9 +10113,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -11695,9 +11703,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -11803,9 +11811,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12840,9 +12848,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -13016,9 +13024,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -14615,6 +14623,8 @@
         <requirement
             name="org.eclipse.m2e.logback.feature.feature.group"/>
         <requirement
+            name="org.eclipse.m2e.pde.feature.feature.group"/>
+        <requirement
             name="org.eclipse.passage.ldc.feature.feature.group"/>
         <requirement
             name="org.eclipse.rap.tools.feature.feature.group"/>
@@ -14627,9 +14637,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -14759,6 +14769,8 @@
         <requirement
             name="org.eclipse.m2e.logback.feature.feature.group"/>
         <requirement
+            name="org.eclipse.m2e.pde.feature.feature.group"/>
+        <requirement
             name="org.eclipse.passage.ldc.feature.feature.group"/>
         <requirement
             name="org.eclipse.rap.tools.feature.feature.group"/>
@@ -14771,9 +14783,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -16124,13 +16136,13 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-03)"
+        label="Latest (2020-12)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/m1/eclipse-ide-testers</value>
+          <value>https://www.eclipse.org/downloads/packages/release/2020-12/r/eclipse-ide-testers</value>
         </detail>
         <detail
             key="shortcut">
@@ -16139,16 +16151,16 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse for Testers (2021-03)">
+          label="Eclipse for Testers (2020-12)">
         <requirement
             name="epp.package.testing"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
+            versionRange="[4.18.0,5.0.0)"/>
         <requirement
             name="org.eclipse.epp.mpc.feature.group"/>
         <requirement
@@ -16156,9 +16168,9 @@
         <requirement
             name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2020-12/202012101200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2020-12/202012161000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -16207,48 +16219,6 @@
       </setupTask>
     </version>
     <version
-        name="2021-03"
-        label="2021-03"
-        requiredJavaVersion="11">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-        <detail
-            key="siteURI">
-          <value>https://www.eclipse.org/downloads/packages/release/2021-03/m1/eclipse-ide-testers</value>
-        </detail>
-        <detail
-            key="shortcut">
-          <value>Eclipse IDE for Testers - 2021-03</value>
-        </detail>
-      </annotation>
-      <setupTask
-          xsi:type="setup.p2:P2Task"
-          label="Eclipse for Testers (2021-03)">
-        <requirement
-            name="epp.package.testing"
-            versionRange="[4.19.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.19.0,5.0.0)"/>
-        <requirement
-            name="org.eclipse.epp.mpc.feature.group"/>
-        <requirement
-            name="org.eclipse.jubula.feature.feature.group"/>
-        <requirement
-            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
-        <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
-        <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
-          <annotation
-              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
-        </repository>
-      </setupTask>
-    </version>
-    <version
         name="2020-12"
         label="2020-12"
         requiredJavaVersion="11">
@@ -17169,9 +17139,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -17325,9 +17295,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -18778,9 +18748,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -18902,9 +18872,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -20109,9 +20079,9 @@
         <requirement
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -20205,9 +20175,9 @@
         <requirement
             name="org.eclipse.tm.terminal.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-03/202101141300"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-03/202102041200"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -20946,7 +20916,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.19.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -21014,7 +20984,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.19.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-03/202101151000">
+            url="http://download.eclipse.org/releases/2021-03/202102051000">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>