diff --git a/pom.xml b/pom.xml
index b75fcc29ed..26d5fb994f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
     <tycho-use-project-settings>true</tycho-use-project-settings>
     <tycho.scmUrl>scm:git:https://github.com/eclipse-tracecompass/org.eclipse.tracecompass</tycho.scmUrl>
     <cbi-plugins.version>1.4.2</cbi-plugins.version>
-    <target-platform>tracecompass-e4.35</target-platform>
+    <target-platform>tracecompass-e4.36</target-platform>
     <help-docs-eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.23</help-docs-eclipserun-repo>
 
     <rcptt-version>2.5.4</rcptt-version>
diff --git a/rcp/org.eclipse.tracecompass.rcp/feature.xml b/rcp/org.eclipse.tracecompass.rcp/feature.xml
index 2f2274144e..18b2e1e523 100644
--- a/rcp/org.eclipse.tracecompass.rcp/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/feature.xml
@@ -237,10 +237,6 @@
          id="org.apache.felix.scr"
          version="0.0.0"/>
 
-   <plugin
-         id="org.apache.commons.jxpath"
-         version="0.0.0"/>
-
    <plugin
          id="com.sun.jna"
          version="0.0.0"/>
@@ -294,7 +290,7 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.apache.commons.logging"
+         id="org.apache.commons.commons-logging"
          version="0.0.0"/>
 
    <plugin
@@ -442,23 +438,11 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.apache.commons.jxpath"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.commons.commons-beanutils"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.commons.collections"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.jdom"
+         id="org.eclipse.launchbar.core"
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.launchbar.core"
+         id="com.github.weisj.jsvg"
          version="0.0.0"/>
 
    <plugin
diff --git a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.35/feature.xml
similarity index 95%
rename from rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
rename to rcp/org.eclipse.tracecompass.rcp/legacy-e4.35/feature.xml
index 18b2e1e523..2f2274144e 100644
--- a/rcp/org.eclipse.tracecompass.rcp/staging/feature.xml
+++ b/rcp/org.eclipse.tracecompass.rcp/legacy-e4.35/feature.xml
@@ -237,6 +237,10 @@
          id="org.apache.felix.scr"
          version="0.0.0"/>
 
+   <plugin
+         id="org.apache.commons.jxpath"
+         version="0.0.0"/>
+
    <plugin
          id="com.sun.jna"
          version="0.0.0"/>
@@ -290,7 +294,7 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.apache.commons.commons-logging"
+         id="org.apache.commons.logging"
          version="0.0.0"/>
 
    <plugin
@@ -438,11 +442,23 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.launchbar.core"
+         id="org.apache.commons.jxpath"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.apache.commons.commons-beanutils"
          version="0.0.0"/>
 
    <plugin
-         id="com.github.weisj.jsvg"
+         id="org.apache.commons.collections"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jdom"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.eclipse.launchbar.core"
          version="0.0.0"/>
 
    <plugin
diff --git a/releng/org.eclipse.tracecompass.target/tracecompass-e4.36.target b/releng/org.eclipse.tracecompass.target/tracecompass-e4.36.target
index db0aa23ff4..478f791d29 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-e4.36.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-e4.36.target
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.36" sequenceNumber="3">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.36" sequenceNumber="4">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/"/>
@@ -37,6 +37,7 @@
 <unit id="org.apache.commons.cli" version="0.0.0"/>
 <unit id="org.apache.commons.commons-compress" version="0.0.0"/>
 <unit id="org.apache.commons.commons-io" version="0.0.0"/>
+<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
 <unit id="org.apache.commons.lang" version="0.0.0"/>
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
 <unit id="org.apache.xml.serializer" version="0.0.0"/>
@@ -44,7 +45,7 @@
 <unit id="org.osgi.service.component.annotations" version="0.0.0"/>
 <unit id="slf4j.api" version="0.0.0"/>
 <unit id="slf4j.simple" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202505200825/"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.36.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -72,7 +73,7 @@
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
 <unit id="org.eclipse.osgi.services" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250515-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250523-1100/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -86,7 +87,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202504150944/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.42.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.ecf.core.feature.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 2ccd2dbd5a..00a897d49a 100644
--- a/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
+++ b/releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="253">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="254">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.6/"/>
 <unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
-</location>
+</location>download.eclipse.org/eclipse/updates/4.36-I-builds/I20250523-1100
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
@@ -37,6 +37,7 @@
 <unit id="org.apache.commons.cli" version="0.0.0"/>
 <unit id="org.apache.commons.commons-compress" version="0.0.0"/>
 <unit id="org.apache.commons.commons-io" version="0.0.0"/>
+<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
 <unit id="org.apache.commons.lang" version="0.0.0"/>
 <unit id="org.apache.commons.lang3" version="0.0.0"/>
 <unit id="org.apache.xml.serializer" version="0.0.0"/>
@@ -44,7 +45,7 @@
 <unit id="org.osgi.service.component.annotations" version="0.0.0"/>
 <unit id="slf4j.api" version="0.0.0"/>
 <unit id="slf4j.simple" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202505200825/"/>
+<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.36.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.mozilla.javascript" version="0.0.0"/>
@@ -72,7 +73,7 @@
 <unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
 <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
 <unit id="org.eclipse.osgi.services" version="0.0.0"/>
-<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250515-1800/"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.36-I-builds/I20250523-1100/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -86,7 +87,7 @@
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.xsd" version="0.0.0"/>
-<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202504150944/"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.42.0/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>