diff --git a/releng/CDT.setup b/releng/CDT.setup
index 10a222bf06f..74b1c2a1420 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -115,12 +115,22 @@
           name="org.eclipse.launchbar.remote.feature.group"/>
       <repositoryList
           name="CDT Latest Released">
-        <repository
-            url="https://download.eclipse.org/releases/2019-12/"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
+        <repository
+            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
+        <repository
+            url="https://download.eclipse.org/eclipse/updates/4.14/"/>
+        <repository
+            url="https://download.eclipse.org/mylyn/releases/3.24/"/>
+        <repository
+            url="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
+<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
         <repository
             url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+        <repository
+            url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/"/>
         <repository
             url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
       </repositoryList>
@@ -260,9 +270,19 @@
           <repository
               url="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
           <repository
-              url="https://download.eclipse.org/releases/2019-12/"/>
+              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
           <repository
               url="https://download.eclipse.org/eclipse/updates/4.14/"/>
+          <repository
+              url="https://download.eclipse.org/mylyn/releases/3.24/"/>
+          <repository
+              url="https://download.eclipse.org/mylyn/docs/releases/3.0.35/"/>
+<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
+          <repository
+              url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+          <repository
+              url="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166/"/>
           <repository
               url="http://download.eclipse.org/technology/epp/logging/stable/"/>
           <repository
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index b008c1aceeb..790d2b38ee6 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="cdt-baseline" sequenceNumber="18">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="cdt-baseline" sequenceNumber="19">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
@@ -29,7 +31,22 @@
 <repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/releases/2019-12/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/eclipse/updates/4.14/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.33/"/>
+</location>
+<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
+<!-- but nothing to add here as we already have CDT repo above -->
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166"/>
 </location>
 </locations>
 </target>
\ No newline at end of file
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 2fca2d27050..4dd5d8412f6 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="65">
+<target name="cdt" sequenceNumber="66">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
@@ -39,11 +39,21 @@
 <repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<!-- Needed for org.eclipse.emf.edit -->
-<!-- Need to pull in org.eclipse.cdt.utils.pty for org.eclipse.remote.core to build -->
-<!-- This slows down the build significantly, it should be removed when it becomes possible. -->
-<!-- It can be removed by re-targeting to the particular update sites for each required dependency -->
-<repository location="https://download.eclipse.org/releases/2019-12/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.20/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/releases/3.24/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.35/"/>
+</location>
+<!-- OMG! We have circular dependency that invloves 'java.package; org.eclipse.cdt.utils.pty 0.0.0' -->
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<!-- We need GEF (!) for org.eclipse.wst.xml_ui.feature.feature.group -->
+<repository location="https://download.eclipse.org/tools/gef/updates/legacy/integration/5.0.0_gef-legacy-master_2166"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>