diff --git a/cnf/build.bnd b/cnf/build.bnd
index 881d6d3c44..1824dd4b54 100644
--- a/cnf/build.bnd
+++ b/cnf/build.bnd
@@ -52,7 +52,7 @@ Bundle-Version:         ${base.version}.${tstamp}-SNAPSHOT
 # -snapshot unset (commented out) is a snapshot build. (e.g. 6.0.0-SNAPSHOT)
 # -snapshot set to a value (e.g. RC1) is a release build with the value as the Maven version qualifier. (e.g. 6.0.0-RC1)
 # -snapshot set to the empty string is a release build with no Maven version qualifier. (e.g. 6.0.0)
--snapshot: RC3
+-snapshot:
 
 Automatic-Module-Name:  ${def;bsn}
 Bundle-Vendor:          Bndtools https://bndtools.org/
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index aff5c90777..9db0b464eb 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xms1024m -Xmx2048m
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 bnd_group: biz.aQute.bnd
-bnd_version: 6.4.0-RC3
+bnd_version: 6.4.0
 bnd_distrepo: ../dist/bundles
diff --git a/maven/bnd-plugin-parent/pom.xml b/maven/bnd-plugin-parent/pom.xml
index 8a6419acd8..5517c3cb5a 100644
--- a/maven/bnd-plugin-parent/pom.xml
+++ b/maven/bnd-plugin-parent/pom.xml
@@ -12,7 +12,7 @@
 	<version>${revision}</version>
 
 	<properties>
-		<revision>6.4.0-RC3</revision>
+		<revision>6.4.0</revision>
 		<project.build.outputTimestamp>1980-02-01T00:00:00Z</project.build.outputTimestamp>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>