diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index a94c9cb..b4883f7 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
   <extension>
-    <groupId>org.eclipse.tycho.extras</groupId>
-    <artifactId>tycho-pomless</artifactId>
-    <version>2.3.0</version>
+    <groupId>org.eclipse.tycho</groupId>
+    <artifactId>tycho-build</artifactId>
+    <version>2.7.0</version>
   </extension>
 </extensions>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6f3067a..0db0b5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,12 +44,11 @@
 
 	<properties>
 		<app4mc.version>${project.version}</app4mc.version>
-		<app4mc.baseline>1.2.0</app4mc.baseline>
+		<app4mc.baseline>2.0.0</app4mc.baseline>
 
-		<tycho.version>2.3.0</tycho.version>
+		<tycho.version>2.7.0</tycho.version>
 
 		<build-helper.version>1.9.1</build-helper.version>
-		<org.jboss.tools.tycho-plugins.version>2.2.0</org.jboss.tools.tycho-plugins.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -66,19 +65,6 @@
 	</properties>
 
 	<pluginRepositories>
-
-		<pluginRepository>
-			<id>jboss-public-repository-group</id>
-			<name>JBoss Public Repository Group</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public/</url>
-		</pluginRepository>
-
-		<pluginRepository>
-			<id>jboss-snapshots-repository</id>
-			<name>JBoss Snapshots Repository</name>
-			<url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
-		</pluginRepository>
-
 		<pluginRepository>
 			<id>cbi</id>
 			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
@@ -91,19 +77,14 @@
 		</pluginRepository>
 	</pluginRepositories>
 
-
-
 	<!-- Common plugins and features contained in the open source distribution -->
 	<modules>
-
 		<module>plugins</module>
 		<module>tests</module>
 		<module>features</module>
 		<module>releng</module>
-
 	</modules>
 
-
 	<build>
 		<pluginManagement>
 			<plugins>
diff --git a/releng/org.eclipse.app4mc.converters.p2repo/pom.xml b/releng/org.eclipse.app4mc.converters.p2repo/pom.xml
index c27fd23..8841e47 100644
--- a/releng/org.eclipse.app4mc.converters.p2repo/pom.xml
+++ b/releng/org.eclipse.app4mc.converters.p2repo/pom.xml
@@ -49,40 +49,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
-			<plugin>
-				<groupId>org.jboss.tools.tycho-plugins</groupId>
-				<artifactId>repository-utils</artifactId>
-				<version>${org.jboss.tools.tycho-plugins.version}</version>
-
-				<executions>
-					<execution>
-						<id>generate-facade</id>
-						<phase>package</phase>
-
-						<goals>
-							<goal>generate-repository-facade</goal>
-						</goals>
-
-						<configuration>
-							<siteTemplateFolder>siteTemplate</siteTemplateFolder>
-
-							<!-- Symbols are used while expanding index.html template -->
-							<symbols>
-								<update.site.name>${project.parent.name}</update.site.name>
-								<target.eclipse.version>IDE 2020-06 (4.16)</target.eclipse.version>
-								<target.app4mc.version>APP4MC 2.1.0</target.app4mc.version>
-							</symbols>
-
-							<associateSites>
-								<site>http://download.eclipse.org/releases/2020-06</site>
-								<site>http://download.eclipse.org/cbi/updates/license</site>
-								<site>http://download.eclipse.org/tools/orbit/downloads/drops/R20191126223242/repository</site>
-							</associateSites>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target b/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target
index 5f8605b..fba0c3f 100644
--- a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target
+++ b/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.target
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
-<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Amalthea Model Migration Target" sequenceNumber="1647357096">
+<target name="Amalthea Model Migration Target">
   <locations>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <repository location="https://download.eclipse.org/releases/2020-06"/>
       <unit id="org.eclipse.sdk.ide" version="4.16.0.I20200604-0540"/>
       <unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.200.v20200528-0603"/>
       <unit id="javax.xml" version="1.3.4.v201005080400"/>
@@ -15,16 +15,15 @@
       <unit id="org.apache.felix.gogo.runtime" version="1.1.0.v20180713-1646"/>
       <unit id="org.apache.felix.gogo.shell" version="1.1.0.v20180713-1646"/>
       <unit id="org.eclipse.equinox.console" version="1.4.100.v20200525-1407"/>
-      <repository location="https://download.eclipse.org/releases/2020-06"/>
     </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
       <unit id="org.jaxen" version="1.1.6.v20191106-1554"/>
       <unit id="org.jdom2" version="2.0.6.v20191125-0928"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
     </location>
-    <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <repository location="https://download.eclipse.org/cbi/updates/license"/>
+      <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
     </location>
   </locations>
 </target>
diff --git a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.tpd b/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.tpd
deleted file mode 100644
index a7cd34c..0000000
--- a/releng/org.eclipse.app4mc.converters.target/org.eclipse.app4mc.converters.target.tpd
+++ /dev/null
@@ -1,26 +0,0 @@
-target "Amalthea Model Migration Target"
-
-with source allEnvironments
-
-location "https://download.eclipse.org/releases/2020-06" {
-	org.eclipse.sdk.ide
-	org.eclipse.equinox.sdk.feature.group
-	javax.xml
-	org.apache.xalan [2.7.1,2.7.2)
-	org.apache.xerces [2.9.0,2.10.0)
-	org.apache.xml.resolver [1.2.0,1.2.1)
-	org.apache.xml.serializer [2.7.1,2.7.2)
-	org.apache.felix.gogo.command [1.0.2,1.1.0)
-	org.apache.felix.gogo.runtime [1.1.0,1.2.0)
-	org.apache.felix.gogo.shell [1.1.0,1.2.0)
-	org.eclipse.equinox.console [1.4.0,1.5.0)
-}
-
-location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository" {
-	org.jaxen [1.1.6,1.1.7)
-	org.jdom2 [2.0.6,2.0.7)
-}
-
-location "https://download.eclipse.org/cbi/updates/license" {
-	org.eclipse.license.feature.group
-}