diff --git a/releng/CDT.setup b/releng/CDT.setup
index 416ba455651..cdf593c5e1d 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -295,23 +295,19 @@
               url="https://download.eclipse.org/mylyn/releases/3.24/"/>
           <repository
               url="https://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
-          <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/builds/9.11/cdt-9.11.0-2020-03-rc1/">
+              url="https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.0/">
             <annotation>
               <detail
                   key="description">
-                <value>OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' and 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>
+                <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-03/"/>
-          <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
+              url="https://download.eclipse.org/tools/orbit/downloads/2020-06/"/>
           <repository
               url="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2020-03-M2/"/>
         </repositoryList>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 2ada5c5672d..c588d1e0e25 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="77">
+<target name="cdt" sequenceNumber="78">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -38,18 +38,11 @@
 <repository location="https://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
-<unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tm4e/releases/0.3.4/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<!-- OMG! We have circular dependency that involves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
-<repository location="https://download.eclipse.org/tools/cdt/builds/9.11/cdt-9.11.0-2020-03-rc1/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/9.11/cdt-9.11.0/"/>
 <!-- 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. -->
 	<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 </location>
@@ -71,11 +64,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/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<!-- This is needed temporarily because of https://bugs.eclipse.org/bugs/show_bug.cgi?id=560438 -->
-<repository location="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
+<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"/>