diff --git a/TraceCompass.setup b/TraceCompass.setup
index cfffb309ed..eafb660726 100644
--- a/TraceCompass.setup
+++ b/TraceCompass.setup
@@ -75,7 +75,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="tracecompass-e4.35"
+      defaultValue="tracecompass-e4.36"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
@@ -124,8 +124,11 @@
         value="tracecompass-e4.34"
         label="Trace Compass Eclipse 2024-12 - 4.34"/>
     <choice
-        value="tracecompass-e4.34"
+        value="tracecompass-e4.35"
         label="Trace Compass Eclipse 2025-03 - 4.35"/>
+    <choice
+        value="tracecompass-e4.36"
+        label="Trace Compass Eclipse 2025-06 - 4.36"/>
     <choice
         value="tracecompass-eStaging"
         label="Trace Compass Eclipse Latest"/>
@@ -163,15 +166,15 @@
     <setupTask
         xsi:type="pde:TargetPlatformTask"
         id="tracecompass-baseline-resolve"
-        name="tracecompass-baseline-10.3.0"
+        name="tracecompass-baseline-11.0.0"
         activate="false">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask
         xsi:type="pde:APIBaselineFromTargetTask"
-        id="tracecompass-baseline-10.3.0"
+        id="tracecompass-baseline-11.0.0"
         name="Trace Compass Baseline"
-        targetName="tracecompass-baseline-10.3.0">
+        targetName="tracecompass-baseline-11.0.0">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask