diff --git a/pom.xml b/pom.xml
index b140b94357b..6da9011609d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
 
 		<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/cdt/org.eclipse.cdt.git</tycho.scmUrl>
 		<base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs>
-		<comparator.repo>https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0</comparator.repo>
+		<comparator.repo>https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0/</comparator.repo>
 		<!-- these parameters are to control baseline replace and compare. On a local build you want
 		     to avoid baseline replace and compare, especially if you have different versions of Java than
 			 the baseline was built with. This is the default.
diff --git a/releng/CDT.setup b/releng/CDT.setup
index be5e1de4cd4..2b243acd1f9 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -75,7 +75,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2020-12"
+      defaultValue="2021-03"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup.targlets:TargletTask"
@@ -166,15 +166,15 @@
       <repositoryList
           name="CDT Latest Released">
         <repository
-            url="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/>
+            url="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
         <repository
-            url="https://download.eclipse.org/egit/updates-5.9/"/>
+            url="https://download.eclipse.org/egit/updates-5.11/"/>
         <repository
-            url="https://download.eclipse.org/linuxtools/update-2020-12-docker/"/>
+            url="https://download.eclipse.org/linuxtools/update-2021-03-rc2/"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/0.17.0/"/>
+            url="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
         <repository
-            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.23/"/>
+            url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25/"/>
         <repository
             url="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
         <repository
@@ -182,7 +182,7 @@
         <repository
             url="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
         <repository
-            url="https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0">
+            url="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.0">
           <annotation>
             <detail
                 key="description">
@@ -194,7 +194,7 @@
           </annotation>
         </repository>
         <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/2020-12/"/>
+            url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
         <repository
             url="https://download.eclipse.org/tools/ptp/updates/remote/3.0.1/"/>
       </repositoryList>
@@ -309,11 +309,11 @@
             rootFolder="${git.clone.cdt.location}"
             locateNestedProjects="true"/>
         <repositoryList
-            name="2020-12">
+            name="2021-03">
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
           <repository
               url="https://download.eclipse.org/egit/updates/"/>
           <repository
@@ -321,7 +321,7 @@
           <repository
               url="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
           <repository
-              url="https://download.eclipse.org/lsp4e/releases/0.17.0/"/>
+              url="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
           <repository
               url="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
           <repository
@@ -333,7 +333,7 @@
           <repository
               url="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
           <repository
-              url="https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0/">
+              url="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.0/">
             <annotation>
               <detail
                   key="description">
@@ -342,7 +342,7 @@
             </annotation>
           </repository>
           <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository"/>
+              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
           <repository
               url="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
         </repositoryList>
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 131d964b7f3..52f9a228d14 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt-baseline" sequenceNumber="26">
+<target name="cdt-baseline" sequenceNumber="27">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/eclipse/updates/4.18/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/egit/updates-5.9/"/>
+		<repository location="https://download.eclipse.org/egit/updates-5.11"/>
 		<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-2020-12-docker/"/>
+<repository location="https://download.eclipse.org/linuxtools/update-2021-03-rc2/"/>
 </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.16.0/"/>
+<repository location="https://download.eclipse.org/lsp4e/releases/0.18.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.23"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.38/"/>
@@ -71,13 +71,13 @@
 <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/10.1/cdt-10.1.0/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="com.google.gson" version="0.0.0"/>
-<unit id="com.sun.xml.bind" version="0.0.0"/>
-<unit id="javax.activation" version="0.0.0"/>
-<unit id="javax.xml.bind" version="0.0.0"/>
+<unit id="com.sun.xml.bind" version="2.3.3.v20201118-1818"/>
+<unit id="javax.activation" version="1.2.2.v20201119-1642"/>
+<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
 <unit id="javax.xml.stream" version="0.0.0"/>
 <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
 <unit id="org.antlr.runtime" version="0.0.0"/>
@@ -91,13 +91,16 @@
 <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/drops/R20201130205003/repository"/>
+<unit id="org.yaml.snakeyaml" version="0.0.0"/>
+<unit id="com.sun.jna" version="5.6.0.v20200716-0148"/>
+<unit id="com.sun.jna.platform" version="5.6.0.v20200722-0209"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
 </location>
 <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/updates/remote/3.0.1/"/>
+<repository location="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
 </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 bf6c0550055..e778530e5b4 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="103">
+<target name="cdt" sequenceNumber="104">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -12,7 +12,7 @@
 <unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.test.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.unittest.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800/"/>
 </location>
 	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 		<repository location="https://download.eclipse.org/egit/updates"/>
@@ -25,7 +25,7 @@
 <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.17.0/"/>
+<repository location="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/latest/"/>
@@ -47,7 +47,7 @@
 <repository location="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="https://download.eclipse.org/tools/cdt/releases/10.1/cdt-10.1.0/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/10.2/cdt-10.2.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>
@@ -76,7 +76,7 @@
 <unit id="org.yaml.snakeyaml" version="0.0.0"/>
 <unit id="com.sun.jna" version="5.6.0.v20200716-0148"/>
 <unit id="com.sun.jna.platform" version="5.6.0.v20200722-0209"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.remote.console.feature.group" version="0.0.0"/>