diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e9fc6f3..c18c8de 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,10 +4,11 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   Library-ModelCompositionRefinement:
-    uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@v3.4
+    uses: PalladioSimulator/Palladio-Build-ActionsPipeline/.github/workflows/build.yml@FixTagCreationLogic
     with:
       use-display-output: true
       runner-label: ubuntu-latest
+      java-version: 21
       deploy-updatesite: 'releng/tools.mdsd.mocore.updatesite/target/repository'
     secrets:
       SERVER_SSH_KEY: ${{ secrets.DEPLOYMENT_SERVER_SSH_KEY }}
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 2499cd7..3b91197 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>org.eclipse.tycho.extras</groupId>
-		<artifactId>tycho-pomless</artifactId>
-		<version>2.7.5</version>
-	</extension>
-	<extension>
-		<groupId>org.palladiosimulator</groupId>
-		<artifactId>tycho-tp-refresh-maven-plugin</artifactId>
-		<version>0.2.6</version>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>tycho-build</artifactId>
+		<version>4.0.13</version>
 	</extension>
 </extensions>
diff --git a/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF b/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF
index 42a607a..6f1489d 100644
--- a/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF
+++ b/bundles/tools.mdsd.mocore.framework/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.mdsd.mocore.framework;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Automatic-Module-Name: tools.mdsd.mocore.framework
 Bundle-Vendor: mdsd.tools
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Export-Package: tools.mdsd.mocore.framework.discovery,
  tools.mdsd.mocore.framework.orchestration,
diff --git a/pom.xml b/pom.xml
index 7555e46..aa4d013 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,141 @@
 <?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">
+<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>tools.mdsd</groupId>
-		<artifactId>eclipse-parent-updatesite</artifactId>
-		<version>0.8.9</version>
-	</parent>
-
 	<groupId>tools.mdsd.mocore</groupId>
 	<artifactId>parent</artifactId>
 	<version>5.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
+	<name>${project.artifactId}</name>
+	<description>Framework for model composition and refinement.</description>
+	<url>http://mdsd.tools</url>
 
 	<properties>
-		<org.palladiosimulator.maven.tychotprefresh.tplocation.2>${project.basedir}/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target</org.palladiosimulator.maven.tychotprefresh.tplocation.2>
+		<tycho.version>4.0.13</tycho.version>
+		<java.version>21</java.version>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven.compiler.target>${java.version}</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
+		<targetPlatform.relativePath>releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target</targetPlatform.relativePath>
 	</properties>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<target>
+						<!-- Resolved once for the whole reactor instead of per module. -->
+						<file>${maven.multiModuleProjectDirectory}/${targetPlatform.relativePath}</file>
+					</target>
+					<environments>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>aarch64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>aarch64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<id>plugin-source</id>
+						<goals>
+							<goal>plugin-source</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>feature-source</id>
+						<goals>
+							<goal>feature-source</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<executions>
+					<execution>
+						<id>attached-p2-metadata</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<includes>
+						<include>**/*Test.java</include>
+						<include>**/*Tests.java</include>
+					</includes>
+					<failIfNoTests>false</failIfNoTests>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<excludeDefaultDirectories>true</excludeDefaultDirectories>
+					<filesets>
+						<fileset>
+							<directory>${project.basedir}</directory>
+							<includes>
+								<include>target/**</include>
+								<include>xtend-gen/**</include>
+							</includes>
+							<excludes>
+								<exclude>*/.gitkeep</exclude>
+							</excludes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
 	<modules>
 		<module>releng</module>
 		<module>bundles</module>
diff --git a/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target b/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target
index 1a27818..a796bb1 100644
--- a/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target
+++ b/releng/tools.mdsd.mocore.targetplatform/tools.mdsd.mocore.targetplatform.target
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="tools.mdsd.mocore Target Platform" sequenceNumber="1">
+<target name="tools.mdsd.mocore Target Platform" sequenceNumber="2">
    <locations>
+      <!-- Eclipse base. Until the move to a standalone build this repository declared
+           no locations at all and relied entirely on the eclipse-modeling-2023-03
+           target that the shared parent merged into every build. -->
+      <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
+         <repository location="https://download.eclipse.org/releases/2024-06/202406121000/"/>
+         <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+         <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+         <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+         <unit id="org.junit" version="0.0.0"/>
+         <unit id="junit-jupiter-api" version="0.0.0"/>
+         <unit id="junit-jupiter-params" version="0.0.0"/>
+         <unit id="junit-jupiter-engine" version="0.0.0"/>
+         <unit id="junit-platform-commons" version="0.0.0"/>
+         <unit id="junit-platform-launcher" version="0.0.0"/>
+         <unit id="org.apiguardian.api" version="0.0.0"/>
+      </location>
+      <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
+         <repository location="https://updatesite.mdsd.tools/build-licensefeature/releases/1.1.0/"/>
+         <unit id="tools.mdsd.license.epl2.feature.group" version="0.0.0"/>
+      </location>
    </locations>
 </target>
diff --git a/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF b/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF
index dce10fc..704f314 100644
--- a/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF
+++ b/tests/tools.mdsd.mocore.framework.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: tools.mdsd.mocore.framework.test;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: mdsd.tools
 Automatic-Module-Name: tools.mdsd.mocore.framework.test
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Export-Package: tools.mdsd.mocore.framework.processor,
  tools.mdsd.mocore.framework.surrogate,