diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml
index 36bc0b51f9..c438678d54 100644
--- a/target-platform-configuration/pom.xml
+++ b/target-platform-configuration/pom.xml
@@ -32,6 +32,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>target-platform-configuration</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml
index cb73579cad..ec6504e43e 100644
--- a/tycho-apitools-plugin/pom.xml
+++ b/tycho-apitools-plugin/pom.xml
@@ -101,6 +101,14 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-plugin-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-apitools</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/tycho-baseline-plugin/pom.xml b/tycho-baseline-plugin/pom.xml
index 5bed232b86..5acee8e8ba 100644
--- a/tycho-baseline-plugin/pom.xml
+++ b/tycho-baseline-plugin/pom.xml
@@ -60,6 +60,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-baseline</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/tycho-bnd-plugin/pom.xml b/tycho-bnd-plugin/pom.xml
index 98ecf5c524..7df3bcade2 100644
--- a/tycho-bnd-plugin/pom.xml
+++ b/tycho-bnd-plugin/pom.xml
@@ -55,6 +55,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-bnd</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml
index 70cff57273..c29ea7404c 100644
--- a/tycho-compiler-plugin/pom.xml
+++ b/tycho-compiler-plugin/pom.xml
@@ -110,6 +110,14 @@
 					</filesets>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-compiler</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/tycho-ds-plugin/pom.xml b/tycho-ds-plugin/pom.xml
index 901ac646ae..89933d5b25 100644
--- a/tycho-ds-plugin/pom.xml
+++ b/tycho-ds-plugin/pom.xml
@@ -45,6 +45,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-ds</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/tycho-eclipse-plugin/pom.xml b/tycho-eclipse-plugin/pom.xml
index 729f979791..0d955d8f17 100644
--- a/tycho-eclipse-plugin/pom.xml
+++ b/tycho-eclipse-plugin/pom.xml
@@ -75,6 +75,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-eclipse</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file
diff --git a/tycho-extras/target-platform-validation-plugin/pom.xml b/tycho-extras/target-platform-validation-plugin/pom.xml
index 95d1affcfd..655944d45f 100644
--- a/tycho-extras/target-platform-validation-plugin/pom.xml
+++ b/tycho-extras/target-platform-validation-plugin/pom.xml
@@ -43,6 +43,19 @@
 			<artifactId>tycho-core</artifactId>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>target-platform-validation</goalPrefix>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 	<!-- ITests currently failing and not being actively debugged -->
 	<!-- profiles>
diff --git a/tycho-extras/tycho-custom-bundle-plugin/pom.xml b/tycho-extras/tycho-custom-bundle-plugin/pom.xml
index d22efb4a3e..39fc3e577e 100644
--- a/tycho-extras/tycho-custom-bundle-plugin/pom.xml
+++ b/tycho-extras/tycho-custom-bundle-plugin/pom.xml
@@ -59,6 +59,14 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
       </plugin>
+      <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-plugin-plugin</artifactId>
+		<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+		<configuration>
+			<goalPrefix>tycho-custom-bundle</goalPrefix>
+		</configuration>
+	  </plugin>
     </plugins>
   </build>
 
diff --git a/tycho-extras/tycho-dependency-tools-plugin/pom.xml b/tycho-extras/tycho-dependency-tools-plugin/pom.xml
index d3144d319b..849866c9b8 100644
--- a/tycho-extras/tycho-dependency-tools-plugin/pom.xml
+++ b/tycho-extras/tycho-dependency-tools-plugin/pom.xml
@@ -47,6 +47,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-dependency-tools</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	
diff --git a/tycho-extras/tycho-document-bundle-plugin/pom.xml b/tycho-extras/tycho-document-bundle-plugin/pom.xml
index f0fc88803f..9db037b9db 100644
--- a/tycho-extras/tycho-document-bundle-plugin/pom.xml
+++ b/tycho-extras/tycho-document-bundle-plugin/pom.xml
@@ -73,6 +73,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-document-bundle</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/tycho-extras/tycho-eclipserun-plugin/pom.xml b/tycho-extras/tycho-eclipserun-plugin/pom.xml
index c7a33be4a2..12c141b76e 100644
--- a/tycho-extras/tycho-eclipserun-plugin/pom.xml
+++ b/tycho-extras/tycho-eclipserun-plugin/pom.xml
@@ -81,4 +81,17 @@
 			</build>
 		</profile>
 	</profiles>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-eclipserun</goalPrefix>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/tycho-extras/tycho-p2-extras-plugin/pom.xml b/tycho-extras/tycho-p2-extras-plugin/pom.xml
index 50c0397ca9..9742984ba5 100644
--- a/tycho-extras/tycho-p2-extras-plugin/pom.xml
+++ b/tycho-extras/tycho-p2-extras-plugin/pom.xml
@@ -129,6 +129,14 @@
 					</filesets>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-p2-extras</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	
diff --git a/tycho-extras/tycho-version-bump-plugin/pom.xml b/tycho-extras/tycho-version-bump-plugin/pom.xml
index f6d4e365ff..38538ffeb9 100644
--- a/tycho-extras/tycho-version-bump-plugin/pom.xml
+++ b/tycho-extras/tycho-version-bump-plugin/pom.xml
@@ -41,6 +41,19 @@
 			<artifactId>tycho-core</artifactId>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-version-bump</goalPrefix>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 	<profiles>
 		<profile>
diff --git a/tycho-gpg-plugin/pom.xml b/tycho-gpg-plugin/pom.xml
index b95418ec1e..3fd8e7b738 100644
--- a/tycho-gpg-plugin/pom.xml
+++ b/tycho-gpg-plugin/pom.xml
@@ -61,5 +61,18 @@
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-gpg-bump</goalPrefix>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>
diff --git a/tycho-p2-director-plugin/pom.xml b/tycho-p2-director-plugin/pom.xml
index 4739df34c1..ac531e0e33 100644
--- a/tycho-p2-director-plugin/pom.xml
+++ b/tycho-p2-director-plugin/pom.xml
@@ -100,6 +100,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-p2-director</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/tycho-p2-plugin/pom.xml b/tycho-p2-plugin/pom.xml
index c9d441c4eb..f0b3b1af28 100644
--- a/tycho-p2-plugin/pom.xml
+++ b/tycho-p2-plugin/pom.xml
@@ -73,6 +73,14 @@
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-component-metadata</artifactId>
             </plugin>
+            <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-p2-plugin</goalPrefix>
+				</configuration>
+			</plugin>
         </plugins>
     </build>
 
diff --git a/tycho-p2-publisher-plugin/pom.xml b/tycho-p2-publisher-plugin/pom.xml
index 92056ac25d..905452109c 100644
--- a/tycho-p2-publisher-plugin/pom.xml
+++ b/tycho-p2-publisher-plugin/pom.xml
@@ -56,4 +56,16 @@
 		</dependency>
 	</dependencies>
 
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-p2-publisher</goalPrefix>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/tycho-p2-repository-plugin/pom.xml b/tycho-p2-repository-plugin/pom.xml
index 9011f741bd..5a132348b9 100644
--- a/tycho-p2-repository-plugin/pom.xml
+++ b/tycho-p2-repository-plugin/pom.xml
@@ -75,6 +75,14 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-p2-repository</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml
index c69da13348..05b5cf6fc0 100644
--- a/tycho-packaging-plugin/pom.xml
+++ b/tycho-packaging-plugin/pom.xml
@@ -97,6 +97,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-packaging</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/tycho-repository-plugin/pom.xml b/tycho-repository-plugin/pom.xml
index 33f11a3ad1..59b6b177e2 100644
--- a/tycho-repository-plugin/pom.xml
+++ b/tycho-repository-plugin/pom.xml
@@ -72,6 +72,14 @@
 					<staticMetadataDirectory>${project.build.directory}/filtered/META-INF/plexus/</staticMetadataDirectory>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-450 -->
+				<configuration>
+					<goalPrefix>tycho-repository</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>
diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml
index 1600405a0c..d19a05680d 100644
--- a/tycho-source-plugin/pom.xml
+++ b/tycho-source-plugin/pom.xml
@@ -98,6 +98,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-source</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
index 6525e840a4..09c68009fb 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -41,6 +41,14 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-surefire</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 	<dependencies>
diff --git a/tycho-versions-plugin/pom.xml b/tycho-versions-plugin/pom.xml
index 85d661340b..1ddf0bd193 100644
--- a/tycho-versions-plugin/pom.xml
+++ b/tycho-versions-plugin/pom.xml
@@ -72,6 +72,14 @@
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-component-metadata</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-plugin-plugin</artifactId>
+				<!-- workaround for https://issues.apache.org/jira/browse/MPLUGIN-504 -->
+				<configuration>
+					<goalPrefix>tycho-versions</goalPrefix>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
\ No newline at end of file