diff --git a/TraceCompass.setup b/TraceCompass.setup
index 274ccfd0eb..81d4ee167b 100644
--- a/TraceCompass.setup
+++ b/TraceCompass.setup
@@ -75,7 +75,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="tracecompass-e4.39"
+      defaultValue="tracecompass-e4.40"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
@@ -138,6 +138,9 @@
     <choice
         value="tracecompass-e4.39"
         label="Trace Compass Eclipse 2026-03 - 4.39"/>
+    <choice
+        value="tracecompass-e4.40"
+        label="Trace Compass Eclipse 2026-06 - 4.40"/>
     <choice
         value="tracecompass-eStaging"
         label="Trace Compass Eclipse Latest"/>
@@ -175,15 +178,15 @@
     <setupTask
         xsi:type="pde:TargetPlatformTask"
         id="tracecompass-baseline-resolve"
-        name="tracecompass-baseline-11.3.0"
+        name="tracecompass-baseline-12.0.0"
         activate="false">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask
         xsi:type="pde:APIBaselineFromTargetTask"
-        id="tracecompass-baseline-11.3.0"
+        id="tracecompass-baseline-12.0.0"
         name="Trace Compass Baseline"
-        targetName="tracecompass-baseline-11.3.0">
+        targetName="tracecompass-baseline-12.0.0">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask
diff --git a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.3.0.target b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-12.0.0.target
similarity index 97%
rename from releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.3.0.target
rename to releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-12.0.0.target
index 1be66639b7..07b702b362 100644
--- a/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.3.0.target
+++ b/releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-12.0.0.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="tracecompass-baseline-11.3.0" sequenceNumber="1">
+<?pde version="3.8"?><target name="tracecompass-baseline-12.0.0" sequenceNumber="1">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.analysis.counters.core" version="0.0.0"/>
@@ -46,11 +46,11 @@
 <unit id="org.eclipse.tracecompass.tmf.remote.core" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.tmf.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.tracecompass.tmf.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tracecompass/releases/11.3.0/repository/"/>
+<repository location="https://download.eclipse.org/tracecompass/releases/12.0.0/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.core.runtime" version="0.0.0"/>
-<repository location="https://download.eclipse.org/releases/2026-03"/>
+<repository location="https://download.eclipse.org/releases/2026-06"/>
 </location>
 </locations>
 </target>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.40.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.40.target
index cc36815a63..2711944483 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.40.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.40.target
@@ -10,7 +10,7 @@
 <unit id="org.eclipse.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/releases/12.5/cdt-12.5.0a/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/12.5/cdt-12.5.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
index 4203a34d15..2de4266402 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -10,7 +10,7 @@
 <unit id="org.eclipse.remote.ui" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
 <unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/cdt/releases/12.5/cdt-12.5.0a/"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/12.5/cdt-12.5.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>