diff --git a/webtools.repositories/patch-repository/pom.xml b/webtools.repositories/patch-repository/pom.xml
index e97706d..1f11b77 100644
--- a/webtools.repositories/patch-repository/pom.xml
+++ b/webtools.repositories/patch-repository/pom.xml
@@ -83,7 +83,7 @@
 						<configuration>
 							<target>
 								<zip
-									destfile="${project.build.directory}/patches-repo-P-${unqualifiedVersion}-${BUILD_ID}.zip"
+									destfile="${project.build.directory}/patches-repo-P-${unqualifiedVersion}.zip"
 									basedir="${project.build.directory}/repository" />
 							</target>
 						</configuration>
diff --git a/wtp-parent/postBuild.xml b/wtp-parent/postBuild.xml
index dbeb05f..a2111d4 100644
--- a/wtp-parent/postBuild.xml
+++ b/wtp-parent/postBuild.xml
@@ -82,7 +82,7 @@
 						<propertyregex
 							property="wtp.version"
 							input="${repo.id}"
-							regexp=".*patches-repo-P-(.*)-(.*)-(.*)\.zip" 
+							regexp=".*patches-repo-P-(.*)\.zip" 
 							select="\1" 
 							casesensitive="false" />
 						
@@ -245,7 +245,7 @@
 					<fileset dir="${dest.path}" />
 					<mapper>
 						<mapper type="regexp" 
-							from="patches-repo-P-(.*)-.*\.zip" 
+							from="patches-repo-P-.*\.zip" 
 							to="patches-repo-P-${wtp.version}-${build}.zip" />
 						</mapper>
 					</move>