diff --git a/docs/antora.yml b/docs/antora.yml
index f87ca3d37c..a13e12e1e5 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -1,4 +1,3 @@
-'display_version': '5.8.0-M3'
 'name': 'ROOT'
-'prerelease': 'true'
-'version': '5.8.0-M3'
+'prerelease': '-SNAPSHOT'
+'version': '5.8.0'
diff --git a/gradle.properties b/gradle.properties
index 557d48b317..34487789d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ springJavaformatVersion=0.0.34
 springBootVersion=2.4.2
 springFrameworkVersion=5.3.23
 openSamlVersion=3.4.6
-version=5.8.0-M3
+version=5.8.0-SNAPSHOT
 kotlinVersion=1.7.10
 samplesBranch=5.8.x
 org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError