diff --git a/TraceCompass.setup b/TraceCompass.setup
index 40b3b7564..160c7d9d5 100644
--- a/TraceCompass.setup
+++ b/TraceCompass.setup
@@ -75,7 +75,7 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="tracecompass-e4.30"
+      defaultValue="tracecompass-e4.31"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
@@ -111,6 +111,9 @@
     <choice
         value="tracecompass-e4.30"
         label="Trace Compass Eclipse 2023-12 - 4.30"/>
+    <choice
+        value="tracecompass-e4.31"
+        label="Trace Compass Eclipse 2024-03 - 4.31"/>
     <choice
         value="tracecompass-eStaging"
         label="Trace Compass Eclipse Latest"/>
@@ -148,15 +151,15 @@
     <setupTask
         xsi:type="pde:TargetPlatformTask"
         id="tracecompass-baseline-resolve"
-        name="tracecompass-baseline-9.2.0"
+        name="tracecompass-baseline-9.3.0"
         activate="false">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask
         xsi:type="pde:APIBaselineFromTargetTask"
-        id="tracecompass-baseline-9.2.0"
+        id="tracecompass-baseline-9.3.0"
         name="Trace Compass Baseline"
-        targetName="tracecompass-baseline-9.2.0">
+        targetName="tracecompass-baseline-9.3.0">
       <description>Trace Compass Baseline</description>
     </setupTask>
     <setupTask