diff --git a/.mvn/maven.config b/.mvn/maven.config
index e400c47c..30f65bd7 100644
--- a/.mvn/maven.config
+++ b/.mvn/maven.config
@@ -1 +1 @@
--Dtycho-version=4.0.8
\ No newline at end of file
+-Dtycho-version=4.0.9
\ No newline at end of file
diff --git a/io.cucumber.eclipse.feature/feature.xml b/io.cucumber.eclipse.feature/feature.xml
index 1fb61bec..0155690d 100644
--- a/io.cucumber.eclipse.feature/feature.xml
+++ b/io.cucumber.eclipse.feature/feature.xml
@@ -75,55 +75,55 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
          id="io.cucumber.cucumber-java"
          download-size="0"
          install-size="0"
-         version="6.9.1"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.cucumber-core"
          download-size="0"
          install-size="0"
-         version="6.9.1"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.cucumber-plugin"
          download-size="0"
          install-size="0"
-         version="6.9.1"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.cucumber-gherkin"
          download-size="0"
          install-size="0"
-         version="6.9.1"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.cucumber-gherkin-messages"
          download-size="0"
          install-size="0"
-         version="6.9.1"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.cucumber-expressions"
          download-size="0"
          install-size="0"
-         version="11.0.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.datatable"
          download-size="0"
          install-size="0"
-         version="3.5.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.docstring"
          download-size="0"
          install-size="0"
-         version="6.9.1"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.tag-expressions"
          download-size="0"
          install-size="0"
-         version="3.0.0"/>
+         version="0.0.0"/>
 
    <plugin
          id="io.cucumber.create-meta"
diff --git a/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target b/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target
index 412c85c6..5a7b2185 100644
--- a/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target
+++ b/io.cucumber.eclipse.targetdefinition/cucumber.eclipse.targetdefinition.target
@@ -3,18 +3,11 @@
 <target name="targetdefinition" sequenceNumber="10">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-	<repository location="http://download.eclipse.org/releases/2024-03"/>
+	<repository location="http://download.eclipse.org/releases/2024-09"/>
 	<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
 	<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+	<unit id="org.eclipse.unittest.ui" version="0.0.0"/>
 </location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/eclipse/updates/4.18/R-4.18-202012021800/"/>
-		<unit id="org.eclipse.unittest.ui" version="1.0.0.v20201121-0633"/>
-	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/technology/m2e/releases/latest/"/>
-		<unit id="org.eclipse.m2e.sdk.feature.feature.group" version="0.0.0"/>
-	</location>
 	<location includeDependencyDepth="infinite" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
 		<dependencies>
 			<dependency>
diff --git a/pom.xml b/pom.xml
index e80e5c2f..83b346cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 		<module>io.cucumber.eclipse.java</module>
 		<module>io.cucumber.eclipse.java.plugins</module>
 		<module>io.cucumber.eclipse.feature</module>
-		<module>io.cucumber.eclipse.product</module>
+<!--		<module>io.cucumber.eclipse.product</module>-->
 		<module>io.cucumber.eclipse.updatesite</module>
 	</modules>
 
@@ -73,6 +73,12 @@
 				<version>${tycho-version}</version>
 				<configuration>
 					<finalName>cucumber-eclipse-plugin-${project.version}</finalName>
+					<includeAllDependencies>true</includeAllDependencies>
+					<skipArchive>true</skipArchive>
+					<includeAllSources>true</includeAllSources>
+					<addIUTargetRepositoryReferences>true</addIUTargetRepositoryReferences>
+					<addPomRepositoryReferences>true</addPomRepositoryReferences>
+					<filterProvided>true</filterProvided>
 				</configuration>
 			</plugin>
 			<plugin>