diff --git a/target-platforms/latest.target b/target-platforms/latest.target
index 8bbf5dee..2d60053f 100644
--- a/target-platforms/latest.target
+++ b/target-platforms/latest.target
@@ -8,9 +8,9 @@
       <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
     </location>
 
-    <!-- 4.35 = Eclipse 2025-09 -->
+    <!-- 4.36 = Eclipse 2025-12 -->
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <repository location="https://download.eclipse.org/eclipse/updates/4.37"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.38"/>
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.ui.trace" version="0.0.0"/>
       <unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
@@ -22,7 +22,7 @@
     </location>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-09/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12/"/>
       <unit id="assertj-core" version="0.0.0"/>
       <unit id="assertj-core.source" version="0.0.0"/>
       <unit id="com.google.gson" version="0.0.0"/>
@@ -36,7 +36,20 @@
       <unit id="org.snakeyaml.engine" version="0.0.0"/>
       <unit id="org.snakeyaml.engine.source" version="0.0.0"/>
       <unit id="org.junit" version="0.0.0"/>
-      <unit id="junit-jupiter-api" version="0.0.0"/>
+
+      <!-- Pinning JUnit 5 for now -->
+      <unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-suite-engine" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
     </location>
   </locations>
 
diff --git a/target-platforms/oldest.target b/target-platforms/oldest.target
index 91ce7507..4da45b72 100644
--- a/target-platforms/oldest.target
+++ b/target-platforms/oldest.target
@@ -22,7 +22,7 @@
     </location>
 
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-09/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-12/"/>
       <unit id="assertj-core" version="0.0.0"/>
       <unit id="assertj-core.source" version="0.0.0"/>
       <unit id="com.google.gson" version="0.0.0"/>
@@ -36,7 +36,20 @@
       <unit id="org.snakeyaml.engine" version="0.0.0"/>
       <unit id="org.snakeyaml.engine.source" version="0.0.0"/>
       <unit id="org.junit" version="0.0.0"/>
-      <unit id="junit-jupiter-api" version="0.0.0"/>
+
+      <!-- JUnit 6 not supported by Eclipse 2024-06 -> pinning to JUnit 5 -->
+      <unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
+      <unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-platform-suite-engine" version="[1.0.0,2.0.0)"/>
+      <unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
     </location>
   </locations>
 
diff --git a/target-platforms/staging.target b/target-platforms/staging.target
index e014d9d5..98215f9b 100644
--- a/target-platforms/staging.target
+++ b/target-platforms/staging.target
@@ -8,9 +8,9 @@
       <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
     </location>
 
-    <!-- 4.38 = Eclipse 2025-12 -->
+    <!-- 4.40 = Eclipse 2026-03 -->
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <repository location="https://download.eclipse.org/eclipse/updates/4.39-I-builds"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.40-I-builds"/>
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.ui.trace" version="0.0.0"/>
       <unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>