diff --git a/releng/CDT.setup b/releng/CDT.setup
index 9d937d2cce5..063356d2acc 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -110,23 +110,25 @@
       <repositoryList
           name="CDT Latest Released">
         <repository
-            url="https://download.eclipse.org/eclipse/updates/4.15/"/>
+            url="https://download.eclipse.org/eclipse/updates/4.16/"/>
         <repository
-            url="https://download.eclipse.org/linuxtools/update-docker-4.6.0/"/>
+            url="https://download.eclipse.org/egit/updates-5.8/"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.14.0/"/>
+            url="https://download.eclipse.org/linuxtools/update-2020-06-docker/"/>
         <repository
-            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.21/"/>
+            url="https://download.eclipse.org/lsp4e/releases/0.15.0/"/>
+        <repository
+            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.22/"/>
         <repository
             url="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
         <repository
-            url="https://download.eclipse.org/mylyn/releases/3.24/"/>
+            url="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330"/>
         <repository
             url="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
         <repository
             url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
         <repository
-            url="https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.0/">
+            url="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.1-2020-06-rc1">
           <annotation>
             <detail
                 key="description">
@@ -139,6 +141,8 @@
         </repository>
         <repository
             url="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+        <repository
+            url="https://download.eclipse.org/tools/orbit/downloads/2020-06/"/>
         <repository
             url="https://download.eclipse.org/tools/ptp/updates/remote/3.0.1/"/>
       </repositoryList>
@@ -247,12 +251,48 @@
         <sourceLocator
             rootFolder="${git.clone.cdt.location}"
             locateNestedProjects="true"/>
+        <repositoryList
+            name="2020-09">
+          <repository
+              url="https://download.eclipse.org/cbi/updates/license/"/>
+          <repository
+              url="https://download.eclipse.org/eclipse/updates/4.16/"/>
+          <repository
+              url="https://download.eclipse.org/egit/updates/"/>
+          <repository
+              url="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
+          <repository
+              url="https://download.eclipse.org/lsp4e/snapshots/"/>
+          <repository
+              url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
+          <repository
+              url="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
+          <repository
+              url="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330"/>
+          <repository
+              url="https://download.eclipse.org/technology/swtbot/releases/3.0.0/"/>
+          <repository
+              url="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
+          <repository
+              url="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.1-2020-06-rc1">
+            <annotation>
+              <detail
+                  key="description">
+                <value>We explicitly have CDT in target platform so that developers can develop org.eclipse.cdt.core/ui without requiring all the projects from CDT in their workspace.</value>
+              </detail>
+            </annotation>
+          </repository>
+          <repository
+              url="https://download.eclipse.org/tools/orbit/downloads/2020-09/"/>
+          <repository
+              url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
+        </repositoryList>
         <repositoryList
             name="2020-06">
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.16/R-4.16-202006040540/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.16/"/>
           <repository
               url="https://download.eclipse.org/egit/updates-5.8/"/>
           <repository
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 20e8fe26cc3..f5da7eeb052 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="23">
+<target name="cdt-baseline" sequenceNumber="24">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/eclipse/updates/4.15/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.16/"/>
 </location>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="https://download.eclipse.org/egit/updates-5.8/"/>
+		<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+	</location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/linuxtools/update-docker-4.6.0/"/>
+<repository location="https://download.eclipse.org/linuxtools/update-2020-06-docker/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.lsp4e" version="0.0.0"/>
 <unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
-<repository location="https://download.eclipse.org/lsp4e/releases/0.14.0/"/>
+<repository location="https://download.eclipse.org/lsp4e/releases/0.15.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.21/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.22/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
+<repository location="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
@@ -67,7 +71,7 @@
 <unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.0/"/>
+<repository location="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.1-2020-06-rc1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
@@ -87,7 +91,7 @@
 <unit id="org.junit.jupiter.api" version="0.0.0"/>
 <unit id="org.mockito" version="0.0.0"/>
 <unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-03/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index cbfa6406d60..3a1b34dc83c 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="83">
+<target name="cdt" sequenceNumber="84">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -11,8 +11,12 @@
 <unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.16/R-4.16-202006040540/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.16/"/>
 </location>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<repository location="https://download.eclipse.org/egit/updates"/>
+		<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+	</location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/linuxtools/updates-docker-nightly/"/>
@@ -23,19 +27,19 @@
 <repository location="http://download.eclipse.org/lsp4e/snapshots/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.36/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
+<repository location="http://download.eclipse.org/mylyn/drops/3.25.1/v20200526-0330/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
+<repository location="https://download.eclipse.org/technology/swtbot/releases/3.0.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
@@ -64,7 +68,7 @@
 <unit id="org.junit.jupiter.api" version="0.0.0"/>
 <unit id="org.mockito" version="0.0.0"/>
 <unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06/"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-09/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
@@ -72,10 +76,6 @@
 <unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
 </location>
-	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/egit/updates"/>
-		<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-	</location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 <launcherArgs>