diff --git a/features/org.eclipse.papyrus.sysml16.elementgroup.feature/feature.xml b/features/org.eclipse.papyrus.sysml16.elementgroup.feature/feature.xml
index 50b90c9..ca383ce 100644
--- a/features/org.eclipse.papyrus.sysml16.elementgroup.feature/feature.xml
+++ b/features/org.eclipse.papyrus.sysml16.elementgroup.feature/feature.xml
@@ -21,7 +21,7 @@
 SPDX-License-Identifier: EPL-2.0
    </copyright>
 
-     <requires>
+   <requires>
       <import feature="org.eclipse.papyrus.sysml16.feature" version="2.2.0" match="compatible"/>
    </requires>
    
diff --git a/pom.xml b/pom.xml
index 212bbd1..6284111 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,8 @@
 		<target.groupId>org.eclipse.papyrus.sysml</target.groupId>
 		<target.artifactId>org.eclipse.papyrus.sysml16.targetplatform</target.artifactId>
 
-		<tycho.version>2.2.0</tycho.version>
-		<tychoExtras.version>2.2.0</tychoExtras.version>
+		<tycho.version>2.4.0</tycho.version>
+		<tychoExtras.version>2.4.0</tychoExtras.version>
 		<xtext.version>2.23.0</xtext.version>
 		<maven.resources.version>3.2.0</maven.resources.version>
 		<maven.clean.version>3.1.0</maven.clean.version>
@@ -44,8 +44,6 @@
 		<maven.compiler.version>3.8.1</maven.compiler.version>
 		<!-- https://repo.eclipse.org/content/repositories/cbi-releases/ -->
 		<jarSigner.version>1.3.1</jarSigner.version>
-		<!-- https://repository.jboss.org/ -->
-		<jboss.utils.version>1.7.0</jboss.utils.version>
 		<java.source.version>11</java.source.version>
 		<java.target.version>11</java.target.version>
 		
@@ -89,20 +87,11 @@
 
 
 	<pluginRepositories>
-		<!-- https://repo.maven.apache.org/maven2/ is being fetched by default -->
-		<pluginRepository>
-			<id>tycho-snapshots</id>
-			<url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url>
-		</pluginRepository>
 		<pluginRepository>
 			<id>org.eclipse.cbi.maven.plugins</id>
 			<name>Eclipse CBI</name>
 			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
 		</pluginRepository>
-		<pluginRepository>
-			<id>org.jboss.tools.tycho-plugins</id>
-			<url>https://repository.jboss.org/</url>
-		</pluginRepository>
 	</pluginRepositories>
 
 	<repositories>
@@ -239,18 +228,10 @@
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tychoExtras.version}</version>
-				<executions>
 					<execution>
-						<id>source-feature</id>
-						<phase>package</phase>
+						<id>feature-source</id>
 						<goals>
-							<goal>source-feature</goal>
+							<goal>feature-source</goal>
 						</goals>
 						<configuration>
 							<excludes>
@@ -358,4 +339,4 @@
 		</profile>
 	</profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/org.eclipse.papyrus.sysml16.p2/pom.xml b/releng/org.eclipse.papyrus.sysml16.p2/pom.xml
index 8bcc73e..d0b2476 100644
--- a/releng/org.eclipse.papyrus.sysml16.p2/pom.xml
+++ b/releng/org.eclipse.papyrus.sysml16.p2/pom.xml
@@ -12,40 +12,4 @@
 	<name>org.eclipse.papyrus.sysml16.p2</name>
 	<description>This plugin defines the update site of SysML 1.6 plugins and feature.</description>
 
-	<build>
-		<plugins>
-			<plugin>
-				<!-- https://github.com/jbosstools/jbosstools-maven-plugins/wiki -->
-				<groupId>org.jboss.tools.tycho-plugins</groupId>
-				<artifactId>repository-utils</artifactId>
-				<version>${jboss.utils.version}</version>
-				<executions>
-					<execution>
-						<id>generate-facade</id>
-						<phase>package</phase>
-						<goals>
-							<goal>generate-repository-facade</goal>
-						</goals>
-						<configuration>
-							<!-- do not generate the pesky web folder and index.html -->
-							<skipWebContentGeneration>true</skipWebContentGeneration>
-							<symbols>
-								<update.site.name>SysML 1.6</update.site.name>
-								<update.site.description>Use this URL in Eclipse to install	SysML 1.6</update.site.description>
-								<update.site.version>${project.version}</update.site.version>
-								<project.website>https://www.eclipse.org/papyrus/components/sysml</project.website>
-								<project.issues>${project.issueManagement.url}</project.issues>
-								<eclipse.target>${eclipse.targetrelease}</eclipse.target>
-								<update.site.nightly>https://ci.eclipse.org/papyrus/job/papyrus-sysml16-master/lastSuccessfulBuild/artifact/releng/org.eclipse.papyrus.sysml16.p2/target/repository/</update.site.nightly>
-							</symbols>
-							<associateSites>
-								<site>https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-12</site>
-							</associateSites>
-							<p2StatsUrl>http://download.eclipse.org/stats</p2StatsUrl>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
\ No newline at end of file
+</project>