diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 72e2ca212ce..f76d59602eb 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -10,13 +10,13 @@
 			<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-2021-03-docker-rc2"/>
+			<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.18.0/"/>
 			<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.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.25/"/>
@@ -28,10 +28,11 @@
 			<repository location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956/"/>
 		</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.4.1/"/>
+			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/cdt/releases/10.4/cdt-10.4.1/"/>
 			<unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.cdt.build.crossgcc.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.cdt.cmake.feature.group" version="0.0.0"/>
@@ -71,9 +72,9 @@
 			<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.4/cdt-10.4.1/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
 			<unit id="com.google.gson" 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"/>
@@ -94,13 +95,12 @@
 			<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">
+			<repository location="https://download.eclipse.org/tools/ptp/remote/releases/3.0/remote-3.0.1/"/>
 			<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/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 447637757f7..8b8174f6a12 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -3,29 +3,29 @@
 <target name="cdt" sequenceNumber="107">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
+			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211023-1800/"/>
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 			<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"/>
 			<unit id="org.eclipse.unittest.ui" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211023-1800/"/>
 		</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/"/>
+			<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/lsp4e/releases/0.19.0/"/>
 			<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.19.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/"/>
@@ -37,14 +37,14 @@
 			<repository location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/technology/swtbot/releases/3.1.0/"/>
 			<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/3.1.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"/>
 			<repository location="https://download.eclipse.org/tm4e/releases/0.4.1/"/>
+			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/cdt/releases/10.4/cdt-10.4.1/"/>
@@ -52,10 +52,11 @@
 			<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
 			<repository location="https://download.eclipse.org/wildwebdeveloper/snapshots/"/>
+			<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20211020204107/repository/"/>
 			<unit id="com.google.gson" 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"/>
@@ -76,13 +77,12 @@
 			<unit id="org.yaml.snakeyaml" version="0.0.0"/>
 			<unit id="com.sun.jna" version="5.8.0.v20210503-0343"/>
 			<unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20211020204107/repository/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0/2021-09/"/>
 			<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/2021-09/"/>
 		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>