diff --git a/p2-maven-plugin/pom.xml b/p2-maven-plugin/pom.xml
index 389e7d86e0..7912b92d2e 100644
--- a/p2-maven-plugin/pom.xml
+++ b/p2-maven-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>p2-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index f16860f1e3..1abf201561 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 
 	<groupId>org.eclipse.tycho</groupId>
 	<artifactId>tycho</artifactId>
-	<version>3.0.4-SNAPSHOT</version>
+	<version>3.0.4</version>
 	<packaging>pom</packaging>
 
 	<name>Tycho</name>
diff --git a/sisu-osgi/pom.xml b/sisu-osgi/pom.xml
index 1c8ff3fca2..3549dd2960 100644
--- a/sisu-osgi/pom.xml
+++ b/sisu-osgi/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>sisu-osgi</artifactId>
diff --git a/sisu-osgi/sisu-equinox-embedder/pom.xml b/sisu-osgi/sisu-equinox-embedder/pom.xml
index d2c075c84d..df89194617 100644
--- a/sisu-osgi/sisu-equinox-embedder/pom.xml
+++ b/sisu-osgi/sisu-equinox-embedder/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-osgi</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>sisu-equinox-embedder</artifactId>
 
diff --git a/sisu-osgi/sisu-equinox-launching/pom.xml b/sisu-osgi/sisu-equinox-launching/pom.xml
index 103da32c6e..8c8861ffae 100644
--- a/sisu-osgi/sisu-equinox-launching/pom.xml
+++ b/sisu-osgi/sisu-equinox-launching/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-osgi</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>sisu-equinox-launching</artifactId>
 
diff --git a/sisu-osgi/sisu-osgi-api/pom.xml b/sisu-osgi/sisu-osgi-api/pom.xml
index 8f85c081f7..363031d12f 100644
--- a/sisu-osgi/sisu-osgi-api/pom.xml
+++ b/sisu-osgi/sisu-osgi-api/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-osgi</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>sisu-osgi-api</artifactId>
 
diff --git a/sisu-osgi/sisu-osgi-connect/pom.xml b/sisu-osgi/sisu-osgi-connect/pom.xml
index 15f319ba96..433541338f 100644
--- a/sisu-osgi/sisu-osgi-connect/pom.xml
+++ b/sisu-osgi/sisu-osgi-connect/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>sisu-osgi</artifactId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>3.0.4</version>
   </parent>
   <artifactId>sisu-osgi-connect</artifactId>
   <name>Sisu Implementation of the OSGi R8 Framework Connect Specification</name>
diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml
index 9b222e5891..b522830e8c 100644
--- a/target-platform-configuration/pom.xml
+++ b/target-platform-configuration/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>target-platform-configuration</artifactId>
diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml
index d29c9611c4..5819dcd9f7 100644
--- a/tycho-apitools-plugin/pom.xml
+++ b/tycho-apitools-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-apitools-plugin</artifactId>
 	<name>Plugin for performing API analysis tasks</name>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
index 9c005415f1..1c39b45bf6 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho</artifactId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>3.0.4</version>
   </parent>
   <artifactId>tycho-artifactcomparator</artifactId>
   <properties>
diff --git a/tycho-bnd-plugin/pom.xml b/tycho-bnd-plugin/pom.xml
index b2f2acfd8c..3f00efd702 100644
--- a/tycho-bnd-plugin/pom.xml
+++ b/tycho-bnd-plugin/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-bnd-plugin</artifactId>
 	<name>Tycho BND Plugin</name>
diff --git a/tycho-build/pom.xml b/tycho-build/pom.xml
index e86aac42a1..6d5f93f383 100644
--- a/tycho-build/pom.xml
+++ b/tycho-build/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-build</artifactId>
 
diff --git a/tycho-buildtimestamp-jgit/pom.xml b/tycho-buildtimestamp-jgit/pom.xml
index 1c0a930449..be7bb33298 100644
--- a/tycho-buildtimestamp-jgit/pom.xml
+++ b/tycho-buildtimestamp-jgit/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-buildtimestamp-jgit</artifactId>
 
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
index 7e2e2d6885..736a0945c9 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Core Maven/OSGi Shared Classes Tests
 Bundle-SymbolicName: org.eclipse.tycho.core.shared.tests
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Fragment-Host: org.eclipse.tycho.core.shared
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit;bundle-version="4.8.2"
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
index fe02fb6a26..2ac890df5a 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.core.shared.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
index eb2e51c4b8..f8537ab337 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.tycho.core.shared
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Name: Tycho Core Maven/OSGi Shared Classes
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.tycho.artifacts,
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
index 2de4d9ff6b..473709ef78 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.core.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
index de203a4363..88372c3f92 100644
--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.tycho.embedder.shared
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Name: Tycho Embedder API Maven/OSGi Shared Classes
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
index 8bf93bfe1a..af337b3bce 100644
--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.embedder.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
index 260dd7c890..86c8b3f726 100644
--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Noop Equinox password provider
 Bundle-SymbolicName: org.eclipse.tycho.noopsecurity;singleton:=true
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100"
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
index 57dbd26f68..bab4df0bb7 100644
--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.noopsecurity</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
index 34df3f8cc7..284ae95e6b 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Maven/p2 Repository Integration Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository.tests;singleton:=true
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Fragment-Host: org.eclipse.tycho.p2.maven.repository
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
index 3125500c9d..5975d27fcf 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.maven.repository.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
index 29eaf89f1a..d32b10bf2c 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Maven/p2 Repository Integration
 Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository;singleton:=true
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
index 2af982c147..98136a0e2c 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.maven.repository</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
index 3f5909de68..31e4643274 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Resolver Bundle Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Fragment-Host: org.eclipse.tycho.p2.resolver.impl
 Require-Bundle: org.junit,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
index a68472031e..51eea374cb 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.impl.test</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
index 6f8a3f3447..cdfe2eb806 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Resolver Bundle
 Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl;singleton:=true
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Activator: org.eclipse.tycho.p2.impl.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.equinox.security;bundle-version="1.0.100",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
index 5d3f00f469..f5fc34ffcc 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.impl</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
index 42d1975068..e43da75a56 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.shared.tests;singleton:=true
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Fragment-Host: org.eclipse.tycho.p2.resolver.shared
 Bundle-Vendor: Eclipse Tycho
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml
index 1c6f44003d..638a6adc37 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.shared.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
index 9ba19e7d4d..0fe5b7b255 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Export-Package:
  org.eclipse.tycho.p2.resolver.facade,
  org.eclipse.tycho.p2.target.facade,
  org.eclipse.tycho.repository.registry.facade
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes
 Bundle-ManifestVersion: 2
 Bundle-Description: Tycho integrates Maven with Eclipse and OSGi
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
index ddbf83681a..f6376931b1 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
index 533bfb7f1f..11469d1bc4 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Name: Tycho p2 Tools Bundle
 Bundle-ManifestVersion: 2
 Bundle-Description: Implementation of tools for generating, copying, and using p2 repositories in Tycho
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
index 422ecb5913..8cfdc03cab 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.tools.impl</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
index 5f8488a903..bb091eedc5 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-Name: Tycho p2 Tools Maven/OSGi Shared Classes
 Bundle-ManifestVersion: 2
 Bundle-Description: Exposes tools for manipulating p2 data, which are implemented in OSGi bundles, to Maven plug-ins
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
index 28b7737533..59712eff34 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.tools.shared</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
index db799edb4e..62bbada6ba 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho p2 Tools Tests
 Bundle-SymbolicName: org.eclipse.tycho.p2.tools.tests
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Fragment-Host: org.eclipse.tycho.p2.tools.impl
 Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
index 3243421581..15b4031604 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.p2.tools.tests</artifactId>
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
index 4a0deaafd8..6089ec1b92 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Test Utilities
 Bundle-SymbolicName: org.eclipse.tycho.test.utils
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
  org.hamcrest.core,
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
index b4add3f161..dd505321ad 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>org.eclipse.tycho.test.utils</artifactId>
diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml
index 013c274dc6..898a0c8680 100644
--- a/tycho-bundles/pom.xml
+++ b/tycho-bundles/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-bundles</artifactId>
diff --git a/tycho-bundles/tycho-bundles-target/pom.xml b/tycho-bundles/tycho-bundles-target/pom.xml
index db23433972..744eb45671 100644
--- a/tycho-bundles/tycho-bundles-target/pom.xml
+++ b/tycho-bundles/tycho-bundles-target/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
index 96e94b6a82..1bcb477e71 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-compiler-jdt</artifactId>
 
diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml
index 53bc68b07d..ec17158cb0 100644
--- a/tycho-compiler-plugin/pom.xml
+++ b/tycho-compiler-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-compiler-plugin</artifactId>
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index e431caf1ce..ee000235fa 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-core</artifactId>
 
diff --git a/tycho-ds-plugin/pom.xml b/tycho-ds-plugin/pom.xml
index 19aab6e638..16f1734e83 100644
--- a/tycho-ds-plugin/pom.xml
+++ b/tycho-ds-plugin/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.eclipse.tycho</groupId>
     <artifactId>tycho</artifactId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>3.0.4</version>
   </parent>
   <artifactId>tycho-ds-plugin</artifactId>
   <packaging>maven-plugin</packaging>
diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml
index f15fd519b2..2d289ff1a9 100644
--- a/tycho-embedder-api/pom.xml
+++ b/tycho-embedder-api/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-embedder-api</artifactId>
 
diff --git a/tycho-extras/pom.xml b/tycho-extras/pom.xml
index e3b8ea46cb..77b89b4a88 100644
--- a/tycho-extras/pom.xml
+++ b/tycho-extras/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<groupId>org.eclipse.tycho.extras</groupId>
diff --git a/tycho-extras/target-platform-validation-plugin/pom.xml b/tycho-extras/target-platform-validation-plugin/pom.xml
index 138b25068d..0f2bb74a77 100644
--- a/tycho-extras/target-platform-validation-plugin/pom.xml
+++ b/tycho-extras/target-platform-validation-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>target-platform-validation-plugin</artifactId>
diff --git a/tycho-extras/tycho-custom-bundle-plugin/pom.xml b/tycho-extras/tycho-custom-bundle-plugin/pom.xml
index 01bef47243..5200bf5a92 100644
--- a/tycho-extras/tycho-custom-bundle-plugin/pom.xml
+++ b/tycho-extras/tycho-custom-bundle-plugin/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.eclipse.tycho.extras</groupId>
     <artifactId>tycho-extras</artifactId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>3.0.4</version>
   </parent>
 
   <artifactId>tycho-custom-bundle-plugin</artifactId>
diff --git a/tycho-extras/tycho-dependency-tools-plugin/pom.xml b/tycho-extras/tycho-dependency-tools-plugin/pom.xml
index 0ab78d1fd6..fc9fc9a792 100644
--- a/tycho-extras/tycho-dependency-tools-plugin/pom.xml
+++ b/tycho-extras/tycho-dependency-tools-plugin/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-dependency-tools-plugin</artifactId>
diff --git a/tycho-extras/tycho-document-bundle-plugin/pom.xml b/tycho-extras/tycho-document-bundle-plugin/pom.xml
index 961d3490b2..07a1a65a1d 100644
--- a/tycho-extras/tycho-document-bundle-plugin/pom.xml
+++ b/tycho-extras/tycho-document-bundle-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-document-bundle-plugin</artifactId>
diff --git a/tycho-extras/tycho-eclipserun-plugin/pom.xml b/tycho-extras/tycho-eclipserun-plugin/pom.xml
index 04345e876b..db79d94e45 100644
--- a/tycho-extras/tycho-eclipserun-plugin/pom.xml
+++ b/tycho-extras/tycho-eclipserun-plugin/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tycho-extras</artifactId>
     <groupId>org.eclipse.tycho.extras</groupId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>3.0.4</version>
   </parent>
 
   <artifactId>tycho-eclipserun-plugin</artifactId>
diff --git a/tycho-extras/tycho-extras-its/pom.xml b/tycho-extras/tycho-extras-its/pom.xml
index 4718b56952..47b611556f 100644
--- a/tycho-extras/tycho-extras-its/pom.xml
+++ b/tycho-extras/tycho-extras-its/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-extras-its</artifactId>
diff --git a/tycho-extras/tycho-p2-extras-plugin/pom.xml b/tycho-extras/tycho-p2-extras-plugin/pom.xml
index bc7f770199..02f8f3e5be 100644
--- a/tycho-extras/tycho-p2-extras-plugin/pom.xml
+++ b/tycho-extras/tycho-p2-extras-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-p2-extras-plugin</artifactId>
diff --git a/tycho-extras/tycho-pomless/pom.xml b/tycho-extras/tycho-pomless/pom.xml
index 16d48f5220..90456a0e4b 100644
--- a/tycho-extras/tycho-pomless/pom.xml
+++ b/tycho-extras/tycho-pomless/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	
   <artifactId>tycho-pomless</artifactId>
diff --git a/tycho-extras/tycho-sourceref-jgit/pom.xml b/tycho-extras/tycho-sourceref-jgit/pom.xml
index 91efc9122c..2e61363fbb 100644
--- a/tycho-extras/tycho-sourceref-jgit/pom.xml
+++ b/tycho-extras/tycho-sourceref-jgit/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-sourceref-jgit</artifactId>
 
diff --git a/tycho-extras/tycho-version-bump-plugin/pom.xml b/tycho-extras/tycho-version-bump-plugin/pom.xml
index 497ba3f219..752a8e9e59 100644
--- a/tycho-extras/tycho-version-bump-plugin/pom.xml
+++ b/tycho-extras/tycho-version-bump-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho.extras</groupId>
 		<artifactId>tycho-extras</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-version-bump-plugin</artifactId>
diff --git a/tycho-gpg-plugin/pom.xml b/tycho-gpg-plugin/pom.xml
index 14081120d7..dd439cedd8 100644
--- a/tycho-gpg-plugin/pom.xml
+++ b/tycho-gpg-plugin/pom.xml
@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-gpg-plugin</artifactId>
diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
index 7dda9faef2..5c6b31013b 100644
--- a/tycho-its/pom.xml
+++ b/tycho-its/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-its</artifactId>
 
diff --git a/tycho-lib-detector/pom.xml b/tycho-lib-detector/pom.xml
index d1b11b7a37..33a2885709 100644
--- a/tycho-lib-detector/pom.xml
+++ b/tycho-lib-detector/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-lib-detector</artifactId>
 	<name>Tycho JVM Library Detector</name>
diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml
index b23b1631e4..4bd1dd0456 100644
--- a/tycho-maven-plugin/pom.xml
+++ b/tycho-maven-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-maven-plugin</artifactId>
diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml
index b0ed08505a..44ca16add4 100644
--- a/tycho-metadata-model/pom.xml
+++ b/tycho-metadata-model/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-metadata-model</artifactId>
 
diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml
index 22b2ad16a9..a55478e64b 100644
--- a/tycho-p2/pom.xml
+++ b/tycho-p2/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-p2</artifactId>
diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml
index c28d5b3c13..0a32f3aef9 100644
--- a/tycho-p2/tycho-p2-director-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-director-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-p2-director-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
index a8445b22ac..1134c459c3 100644
--- a/tycho-p2/tycho-p2-facade/pom.xml
+++ b/tycho-p2/tycho-p2-facade/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-p2-facade</artifactId>
 
diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml
index de260037dd..b13d2f1fcb 100644
--- a/tycho-p2/tycho-p2-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-p2-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
index d8bb3a6fef..a2fe2330a7 100644
--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-p2-publisher-plugin</artifactId>
diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml
index cf772a6a8a..1fdf57e8c1 100644
--- a/tycho-p2/tycho-p2-repository-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-repository-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-p2</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-p2-repository-plugin</artifactId>
diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml
index 75a2d4ff5a..b8534d8a9e 100644
--- a/tycho-packaging-plugin/pom.xml
+++ b/tycho-packaging-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-packaging-plugin</artifactId>
diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml
index 32dd44615e..ce6f654e8d 100644
--- a/tycho-release/pom.xml
+++ b/tycho-release/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-release</artifactId>
diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml
index 4d6b8e185e..15a06089f0 100644
--- a/tycho-release/tycho-versions-plugin/pom.xml
+++ b/tycho-release/tycho-versions-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-release</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-versions-plugin</artifactId>
diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml
index d8963e58c4..159fc4fdf9 100644
--- a/tycho-source-plugin/pom.xml
+++ b/tycho-source-plugin/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 
 	<artifactId>tycho-source-plugin</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
index aff6557c38..a45ae6f663 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
index 28ccf00003..daf9d5c9a9 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 7ab8a5f946..2e9b5a491d 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit47</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml
index 36564b13c1..12214f720d 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit5/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit5</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml
index 52a4acdc4b..8880dc53e6 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit54/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit54</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml
index 4162f7b0ba..f9a1f0f00b 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit55/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit55</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml
index a42491c381..5bdaf176f5 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit56/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit56</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml
index 176ddbc426..624125bef6 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit57/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit57</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/pom.xml
index fb30c90d66..c322576094 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit57withvintage/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit57withvintage</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit58/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit58/pom.xml
index 2c68f9bc30..0f42464021 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit58/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit58/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit58</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/pom.xml
index cd618f45ef..ffd5f98b6f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit58withvintage/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit58withvintage</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit59/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit59/pom.xml
index 5c6f7c6959..20fe8d7d48 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit59/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit59/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit59</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/pom.xml
index 2f842b4875..9a340e1743 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit59withvintage/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit59withvintage</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
index 2e492f7e19..60bef94de5 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
  org.eclipse.ui.workbench;bundle-version="3.2.2";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="3.2.0"
 Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.4.qualifier
+Bundle-Version: 3.0.4
 Bundle-ClassPath: .,
  jars/surefire-booter-3.0.0-M5.jar,
  jars/surefire-api-3.0.0-M5.jar,
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
index de9237af96..a26f1bef7d 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 		<relativePath>../../tycho-bundles/pom.xml</relativePath>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml
index 5cb8ed6296..6a44bed4c8 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.testng/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-surefire</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.testng</artifactId>
 	<packaging>jar</packaging>
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
index 550af7e7c3..07a72c5595 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -15,7 +15,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 		<relativePath>../tycho-bundles/pom.xml</relativePath>
 	</parent>
 	<artifactId>tycho-surefire</artifactId>
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
index 89eeaa425c..a7d3f17ee9 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml
index 1ba9d13d64..d3b10fa504 100644
--- a/tycho-testing-harness/pom.xml
+++ b/tycho-testing-harness/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>3.0.4-SNAPSHOT</version>
+		<version>3.0.4</version>
 	</parent>
 	<artifactId>tycho-testing-harness</artifactId>