diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index fdf2b1a..f998810 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-pomless</artifactId>
-    <version>1.0.0</version>
+    <version>2.5.0</version>
   </extension>
 </extensions>
\ No newline at end of file
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 642d572..598fb34 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/bundles/pom.xml b/bundles/pom.xml
deleted file mode 100644
index 3fc1ab6..0000000
--- a/bundles/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>edu.kit.ipd.sdq</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-		<relativePath>../releng/edu.kit.ipd.sdq.metamodels.demo.parent</relativePath>
-	</parent>
-	<artifactId>edu.kit.ipd.sdq.metamodels.demo.bundles</artifactId>
-	<packaging>pom</packaging>
-	<name>Demo Metamodels Bundle Modules</name>
-</project>
\ No newline at end of file
diff --git a/features/pom.xml b/features/pom.xml
deleted file mode 100644
index 26b6340..0000000
--- a/features/pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>edu.kit.ipd.sdq</groupId>
-		<artifactId>parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-		<relativePath>../releng/edu.kit.ipd.sdq.metamodels.demo.parent</relativePath>
-	</parent>
-	<artifactId>edu.kit.ipd.sdq.metamodels.demo.features</artifactId>
-	<packaging>pom</packaging>
-	<name>Demo Metamodels Feature Modules</name>
-</project>
\ No newline at end of file
diff --git a/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml b/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml
index 6cdcb8f..c6f250d 100644
--- a/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml
+++ b/releng/edu.kit.ipd.sdq.metamodels.demo.parent/pom.xml
@@ -9,7 +9,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<tycho.version>2.1.0</tycho.version>
+		<tycho.version>2.5.0</tycho.version>
 		<mwe.version>1.6.1</mwe.version>
 		<mwe2.version>2.12.1</mwe2.version>
 		<emf-codegen.version>2.22.0</emf-codegen.version>
@@ -19,9 +19,9 @@
 
 	<repositories>
 		<repository>
-			<id>Eclipse 2020-12</id>
+			<id>Eclipse 2021-12</id>
 			<layout>p2</layout>
-			<url>http://download.eclipse.org/releases/2020-12</url>
+			<url>http://download.eclipse.org/releases/2021-12</url>
 		</repository>
 	</repositories>
 
@@ -69,7 +69,7 @@
 				</configuration>
 			</plugin>
 
-			<!-- Creates source versions of bundles -->
+			<!-- Creates source versions of bundles and features -->
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
@@ -81,20 +81,10 @@
 							<goal>plugin-source</goal>
 						</goals>
 					</execution>
-				</executions>
-			</plugin>
-
-			<!-- Creates source versions of features -->
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-source-feature-plugin</artifactId>
-				<version>${tycho.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>
 					</execution>
 				</executions>
@@ -107,7 +97,7 @@
 				<version>${tycho.version}</version>
 				<executions>
 					<execution>
-						<id>attached-p2-metadata</id>
+						<id>attach-p2-metadata</id>
 						<phase>package</phase>
 						<goals>
 							<goal>p2-metadata</goal>