diff --git a/parent/pom.xml b/parent/pom.xml
index 0fe5a29..287c1a0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,7 +31,7 @@
     <!-- ====================================================================== -->
     <groupId>org.apache.jackrabbit.vault</groupId>
     <artifactId>parent</artifactId>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
     <packaging>pom</packaging>
 
     <name>Apache Jackrabbit FileVault (Parent Project)</name>
@@ -59,7 +59,7 @@
         <surefire.version>3.0.0-M5</surefire.version>
         <sling.url>http://localhost:4502</sling.url>
         <jacoco.command /><!-- is overwritten by https://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
-        <project.build.outputTimestamp>2021-11-22T11:11:15Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2021-12-17T11:17:45Z</project.build.outputTimestamp>
     </properties>
 
     <!-- ====================================================================== -->
@@ -72,7 +72,7 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git</developerConnection>
         <url>https://github.com/apache/jackrabbit-filevault/tree/${project.scm.tag}</url>
-        <tag>master</tag>
+        <tag>jackrabbit-filevault-3.5.8</tag>
     </scm>
 
     <!-- ====================================================================== -->
diff --git a/pom.xml b/pom.xml
index 8763908..087a99a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -53,7 +53,7 @@
     </modules>
 
     <properties>
-        <project.build.outputTimestamp>2021-11-22T11:11:15Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2021-12-17T11:17:45Z</project.build.outputTimestamp>
     </properties>
 
     <distributionManagement>
@@ -340,4 +340,8 @@
             </build>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/target-osgi-environment/pom.xml b/target-osgi-environment/pom.xml
index dad5516..218ad89 100644
--- a/target-osgi-environment/pom.xml
+++ b/target-osgi-environment/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -260,4 +260,8 @@
         </dependency>
         
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-cli/pom.xml b/vault-cli/pom.xml
index 589acf4..9f2efd9 100644
--- a/vault-cli/pom.xml
+++ b/vault-cli/pom.xml
@@ -23,14 +23,14 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>vault-cli</artifactId>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
     <packaging>jar</packaging>
 
     <name>Apache Jackrabbit FileVault Command Line Interface</name>
@@ -119,22 +119,22 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-vlt</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-sync</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-davex</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
 
         <!-- CLI Stuff -->
@@ -175,4 +175,8 @@
             <version>1.2.8</version>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index f3a4852..776f230 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -23,14 +23,14 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>org.apache.jackrabbit.vault</artifactId>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
 
     <name>Apache Jackrabbit FileVault Core Bundle</name>
     <description>The core classes of Apache Jackrabbit FileVault</description>
@@ -465,4 +465,8 @@
             </build>
         </profile>
     </profiles>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-davex/pom.xml b/vault-davex/pom.xml
index 2c838d8..fbd3b2c 100644
--- a/vault-davex/pom.xml
+++ b/vault-davex/pom.xml
@@ -23,14 +23,14 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>vault-davex</artifactId>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
     <packaging>jar</packaging>
 
     <name>Apache Jackrabbit FileVault JCR Remoting Service</name>
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
@@ -88,4 +88,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-diff/pom.xml b/vault-diff/pom.xml
index f9b4fab..6004b4f 100644
--- a/vault-diff/pom.xml
+++ b/vault-diff/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -35,7 +35,7 @@
     <name>Apache Jackrabbit FileVault Diff (Diff utilities)</name>
     <description>Provides Classes for diff and diff3.
     </description>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
 
     <!-- ====================================================================== -->
     <!-- D E P E N D E N C I E S                                                -->
@@ -80,4 +80,8 @@
             </plugin>
         </plugins>
     </build>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-hook-example/pom.xml b/vault-hook-example/pom.xml
index d2a0c3f..2bce320 100644
--- a/vault-hook-example/pom.xml
+++ b/vault-hook-example/pom.xml
@@ -23,14 +23,14 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>vault-hook-example</artifactId>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
     <packaging>jar</packaging>
 
     <name>Apache Jackrabbit FileVault Package Hook Example</name>
@@ -88,7 +88,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
 
         <!-- JCR Stuff -->
@@ -110,4 +110,8 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-hook-externalclass-test/pom.xml b/vault-hook-externalclass-test/pom.xml
index e1a4185..1d306b8 100644
--- a/vault-hook-externalclass-test/pom.xml
+++ b/vault-hook-externalclass-test/pom.xml
@@ -23,14 +23,14 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>vault-hook-externalclass-test</artifactId>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
     <packaging>jar</packaging>
 
     <name>Apache Jackrabbit FileVault Package Hook Sling Example</name>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
 
         <!-- JCR Stuff -->
@@ -116,4 +116,8 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-rcp/pom.xml b/vault-rcp/pom.xml
index 48717c4..6ba874f 100644
--- a/vault-rcp/pom.xml
+++ b/vault-rcp/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -254,4 +254,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-sync/pom.xml b/vault-sync/pom.xml
index 76f9cbc..7c29713 100644
--- a/vault-sync/pom.xml
+++ b/vault-sync/pom.xml
@@ -24,7 +24,7 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -159,4 +159,8 @@
         </dependency>
 
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-validation/pom.xml b/vault-validation/pom.xml
index 218f634..7e3be21 100644
--- a/vault-validation/pom.xml
+++ b/vault-validation/pom.xml
@@ -23,7 +23,7 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
@@ -189,4 +189,8 @@
           <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>
diff --git a/vault-vlt/pom.xml b/vault-vlt/pom.xml
index e0c1ffe..d53b8c8 100644
--- a/vault-vlt/pom.xml
+++ b/vault-vlt/pom.xml
@@ -23,14 +23,14 @@
         <groupId>org.apache.jackrabbit.vault</groupId>
         <artifactId>parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>
-        <version>3.5.7-SNAPSHOT</version>
+        <version>3.5.8</version>
     </parent>
 
     <!-- ====================================================================== -->
     <!-- P R O J E C T  D E S C R I P T I O N                                   -->
     <!-- ====================================================================== -->
     <artifactId>vault-vlt</artifactId>
-    <version>3.5.7-SNAPSHOT</version>
+    <version>3.5.8</version>
     <packaging>jar</packaging>
 
     <name>Apache Jackrabbit FileVault Platform Interaction</name>
@@ -42,12 +42,12 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>org.apache.jackrabbit.vault</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-sync</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit.vault</groupId>
             <artifactId>vault-diff</artifactId>
-            <version>3.5.7-SNAPSHOT</version>
+            <version>3.5.8</version>
         </dependency>
         <!-- for org.apache.jackrabbit.spi2dav.ConnectionOptions -->
         <dependency>
@@ -89,4 +89,8 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+  <scm>
+    <tag>jackrabbit-filevault-3.5.8</tag>
+  </scm>
 </project>