diff --git a/setups/Oomph.setup b/setups/Oomph.setup
index 63e6e9d2e..eb1925682 100644
--- a/setups/Oomph.setup
+++ b/setups/Oomph.setup
@@ -488,6 +488,38 @@
                 filePattern="prototype.txt"/>
           </predicate>
         </sourceLocator>
+        <repositoryList
+            name="2021-09">
+          <repository
+              url="http://download.eclipse.org/usssdk/updates/latest"/>
+          <repository
+              url="http://download.eclipse.org/egit/updates"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
+          <repository
+              url="http://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
+          <repository
+              url="http://download.eclipse.org/mylyn/snapshots/weekly"/>
+          <repository
+              url="http://download.eclipse.org/tools/orbit/downloads/drops2/R20190602212107/repository">
+            <annotation>
+              <detail
+                  key="justification">
+                <value>This is here because the Mylyn repository is currently inconsistent providing and older version of lucence but requiring a newer one, yet one that isn't in the latest release or orbit either.</value>
+              </detail>
+            </annotation>
+          </repository>
+          <repository
+              url="http://download.eclipse.org/technology/m2e/snapshots"/>
+          <repository
+              url="http://download.eclipse.org/nebula/snapshot"/>
+          <repository
+              url="http://download.eclipse.org/technology/swtbot/snapshots"/>
+          <repository
+              url="http://download.eclipse.org/webtools/repository/latest"/>
+          <repository
+              url="http://download.eclipse.org/justj/jres/16/updates/release/16.0.1"/>
+        </repositoryList>
         <repositoryList
             name="2021-06">
           <repository
diff --git a/setups/com.github.projects.setup b/setups/com.github.projects.setup
index 1db5c587b..81134fccb 100644
--- a/setups/com.github.projects.setup
+++ b/setups/com.github.projects.setup
@@ -180,6 +180,15 @@
         label="Target Platform">
       <annotation
           source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>
+      <choice
+          value="2021-09"
+          label="Eclipse 2021-09 - 4.21"/>
+      <choice
+          value="2021-06"
+          label="Eclipse 2021-06 - 4.20"/>
+      <choice
+          value="2021-03"
+          label="Eclipse 2021-03 - 4.19"/>
       <choice
           value="2020-12"
           label="Eclipse 2020-12 - 4.18"/>
diff --git a/setups/org.eclipse.all.product.setup b/setups/org.eclipse.all.product.setup
index 004dde3ab..66fba9661 100644
--- a/setups/org.eclipse.all.product.setup
+++ b/setups/org.eclipse.all.product.setup
@@ -39,7 +39,7 @@
       value="5g"
       vm="true"/>
   <version name="latest"
-      label="Latest (2021-06)"
+      label="Latest (2021-09)"
       requiredJavaVersion="11">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -54,7 +54,7 @@
     </annotation>
     <setupTask
         xsi:type="setup.p2:P2Task"
-        label="Eclipse Eierlegende Wollmilchsau (2021-06)">
+        label="Eclipse Eierlegende Wollmilchsau (2021-09)">
       <requirement
           name="Application Development Frameworks"/>
       <requirement
@@ -86,7 +86,7 @@
           name="org.eclipse.platform.ide"
           versionRange="[4.20.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/releases/2021-06/202106161001">
+          url="http://download.eclipse.org/releases/2021-09">
         <annotation
             source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
       </repository>
@@ -146,6 +146,60 @@
       </repository>
     </setupTask>
   </version>
+  <version name="2021-09"
+      label="2021-09"
+      requiredJavaVersion="11">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+      <detail
+          key="siteURI">
+        <value>https://www.eclipse.org/downloads/packages/release/2021-06/r</value>
+      </detail>
+      <detail
+          key="shortcut">
+        <value>Eclipse Eierlegende Wollmilchsau - 2021-09</value>
+      </detail>
+    </annotation>
+    <setupTask
+        xsi:type="setup.p2:P2Task"
+        label="Eclipse Eierlegende Wollmilchsau (2021-09)">
+      <requirement
+          name="Application Development Frameworks"/>
+      <requirement
+          name="Collaboration"/>
+      <requirement
+          name="Database Development"/>
+      <requirement
+          name="General Purpose Tools"/>
+      <requirement
+          name="License Management"/>
+      <requirement
+          name="Linux Tools"
+          filter="(osgi.os=linux)"/>
+      <requirement
+          name="Mobile and Device Development"/>
+      <requirement
+          name="Modeling"/>
+      <requirement
+          name="Performance, Profiling and Tracing Tools"/>
+      <requirement
+          name="Programming Languages"/>
+      <requirement
+          name="SOA Development"/>
+      <requirement
+          name="Testing"/>
+      <requirement
+          name="Web, XML, Java EE and OSGi Enterprise Development"/>
+      <requirement
+          name="org.eclipse.platform.ide"
+          versionRange="[4.20.0,5.0.0)"/>
+      <repository
+          url="http://download.eclipse.org/releases/2021-09">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+      </repository>
+    </setupTask>
+  </version>
   <version name="2021-06"
       label="2021-06"
       requiredJavaVersion="11">
diff --git a/setups/org.eclipse.platform.sdk.product.setup b/setups/org.eclipse.platform.sdk.product.setup
index 064b7aa46..1c3387070 100644
--- a/setups/org.eclipse.platform.sdk.product.setup
+++ b/setups/org.eclipse.platform.sdk.product.setup
@@ -48,7 +48,7 @@
       value="3g"
       vm="true"/>
   <version name="latest"
-      label="Latest (4.20 - 2021-06)"
+      label="Latest (4.21 - 2021-09)"
       requiredJavaVersion="11">
     <annotation
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -63,12 +63,12 @@
     </annotation>
     <setupTask
         xsi:type="setup.p2:P2Task"
-        label="Eclipse SDK (4.20 - 2021-06)">
+        label="Eclipse SDK (4.21 - 2021-09)">
       <requirement
           name="org.eclipse.sdk.ide"
-          versionRange="[4.20.0,5.0.0)"/>
+          versionRange="[4.21.0,5.0.0)"/>
       <repository
-          url="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"/>
+          url="http://download.eclipse.org/eclipse/updates/4.21-I-builds"/>
     </setupTask>
   </version>
   <version name="latest.released"
@@ -78,7 +78,7 @@
         source="http://www.eclipse.org/oomph/setup/BrandingInfo">
       <detail
           key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
+        <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/</value>
       </detail>
       <detail
           key="shortcut">
@@ -95,6 +95,30 @@
           url="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"/>
     </setupTask>
   </version>
+  <version name="4.21"
+      label="4.21 - 2021-09"
+      requiredJavaVersion="11">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+      <detail
+          key="siteURI">
+        <value>https://download.eclipse.org/eclipse/downloads/</value>
+      </detail>
+      <detail
+          key="shortcut">
+        <value>Eclipse SDK - 4.21 - 2021-09</value>
+      </detail>
+    </annotation>
+    <setupTask
+        xsi:type="setup.p2:P2Task"
+        label="Eclipse SDK (4.21 - 2021-09)">
+      <requirement
+          name="org.eclipse.sdk.ide"
+          versionRange="[4.21.0,5.0.0)"/>
+      <repository
+          url="http://download.eclipse.org/eclipse/updates/4.21-I-builds"/>
+    </setupTask>
+  </version>
   <version name="4.20"
       label="4.20 - 2021-06"
       requiredJavaVersion="11">
@@ -106,7 +130,7 @@
       </detail>
       <detail
           key="siteURI">
-        <value>https://download.eclipse.org/eclipse/downloads/</value>
+        <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/</value>
       </detail>
       <detail
           key="shortcut">
diff --git a/setups/org.eclipse.products.setup b/setups/org.eclipse.products.setup
index 2ed84c9b7..e3c949ada 100644
--- a/setups/org.eclipse.products.setup
+++ b/setups/org.eclipse.products.setup
@@ -62,7 +62,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -77,7 +77,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Java Developers (2021-06)">
+          label="Eclipse IDE for Java Developers (2021-09)">
         <requirement
             name="epp.package.java"
             versionRange="[4.20.0,5.0.0)"/>
@@ -114,9 +114,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -184,6 +184,68 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Java Developers - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for Java Developers (2021-09)">
+        <requirement
+            name="epp.package.java"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.buildship.feature.group"/>
+        <requirement
+            name="org.eclipse.eclemma.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"/>
+        <requirement
+            name="org.eclipse.jgit.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.lemminx.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.logback.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext.editors_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tips.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wildwebdeveloper.xml.feature.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -1501,7 +1563,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -1516,7 +1578,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Enterprise Java and Web Developers (2021-06)">
+          label="Eclipse IDE for Enterprise Java and Web Developers (2021-09)">
         <requirement
             name="epp.package.jee"
             versionRange="[4.20.0,5.0.0)"/>
@@ -1693,9 +1755,9 @@
         <requirement
             name="org.eclipse.wst.xsl.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -1903,6 +1965,208 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-enterprise-java-and-web-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Enterprise Java and Web Developers - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for Enterprise Java and Web Developers (2021-09)">
+        <requirement
+            name="epp.package.jee"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.buildship.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.common.doc.user.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.connectivity.doc.user.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.connectivity.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.connectivity.oda.designer.core.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.connectivity.oda.designer.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.connectivity.oda.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.doc.user.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.apache.derby.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.hsqldb.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.ibm.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.ingres.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.jdbc.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.jdt.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.msft.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.mysql.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.oda.designer.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.oda.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.oracle.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.postgresql.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.sap.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.sdk.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.sqlite.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.enablement.sybase.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.intro.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.modelbase.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sdk.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.data.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.ddl.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.ddlgen.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.parsers.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.results.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqldevtools.sqlbuilder.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.datatools.sqltools.doc.user.feature.group"/>
+        <requirement
+            name="org.eclipse.eclemma.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.mylyn.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"/>
+        <requirement
+            name="org.eclipse.jpt.common.eclipselink.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jpt.common.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jpt.jaxb.eclipselink.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jpt.jaxb.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jpt.jpa.eclipselink.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jpt.jpa.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jsf.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.common.fproj.enablement.jdt.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.server_adapters.ext.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.server_adapters.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.server_ui.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.web_ui.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.webpageeditor.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.ws.axis2tools.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.ws.cxf.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.ws.jaxws.dom.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.lemminx.feature.feature.group"/>
+        <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"/>
+        <requirement
+            name="org.eclipse.m2e.wtp.jpa.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.wtp.jsf.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.context_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.ide_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.java_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.pde.feature.group"/>
+        <requirement
+            name="org.eclipse.tips.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.common.fproj.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.server_adapters.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.xsl.feature.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -5092,57 +5356,153 @@
           xsi:type="setup.p2:P2Task"
           label="Eclipse IDE for Enterprise Java and Web Developers (Juno)">
         <requirement
-            name="epp.package.jee"
-            versionRange="[1.5.0,2.0.0)"/>
+            name="epp.package.jee"
+            versionRange="[1.5.0,2.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.2.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.2.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"
+            versionRange="[3.8.0,4.0.0)"/>
+        <requirement
+            name="org.eclipse.pde.feature.group"
+            versionRange="[3.8.0,4.0.0)"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/juno"/>
+        <repository
+            url="http://download.eclipse.org/releases/juno/201303010900">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+        <repository
+            url="http://download.eclipse.org/modeling/emf/emf/builds/release/2.26"/>
+      </setupTask>
+    </version>
+    <description>
+      Tools for developers working with Java and Web applications, including a Java IDE, tools for JavaScript, TypeScript, JavaServer Pages and Faces, Yaml, Markdown, Web Services, JPA and Data Tools, Maven and Gradle, Git, and more.&lt;br/>
+      &lt;br/>
+      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?classification=WebTools&quot;>here&lt;/a> to file a bug against Eclipse Web Tools Platform.&lt;br/>
+      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform&quot;>here&lt;/a> to file a bug against Eclipse Platform.&lt;br/>
+      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?product=M2E-WTP&quot;>here&lt;/a> to file a bug against Maven integration for web projects.&lt;br/>
+      Click &lt;a href=&quot;https://github.com/eclipse/wildwebdeveloper/issues/new&quot;>here&lt;/a> to report an issue against Eclipse Wild Web Developer (incubating).&lt;br/>
+      &lt;br/>
+    </description>
+  </product>
+  <product name="epp.package.cpp"
+      label="Eclipse IDE for C/C++ Developers">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+      <detail
+          key="imageURI">
+        <value>http://www.eclipse.org/downloads/images/cdt.png</value>
+      </detail>
+      <detail
+          key="notificationTooltip">
+        <value>Donate to the Eclipse Community for the Eclipse IDE for C/C++ Developers</value>
+      </detail>
+    </annotation>
+    <version
+        name="latest"
+        label="Latest (2021-09)"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-cc-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for C/C++ Developers - Latest</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for C/C++ Developers (2021-09)">
+        <requirement
+            name="epp.package.cpp"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.cdt.autotools.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.build.crossgcc.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.cmake.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.gdbjtag.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.standalone.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.ui.memory.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.docker.launcher.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.serial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.meson.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.testsrunner.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.feature.group"/>
         <requirement
-            name="org.eclipse.platform.feature.group"
-            versionRange="[4.2.0,5.0.0)"/>
+            name="org.eclipse.linuxtools.cdt.libhover.feature.feature.group"/>
         <requirement
-            name="org.eclipse.rcp.feature.group"
-            versionRange="[4.2.0,5.0.0)"/>
+            name="org.eclipse.linuxtools.changelog.c.feature.group"/>
         <requirement
-            name="org.eclipse.jdt.feature.group"
-            versionRange="[3.8.0,4.0.0)"/>
+            name="org.eclipse.linuxtools.gcov.feature.group"/>
         <requirement
-            name="org.eclipse.pde.feature.group"
-            versionRange="[3.8.0,4.0.0)"/>
+            name="org.eclipse.linuxtools.gprof.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.rpm.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.valgrind.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.gdbtrace.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.control.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/juno"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/juno/201303010900">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
-        <repository
-            url="http://download.eclipse.org/modeling/emf/emf/builds/release/2.26"/>
       </setupTask>
     </version>
-    <description>
-      Tools for developers working with Java and Web applications, including a Java IDE, tools for JavaScript, TypeScript, JavaServer Pages and Faces, Yaml, Markdown, Web Services, JPA and Data Tools, Maven and Gradle, Git, and more.&lt;br/>
-      &lt;br/>
-      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?classification=WebTools&quot;>here&lt;/a> to file a bug against Eclipse Web Tools Platform.&lt;br/>
-      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Platform&quot;>here&lt;/a> to file a bug against Eclipse Platform.&lt;br/>
-      Click &lt;a href=&quot;https://bugs.eclipse.org/bugs/enter_bug.cgi?product=M2E-WTP&quot;>here&lt;/a> to file a bug against Maven integration for web projects.&lt;br/>
-      Click &lt;a href=&quot;https://github.com/eclipse/wildwebdeveloper/issues/new&quot;>here&lt;/a> to report an issue against Eclipse Wild Web Developer (incubating).&lt;br/>
-      &lt;br/>
-    </description>
-  </product>
-  <product name="epp.package.cpp"
-      label="Eclipse IDE for C/C++ Developers">
-    <annotation
-        source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-      <detail
-          key="imageURI">
-        <value>http://www.eclipse.org/downloads/images/cdt.png</value>
-      </detail>
-      <detail
-          key="notificationTooltip">
-        <value>Donate to the Eclipse Community for the Eclipse IDE for C/C++ Developers</value>
-      </detail>
-    </annotation>
     <version
-        name="latest"
-        label="Latest (2021-06)"
+        name="latest.released"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -5152,7 +5512,7 @@
         </detail>
         <detail
             key="shortcut">
-          <value>Eclipse IDE for C/C++ Developers - Latest</value>
+          <value>Eclipse IDE for C/C++ Developers - Latest Release</value>
         </detail>
       </annotation>
       <setupTask
@@ -5237,8 +5597,8 @@
       </setupTask>
     </version>
     <version
-        name="latest.released"
-        label="Latest Release (2021-06)"
+        name="2021-09"
+        label="2021-09"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -5248,12 +5608,12 @@
         </detail>
         <detail
             key="shortcut">
-          <value>Eclipse IDE for C/C++ Developers - Latest Release</value>
+          <value>Eclipse IDE for C/C++ Developers - 2021-09</value>
         </detail>
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for C/C++ Developers (2021-06)">
+          label="Eclipse IDE for C/C++ Developers (2021-09)">
         <requirement
             name="epp.package.cpp"
             versionRange="[4.20.0,5.0.0)"/>
@@ -5324,9 +5684,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7117,7 +7477,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -7132,7 +7492,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Embedded C/C++ Developers (2021-06)">
+          label="Eclipse IDE for Embedded C/C++ Developers (2021-09)">
         <requirement
             name="epp.package.embedcpp"
             versionRange="[4.20.0,5.0.0)"/>
@@ -7233,9 +7593,9 @@
         <requirement
             name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -7367,6 +7727,132 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-embedded-cc-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Embedded C/C++ Developers - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for Embedded C/C++ Developers (2021-09)">
+        <requirement
+            name="epp.package.embedcpp"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.cdt.autotools.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.build.crossgcc.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.cmake.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.gdbjtag.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.standalone.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.ui.memory.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.docker.launcher.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.serial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.meson.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.testsrunner.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.codered.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.debug.gdbjtag.jlink.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.debug.gdbjtag.openocd.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.debug.gdbjtag.pyocd.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.debug.gdbjtag.qemu.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.doc.user.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.managedbuild.cross.arm.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.managedbuild.cross.riscv.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.packs.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.templates.ad.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.templates.cortexm.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.templates.freescale.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.templates.sifive.feature.group"/>
+        <requirement
+            name="org.eclipse.embedcdt.templates.stm.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.feature.group"/>
+        <requirement
+            name="org.eclipse.launchbar.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.cdt.libhover.devhelp.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.cdt.libhover.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.changelog.c.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.gcov.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.gprof.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.rpm.feature.group"/>
+        <requirement
+            name="org.eclipse.linuxtools.valgrind.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.gdbtrace.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.control.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.kernel.feature.group"/>
+        <requirement
+            name="org.eclipse.tracecompass.lttng2.ust.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -8891,8 +9377,82 @@
       </detail>
     </annotation>
     <version
-        name="latest"
-        label="Latest (2021-06)"
+        name="latest"
+        label="Latest (2021-09)"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-php-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for PHP Developers - Latest</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for PHP Developers (2021-09)">
+        <requirement
+            name="epp.package.php"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.gitflow.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.mylyn.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.context_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.ide_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.php.composer.feature.group"/>
+        <requirement
+            name="org.eclipse.php.feature.group"/>
+        <requirement
+            name="org.eclipse.php.mylyn.feature.group"/>
+        <requirement
+            name="org.eclipse.php.phpunit.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.php.profiler.feature.group"/>
+        <requirement
+            name="org.eclipse.php.rdt.sync.feature.group"/>
+        <requirement
+            name="org.eclipse.tm.terminal.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
+    <version
+        name="latest.released"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -8902,7 +9462,7 @@
         </detail>
         <detail
             key="shortcut">
-          <value>Eclipse IDE for PHP Developers - Latest</value>
+          <value>Eclipse IDE for PHP Developers - Latest Release</value>
         </detail>
       </annotation>
       <setupTask
@@ -8965,8 +9525,8 @@
       </setupTask>
     </version>
     <version
-        name="latest.released"
-        label="Latest Release (2021-06)"
+        name="2021-09"
+        label="2021-09"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -8976,12 +9536,12 @@
         </detail>
         <detail
             key="shortcut">
-          <value>Eclipse IDE for PHP Developers - Latest Release</value>
+          <value>Eclipse IDE for PHP Developers - 2021-09</value>
         </detail>
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for PHP Developers (2021-06)">
+          label="Eclipse IDE for PHP Developers (2021-09)">
         <requirement
             name="epp.package.php"
             versionRange="[4.20.0,5.0.0)"/>
@@ -9030,9 +9590,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10283,7 +10843,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -10298,7 +10858,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse IDE for Eclipse Committers (2021-06)">
+          label="Eclipse IDE for Eclipse Committers (2021-09)">
         <requirement
             name="epp.package.committers"
             versionRange="[4.20.0,5.0.0)"/>
@@ -10387,9 +10947,9 @@
         <requirement
             name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -10509,6 +11069,120 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-eclipse-committers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Eclipse Committers - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse IDE for Eclipse Committers (2021-09)">
+        <requirement
+            name="epp.package.committers"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.buildship.feature.group"/>
+        <requirement
+            name="org.eclipse.e4.core.tools.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.eclemma.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.gitflow.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.mylyn.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.source.feature.group"/>
+        <requirement
+            name="org.eclipse.jgit.http.apache.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.feature.feature.group"/>
+        <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"/>
+        <requirement
+            name="org.eclipse.mylyn.commons.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.commons.identity.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.commons.notifications.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.commons.repositories.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.commons.repositories.http.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.discovery.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.gerrit.dashboard.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.gerrit.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.git.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.hudson.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.monitor.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.reviews.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.team_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.versions.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.pde.feature.group"/>
+        <requirement
+            name="org.eclipse.pde.source.feature.group"/>
+        <requirement
+            name="org.eclipse.platform.source.feature.group"/>
+        <requirement
+            name="org.eclipse.rcp.source.feature.group"/>
+        <requirement
+            name="org.eclipse.swt.tools.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.test.feature.group"/>
+        <requirement
+            name="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wildwebdeveloper.feature.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -12281,7 +12955,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -12296,7 +12970,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse DSL Tools (2021-06)">
+          label="Eclipse DSL Tools (2021-09)">
         <requirement
             name="epp.package.dsl"
             versionRange="[4.20.0,5.0.0)"/>
@@ -12325,9 +12999,9 @@
         <requirement
             name="org.eclipse.xtext.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -12387,6 +13061,60 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-and-dsl-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Java and DSL Developers - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse DSL Tools (2021-09)">
+        <requirement
+            name="epp.package.dsl"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"
+            versionRange="[3.18.0,4.0.0)"/>
+        <requirement
+            name="org.eclipse.pde.feature.group"
+            versionRange="[3.14.0,4.0.0)"/>
+        <requirement
+            name="org.eclipse.emf.ecore.xcore.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.mwe2.language.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.lsp4j.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.xtext.sdk.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -13453,8 +14181,96 @@
       </detail>
     </annotation>
     <version
-        name="latest"
-        label="Latest (2021-06)"
+        name="latest"
+        label="Latest (2021-09)"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-modeling-tools</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse Modeling Tools - Latest</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse Modeling Tools (2021-09)">
+        <requirement
+            name="epp.package.modeling"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.e4.core.tools.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.cdo.epp.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.compare.diagram.sirius.source.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.compare.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.compare.ide.ui.source.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.compare.source.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.ecoretools.design.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.ecp.emfforms.sdk.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.parsley.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.parsley.sdk.source.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.query.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.transaction.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.emf.validation.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.gef.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.gmf.runtime.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.ocl.all.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.pde.feature.group"/>
+        <requirement
+            name="org.eclipse.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.tips.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.uml2.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.xsd.sdk.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
+    <version
+        name="latest.released"
+        label="Latest Release (2021-06)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -13464,7 +14280,7 @@
         </detail>
         <detail
             key="shortcut">
-          <value>Eclipse Modeling Tools - Latest</value>
+          <value>Eclipse Modeling Tools - Latest Release</value>
         </detail>
       </annotation>
       <setupTask
@@ -13541,8 +14357,8 @@
       </setupTask>
     </version>
     <version
-        name="latest.released"
-        label="Latest Release (2021-06)"
+        name="2021-09"
+        label="2021-09"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -13552,12 +14368,12 @@
         </detail>
         <detail
             key="shortcut">
-          <value>Eclipse Modeling Tools - Latest Release</value>
+          <value>Eclipse Modeling Tools - 2021-09</value>
         </detail>
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse Modeling Tools (2021-06)">
+          label="Eclipse Modeling Tools (2021-09)">
         <requirement
             name="epp.package.modeling"
             versionRange="[4.20.0,5.0.0)"/>
@@ -13620,9 +14436,9 @@
         <requirement
             name="org.eclipse.xsd.sdk.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -15353,7 +16169,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -15368,7 +16184,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse for RCP and RAP Developers (2021-06)">
+          label="Eclipse for RCP and RAP Developers (2021-09)">
         <requirement
             name="epp.package.rcp"
             versionRange="[4.20.0,5.0.0)"/>
@@ -15417,9 +16233,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -15499,6 +16315,80 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-rcp-and-rap-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for RCP and RAP Developers - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse for RCP and RAP Developers (2021-09)">
+        <requirement
+            name="epp.package.rcp"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"
+            versionRange="[3.18.0,4.0.0)"/>
+        <requirement
+            name="org.eclipse.pde.feature.group"
+            versionRange="[3.14.0,4.0.0)"/>
+        <requirement
+            name="org.eclipse.buildship.feature.group"/>
+        <requirement
+            name="org.eclipse.e4.core.tools.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.eclemma.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.gitflow.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.lemminx.feature.feature.group"/>
+        <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"/>
+        <requirement
+            name="org.eclipse.swtbot.eclipse.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.eclipse.gef.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.ide.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -17871,7 +18761,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -17886,7 +18776,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse for Scientific Computing (2021-06)">
+          label="Eclipse for Scientific Computing (2021-09)">
         <requirement
             name="epp.package.parallel"
             versionRange="[4.20.0,5.0.0)"/>
@@ -17939,9 +18829,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -18025,6 +18915,84 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scientific-computing</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Scientific Computing - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse for Scientific Computing (2021-09)">
+        <requirement
+            name="epp.package.parallel"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.cdt.autotools.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.build.crossgcc.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.cmake.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.standalone.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.debug.ui.memory.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.launch.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.testsrunner.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.jgit.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.ptp.debug.sdm.feature.group"/>
+        <requirement
+            name="org.eclipse.ptp.feature.group"/>
+        <requirement
+            name="org.eclipse.ptp.fortran.feature.group"/>
+        <requirement
+            name="org.eclipse.ptp.rdt.sync.feature.group"/>
+        <requirement
+            name="org.eclipse.ptp.remote.terminal.feature.group"/>
+        <requirement
+            name="org.eclipse.ptp.rm.jaxb.contrib.feature.group"/>
+        <requirement
+            name="org.eclipse.remote.console.feature.group"/>
+        <requirement
+            name="org.eclipse.remote.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -19582,7 +20550,7 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -19597,7 +20565,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse for Scout Developers (2021-06)">
+          label="Eclipse for Scout Developers (2021-09)">
         <requirement
             name="epp.package.scout"
             versionRange="[4.20.0,5.0.0)"/>
@@ -19634,9 +20602,9 @@
         <requirement
             name="org.eclipse.wst.xml_ui.feature.feature.group"/>
         <repository
-            url="http://download.eclipse.org/technology/epp/packages/2021-06/202106121200"/>
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -19704,6 +20672,68 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="siteURI">
+          <value>https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-scout-developers</value>
+        </detail>
+        <detail
+            key="shortcut">
+          <value>Eclipse IDE for Scout Developers - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse for Scout Developers (2021-09)">
+        <requirement
+            name="epp.package.scout"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.egit.feature.group"/>
+        <requirement
+            name="org.eclipse.epp.mpc.feature.group"/>
+        <requirement
+            name="org.eclipse.help.source.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.source.feature.group"/>
+        <requirement
+            name="org.eclipse.jgit.feature.group"/>
+        <requirement
+            name="org.eclipse.jst.web_ui.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.m2e.lemminx.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.mylyn.wikitext_feature.feature.group"/>
+        <requirement
+            name="org.eclipse.scout.sdk-feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.web_ui.feature.feature.group"/>
+        <requirement
+            name="org.eclipse.wst.xml_ui.feature.feature.group"/>
+        <repository
+            url="http://download.eclipse.org/technology/epp/packages/2021-09"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -21758,14 +22788,10 @@
     </annotation>
     <version
         name="latest"
-        label="Latest (2021-06)"
+        label="Latest (2021-09)"
         requiredJavaVersion="11">
       <annotation
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
-        <detail
-            key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
-        </detail>
         <detail
             key="shortcut">
           <value>Eclipse Platform - Latest</value>
@@ -21773,7 +22799,7 @@
       </annotation>
       <setupTask
           xsi:type="setup.p2:P2Task"
-          label="Eclipse Platform (2021-06)">
+          label="Eclipse Platform (2021-09)">
         <requirement
             name="org.eclipse.platform.ide"
             versionRange="[4.20.0,5.0.0)"/>
@@ -21784,7 +22810,7 @@
             name="org.eclipse.rcp.feature.group"
             versionRange="[4.20.0,5.0.0)"/>
         <repository
-            url="http://download.eclipse.org/releases/2021-06/202106161001">
+            url="http://download.eclipse.org/releases/2021-09">
           <annotation
               source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
         </repository>
@@ -21798,7 +22824,7 @@
           source="http://www.eclipse.org/oomph/setup/BrandingInfo">
         <detail
             key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
+          <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/</value>
         </detail>
         <detail
             key="shortcut">
@@ -21824,6 +22850,36 @@
         </repository>
       </setupTask>
     </version>
+    <version
+        name="2021-09"
+        label="2021-09"
+        requiredJavaVersion="11">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/BrandingInfo">
+        <detail
+            key="shortcut">
+          <value>Eclipse Platform - 2021-09</value>
+        </detail>
+      </annotation>
+      <setupTask
+          xsi:type="setup.p2:P2Task"
+          label="Eclipse Platform (2021-09)">
+        <requirement
+            name="org.eclipse.platform.ide"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <requirement
+            name="org.eclipse.rcp.feature.group"
+            versionRange="[4.20.0,5.0.0)"/>
+        <repository
+            url="http://download.eclipse.org/releases/2021-09">
+          <annotation
+              source="http://www.eclipse.org/oomph/setup/ReleaseTrain"/>
+        </repository>
+      </setupTask>
+    </version>
     <version
         name="2021-06"
         label="2021-06"
@@ -21836,7 +22892,7 @@
         </detail>
         <detail
             key="siteURI">
-          <value>https://download.eclipse.org/eclipse/downloads/</value>
+          <value>http://archive.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/</value>
         </detail>
         <detail
             key="shortcut">
diff --git a/setups/org.eclipse.projects.setup b/setups/org.eclipse.projects.setup
index aeade2cf0..755116af2 100644
--- a/setups/org.eclipse.projects.setup
+++ b/setups/org.eclipse.projects.setup
@@ -436,15 +436,15 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.latest.p2"
-        value="http://download.eclipse.org/eclipse/updates/4.20-I-builds"
-        label="Eclipse Latest I-Build p2 Repository - 4.20">
+        value="http://download.eclipse.org/eclipse/updates/4.21-I-builds"
+        label="Eclipse Latest I-Build p2 Repository - 4.21">
       <description>The update site of the latest Eclipse project's builds, typically an I-Build for the next release</description>
     </setupTask>
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.latest.release.p2"
-        value="http://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800"
-        label="Eclipse Latest Release p2 Repository - 4.19">
+        value="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"
+        label="Eclipse Latest Release p2 Repository - 4.20">
       <description>The update site of the latest released Eclipse project's builds, always an R-Build for the most recent release</description>
     </setupTask>
     <setupTask
@@ -455,6 +455,9 @@
         label="Target Platform">
       <annotation
           source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>
+      <choice
+          value="2021-09"
+          label="Eclipse 2021-09 - 4.21"/>
       <choice
           value="2021-06"
           label="Eclipse 2021-06 - 4.20"/>
@@ -529,7 +532,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.target.platform.latest"
-        value="2021-06"
+        value="2021-09"
         storageURI="scope://Workspace"
         label="Target Platform Latest">
       <annotation
@@ -539,7 +542,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.target.platform.latest.released"
-        value="2021-03"
+        value="2021-06"
         storageURI="scope://Workspace"
         label="Target Platform Latest Released">
       <annotation
@@ -554,6 +557,9 @@
         label="API Baseline Target Platform">
       <annotation
           source="http://www.eclipse.org/oomph/setup/GlobalVariable"/>
+      <choice
+          value="2021-06"
+          label="Eclipse 2021-06 - 4.20"/>
       <choice
           value="2021-03"
           label="Eclipse 2021-03 - 4.19"/>
@@ -625,7 +631,7 @@
     <setupTask
         xsi:type="setup:VariableTask"
         name="eclipse.api.baseline.target.platform.latest.released"
-        value="2021-03"
+        value="2021-06"
         storageURI="scope://Workspace"
         label="Target Platform Latest Released">
       <annotation
@@ -698,10 +704,15 @@
         activeRepositoryList="${eclipse.target.platform}">
       <repositoryList
           name="None"/>
+      <repositoryList
+          name="2021-09">
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.21-I-builds"/>
+      </repositoryList>
       <repositoryList
           name="2021-06">
         <repository
-            url="http://download.eclipse.org/eclipse/updates/4.20-I-builds"/>
+            url="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"/>
       </repositoryList>
       <repositoryList
           name="2021-03">
@@ -821,6 +832,11 @@
         includeSources="false">
       <repositoryList
           name="None"/>
+      <repositoryList
+          name="2021-06">
+        <repository
+            url="http://download.eclipse.org/eclipse/updates/4.20/R-4.20-202106111600"/>
+      </repositoryList>
       <repositoryList
           name="2021-03">
         <repository