diff --git a/docker/pom.xml b/docker/pom.xml
index 46d7cb1ebe..732a5f74a4 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>docker</artifactId>
-    <version>5.8.5-SNAPSHOT</version>
+    <version>5.8.5</version>
     <packaging>docker</packaging>
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>Flamingo Dockerfile</name>
     <description>Create a docker image of Flamingo</description>
diff --git a/pom.xml b/pom.xml
index 057cfcbf16..7d724aa682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.flamingo-mc</groupId>
     <artifactId>flamingo-mc</artifactId>
-    <version>5.8.5-SNAPSHOT</version>
+    <version>5.8.5</version>
     <packaging>pom</packaging>
     <name>flamingo-mc</name>
     <url>http://github.com/flamingo-mc</url>
@@ -11,7 +11,7 @@
         <connection>scm:git:git@github.com:flamingo-mc/flamingo.git</connection>
         <developerConnection>scm:git:git@github.com:flamingo-mc/flamingo.git</developerConnection>
         <url>https://github.com/flamingo-mc/flamingo.git</url>
-        <tag>HEAD</tag>
+        <tag>v5.8.5</tag>
     </scm>
     <ciManagement>
         <system>Jenkins</system>
@@ -38,7 +38,7 @@
         </license>
     </licenses>
     <properties>
-        <flamingo.version>5.8.5-SNAPSHOT</flamingo.version>
+        <flamingo.version>5.8.5</flamingo.version>
         <java.version>1.8</java.version>
         <project.build.sourceVersion>${java.version}</project.build.sourceVersion>
         <project.build.targetVersion>${java.version}</project.build.targetVersion>
diff --git a/solr-commons/pom.xml b/solr-commons/pom.xml
index 9a08b69add..9bc4bb9cd7 100644
--- a/solr-commons/pom.xml
+++ b/solr-commons/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>solr-commons</name>
 
diff --git a/tomcat-lib/pom.xml b/tomcat-lib/pom.xml
index b9990406bb..1a7e2d0b47 100644
--- a/tomcat-lib/pom.xml
+++ b/tomcat-lib/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>Tomcat libs distributie</name>
     <description>A zipfile w/ drivers to be placed in the Tomcat lib directory</description>
diff --git a/viewer-admin/pom.xml b/viewer-admin/pom.xml
index aeaa76fc53..6d6b2daa65 100755
--- a/viewer-admin/pom.xml
+++ b/viewer-admin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>viewer-admin</name>
     <properties>
diff --git a/viewer-audit-noplogger/pom.xml b/viewer-audit-noplogger/pom.xml
index 9c644587d3..677e1e029f 100644
--- a/viewer-audit-noplogger/pom.xml
+++ b/viewer-audit-noplogger/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>viewer auditing NOP logger module</name>
     <description>This module primarily serves the testcase of having multiple
diff --git a/viewer-audit/pom.xml b/viewer-audit/pom.xml
index f397256233..896919efc4 100644
--- a/viewer-audit/pom.xml
+++ b/viewer-audit/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>viewer auditing module</name>
 
diff --git a/viewer-commons/pom.xml b/viewer-commons/pom.xml
index 71068fd1ec..5a4a934c6e 100755
--- a/viewer-commons/pom.xml
+++ b/viewer-commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>viewer-commons</name>
   
diff --git a/viewer-config-persistence/pom.xml b/viewer-config-persistence/pom.xml
index c6a667d01f..019f09dca2 100755
--- a/viewer-config-persistence/pom.xml
+++ b/viewer-config-persistence/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>viewer-config-persistence</name>
 
diff --git a/viewer/pom.xml b/viewer/pom.xml
index 6d441f7b32..7406fcb013 100755
--- a/viewer/pom.xml
+++ b/viewer/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>viewer</name>
     <properties>
diff --git a/web-commons/pom.xml b/web-commons/pom.xml
index df5a1e9800..94cc50e9de 100755
--- a/web-commons/pom.xml
+++ b/web-commons/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.flamingo-mc</groupId>
         <artifactId>flamingo-mc</artifactId>
-        <version>5.8.5-SNAPSHOT</version>
+        <version>5.8.5</version>
     </parent>
     <name>web-commons</name>