diff --git a/Jenkinsfile b/Jenkinsfile
index 247365b1..22051d11 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
   environment {
     PUBLISH_LOCATION = 'updates'
     BUILD_TIMESTAMP = sh(returnStdout: true, script: 'date +%Y%m%d%H%M').trim()
-    TYCHO_VERSION = '4.0.3'
+    TYCHO_VERSION = '4.0.7'
     TARGET_PLATFORM_PRIMARY = 'eclipse_2023_03-xtext_2_31_0'
     TARGET_PLATFORM_LATEST = 'eclipse_2024_06-xtext_nightly'
   }
diff --git a/org.eclipse.xpect.releng/Xpect.setup b/org.eclipse.xpect.releng/Xpect.setup
index bd27a80b..86da7e9b 100644
--- a/org.eclipse.xpect.releng/Xpect.setup
+++ b/org.eclipse.xpect.releng/Xpect.setup
@@ -252,7 +252,7 @@
           <listAttribute key="M2_PROPERTIES">
               <listEntry value="target-platform=eclipse_2023_03-xtext_2_31_0"/>
               <listEntry value="user.home=$${system_property:user.home}"/>
-              <listEntry value="tycho-version=4.0.3"/>
+              <listEntry value="tycho-version=4.0.7"/>
           </listAttribute>
           <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
           <booleanAttribute key="M2_SKIP_TESTS" value="true"/>
diff --git a/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml b/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
index 78ece9ca..17c2844f 100644
--- a/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
+++ b/org.eclipse.xpect.releng/maven-plugin-parent/pom.xml
@@ -17,7 +17,7 @@
 	<properties>
 		<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
 		<xtextVersion>2.31.0</xtextVersion>
-		<tycho-version>4.0.3</tycho-version>
+		<tycho-version>4.0.7</tycho-version>
 		<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
diff --git a/org.eclipse.xpect.releng/target-platforms/eclipse_2024_06-xtext_nightly/org.eclipse.xpect.target.eclipse_2023_09-xtext_nightly.target b/org.eclipse.xpect.releng/target-platforms/eclipse_2024_06-xtext_nightly/org.eclipse.xpect.target.eclipse_2023_09-xtext_nightly.target
index c8e24bc2..8e6f35e8 100644
--- a/org.eclipse.xpect.releng/target-platforms/eclipse_2024_06-xtext_nightly/org.eclipse.xpect.target.eclipse_2023_09-xtext_nightly.target
+++ b/org.eclipse.xpect.releng/target-platforms/eclipse_2024_06-xtext_nightly/org.eclipse.xpect.target.eclipse_2023_09-xtext_nightly.target
@@ -15,13 +15,19 @@
 <repository location="https://download.eclipse.org/modeling/emft/mwe/updates/nightly/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/releases/2024-06"/>
 </location>
+
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.32-I-builds"/>
+</location>
+
+
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
 <unit id="org.hamcrest.core.source" version="2.2.0.v20230809-1000"/>
diff --git a/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml b/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
index 51c25eb4..8982cebf 100644
--- a/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
+++ b/org.eclipse.xtext.example.arithmetics.xpect.tests/pom.xml
@@ -20,7 +20,7 @@ Contributors:
 	<properties>
 		<os-jvm-flags />
 		<memory-settings>-Xmx1G</memory-settings>
-		<tycho-version>4.0.3</tycho-version>
+		<tycho-version>4.0.7</tycho-version>
 		<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
 		<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
 	</properties>
diff --git a/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml b/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
index a9ba7288..ffe5e03e 100644
--- a/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
+++ b/org.eclipse.xtext.example.domainmodel.xpect.tests/pom.xml
@@ -19,7 +19,7 @@ Contributors:
 
 	<properties>
 		<memory-settings>-Xmx1G</memory-settings>
-		<tycho-version>4.0.3</tycho-version>
+		<tycho-version>4.0.7</tycho-version>
 		<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
 		<target-platform-version>0.3.0-SNAPSHOT</target-platform-version>
 	</properties>
diff --git a/pom.xml b/pom.xml
index 2276d1cd..5636b01e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<target-platform>eclipse_2023_03-xtext_2_31_0</target-platform>
-		<tycho-version>4.0.3</tycho-version>
+		<tycho-version>4.0.7</tycho-version>
 
 		<!-- Used for promotion --> 
 		<eclipse.repo>https://download.eclipse.org/releases/2023-09</eclipse.repo>