diff --git a/debug/org.eclipse.cdt.debug.application.product/debug.product b/debug/org.eclipse.cdt.debug.application.product/debug.product
index 3a3e7128e76..c8ad09f406b 100644
--- a/debug/org.eclipse.cdt.debug.application.product/debug.product
+++ b/debug/org.eclipse.cdt.debug.application.product/debug.product
@@ -189,7 +189,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="com.sun.xml.bind"/>
       <plugin id="jakarta.servlet-api"/>
       <plugin id="jakarta.xml.bind"/>
-      <plugin id="javax.activation"/>
+      <plugin id="javax.activation" version="1.2.2.v20201119-1642"/>
+      <plugin id="javax.activation" version="2.0.0.v20201118-1818"/>
       <plugin id="javax.annotation"/>
       <plugin id="javax.el"/>
       <plugin id="javax.inject"/>
@@ -264,6 +265,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
       <plugin id="org.eclipse.core.jobs"/>
       <plugin id="org.eclipse.core.net"/>
       <plugin id="org.eclipse.core.net.linux" fragment="true"/>
+      <plugin id="org.eclipse.core.net.win32" fragment="true"/>
       <plugin id="org.eclipse.core.net.win32.x86_64" fragment="true"/>
       <plugin id="org.eclipse.core.resources"/>
       <plugin id="org.eclipse.core.runtime"/>
diff --git a/pom.xml b/pom.xml
index ea089facb9a..52e6b285de7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
 		<cbi-plugins.version>1.3.2</cbi-plugins.version>
 		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 		<cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
-		<simrel-site>https://download.eclipse.org/staging/2022-03/</simrel-site>
+		<simrel-site>https://download.eclipse.org/staging/2022-06/</simrel-site>
 		<repo-path>tools/cdt/builds/master/nightly</repo-path>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
diff --git a/releng/org.eclipse.cdt.target/cdt-baseline.target b/releng/org.eclipse.cdt.target/cdt-baseline.target
index 788f0be9a84..d80ad2d92ea 100644
--- a/releng/org.eclipse.cdt.target/cdt-baseline.target
+++ b/releng/org.eclipse.cdt.target/cdt-baseline.target
@@ -21,12 +21,6 @@
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.28/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<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/tm4e/releases/0.4.3/"/>
 			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
@@ -72,6 +66,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"/>
+			<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"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
@@ -97,10 +94,8 @@
 			<unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/>
 		</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/wildwebdeveloper/snapshots/"/>
+			<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
 		</location>
 	</locations>
-</target>
\ No newline at end of file
+</target>
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index c440859a04c..d380ea3a07f 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -7,7 +7,7 @@
 			<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.23/R-4.23-202203080310"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220407-0240/"/>
 			<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"/>
@@ -23,19 +23,13 @@
 			<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.20.2/"/>
+			<repository location="https://download.eclipse.org/lsp4e/releases/latest/"/>
 			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
 			<unit id="org.eclipse.lsp4e.debug" version="0.0.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/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.42/"/>
-		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<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"/>
@@ -56,13 +50,11 @@
 			<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/R20220302172233/repository/"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20220403232146/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"/>
 			<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"/>
 			<unit id="org.apache.commons.compress" version="0.0.0"/>
 			<unit id="org.apache.log4j" version="0.0.0"/>
@@ -73,16 +65,16 @@
 			<unit id="org.junit" version="0.0.0"/>
 			<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"/>
 			<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"/>
+			<unit id="javax.activation" version="2.0.0.v20201118-1818"/>
 		</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/orbit/downloads/drops/R20201118194144/repository/"/>
+			<unit id="javax.xml.stream" version="0.0.0"/>
+			<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
+			<unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
 		</location>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>