diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 2e2d4e4903..f4f42455e3 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -15,7 +15,7 @@ jobs:
   check-merge-commits:
     uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkMergeCommits.yml@master
   check-versions:
-    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master
+    uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/checkVersions.yml@master
     with:
       botName: Eclipse PDE Bot
       botMail: eclipse-pde-bot@eclipse.org
diff --git a/.github/workflows/version-increments.yml b/.github/workflows/version-increments.yml
index e5d4e876b7..d8a2dcbcd8 100644
--- a/.github/workflows/version-increments.yml
+++ b/.github/workflows/version-increments.yml
@@ -7,6 +7,6 @@ on:
 
 jobs:
   publish-version-check-results:
-    uses: eclipse-platform/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master
+    uses: HannesWell/eclipse.platform.releng.aggregator/.github/workflows/publishVersionCheckResults.yml@master
     secrets:
       githubBotPAT: ${{ secrets.HANNESWELL_PAT }}
diff --git a/pom.xml b/pom.xml
index 8eeba7dbad..b582855ce2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,22 @@
 					<excludePackageNames>${javadoc.excludePackageNames}</excludePackageNames>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho.extras</groupId>
+				<artifactId>tycho-p2-extras-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<baselines>
+						<baseline>${previous-release.baseline}</baseline>
+					</baselines>
+					<comparator>zip</comparator>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-versions-plugin</artifactId>
+				<version>${tycho.version}</version>
+			</plugin>
 	  </plugins>
   </build>
 
@@ -139,5 +155,131 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>fast-version-check-plugins</id>
+      <activation>
+        <property>
+          <name>fast-version-check-enabled</name>
+          <value>true</value>
+        </property>
+        <file>
+          <exists>META-INF/MANIFEST.MF</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-packaging-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>package-plugin-placeholder</id>
+                <goals>
+                  <goal>package-plugin</goal>
+                </goals>
+                <phase>generate-sources</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>generate-p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <baselineMode>disable</baselineMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-p2-extras-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compare-artifact-version-with-release</id>
+                <goals>
+                  <goal>compare-version-with-baselines</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <skip>false</skip>
+                  <ignoredPatterns>**</ignoredPatterns>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>fast-version-check-features</id>
+      <activation>
+        <property>
+          <name>fast-version-check-enabled</name>
+          <value>true</value>
+        </property>
+        <file>
+          <exists>feature.xml</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-packaging-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>package-feature-placeholder</id>
+                <goals>
+                  <goal>package-feature</goal>
+                </goals>
+                <phase>generate-sources</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho</groupId>
+            <artifactId>tycho-p2-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>generate-p2-metadata</id>
+                <goals>
+                  <goal>p2-metadata</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <baselineMode>disable</baselineMode>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.eclipse.tycho.extras</groupId>
+            <artifactId>tycho-p2-extras-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>compare-artifact-version-with-release</id>
+                <goals>
+                  <goal>compare-version-with-baselines</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <skip>false</skip>
+                  <ignoredPatterns>**</ignoredPatterns>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
   </profiles>
 </project>