diff --git a/releng/CDT.setup b/releng/CDT.setup
index 74b1c2a1420..aa73af1146f 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -116,23 +116,35 @@
       <repositoryList
           name="CDT Latest Released">
         <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/2019-12/"/>
+            url="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
+        <repository
+            url="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
         <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/eclipse/updates/4.14/"/>
         <repository
             url="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
+        <repository
+            url="https://download.eclipse.org/linuxtools/update-docker-4.5.0/"/>
+        <repository
+            url="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
+        <repository
+            url="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
+        <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/tm4e/releases/0.3.4/"/>
+        <repository
+            url="https://download.eclipse.org/lsp4e/releases/0.13.0/"/>
       </repositoryList>
     </targlet>
   </setupTask>
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 790d2b38ee6..f9a572bbde7 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -25,17 +25,15 @@
 <unit id="org.eclipse.cdt.xlc.sdk.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/tools/cdt/releases/9.10/cdt-9.10.0/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.remote.serial.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0.1/"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <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>
@@ -44,9 +42,52 @@
 </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">
+<!-- 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="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">
+<unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.launchbar.remote.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/launchbar/2.4/launchbar-2.4.1/"/>
+</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.5.0/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository/"/>
+</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="http://download.eclipse.org/tm/terminal/updates/4.4milestones/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<!-- normalize org.eclipse.cdt\releng\org.eclipse.cdt.repo\category.xml to remove .source IUs below -->
+<unit id="org.eclipse.tools.templates.core" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.core.source" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker.java11" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker.source" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.freemarker.java11.source" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.ui" version="0.0.0"/>
+<unit id="org.eclipse.tools.templates.ui.source" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/tools.templates/1.1/tools.templates-1.1.2-simrel-2019-12-m3/"/>
+</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">
+<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.13.0/"/>
+</location>
 </locations>
 </target>
\ No newline at end of file