diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 80163d977e..6dddbe039c 100644
--- a/amps/ags/pom.xml
+++ b/amps/ags/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo-amps</artifactId>
-      <version>18.5-SNAPSHOT</version>
+      <version>18.5</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 41c0f071b7..77d8ccb4e9 100644
--- a/amps/ags/rm-automation/pom.xml
+++ b/amps/ags/rm-automation/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>18.5-SNAPSHOT</version>
+      <version>18.5</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
index 3fe8e4bd42..8090ec34a4 100644
--- a/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
+++ b/amps/ags/rm-automation/rm-automation-community-rest-api/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-automation-community-repo</artifactId>
-      <version>18.5-SNAPSHOT</version>
+      <version>18.5</version>
    </parent>
 
    <build>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 8e6728120d..ce127e66e5 100644
--- a/amps/ags/rm-community/pom.xml
+++ b/amps/ags/rm-community/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-parent</artifactId>
-      <version>18.5-SNAPSHOT</version>
+      <version>18.5</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-community/rm-community-repo/pom.xml b/amps/ags/rm-community/rm-community-repo/pom.xml
index a181af31eb..43e82aabda 100644
--- a/amps/ags/rm-community/rm-community-repo/pom.xml
+++ b/amps/ags/rm-community/rm-community-repo/pom.xml
@@ -8,7 +8,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-      <version>18.5-SNAPSHOT</version>
+      <version>18.5</version>
    </parent>
 
    <properties>
diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
index db8d52888b..4d5e980cde 100644
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-governance-services-community-repo-parent</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <build>
diff --git a/amps/pom.xml b/amps/pom.xml
index 7f367cabb4..7788f6fcc2 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <modules>
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index c2625d3bf7..c1509c337e 100644
--- a/amps/share-services/pom.xml
+++ b/amps/share-services/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-amps</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <properties>
diff --git a/core/pom.xml b/core/pom.xml
index fcc7e32c87..a53f27636e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>18.5-SNAPSHOT</version>
+      <version>18.5</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 3b7aaa01ab..1b18c8cacd 100644
--- a/data-model/pom.xml
+++ b/data-model/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <properties>
diff --git a/mmt/pom.xml b/mmt/pom.xml
index 6a8efce2fe..2fc14d9756 100644
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <dependencies>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index b08619d5df..6e57a85f75 100644
--- a/packaging/distribution/pom.xml
+++ b/packaging/distribution/pom.xml
@@ -9,6 +9,6 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 729e3795b2..33de320af9 100644
--- a/packaging/docker-alfresco/pom.xml
+++ b/packaging/docker-alfresco/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index e11c32ccbf..0106ec2eb0 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 1a4e036eeb..c20cf470bb 100644
--- a/packaging/tests/pom.xml
+++ b/packaging/tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index 6b19acc3ca..223b862aaa 100644
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <organization>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index 897dcc52ca..d92b006c41 100644
--- a/packaging/tests/tas-email/pom.xml
+++ b/packaging/tests/tas-email/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index dbcfcb2bd8..1a7abe411d 100644
--- a/packaging/tests/tas-integration/pom.xml
+++ b/packaging/tests/tas-integration/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index 8b4c978a1f..b4e72e1ed8 100644
--- a/packaging/tests/tas-restapi/pom.xml
+++ b/packaging/tests/tas-restapi/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index d694eb269c..4aea9fca3c 100644
--- a/packaging/tests/tas-webdav/pom.xml
+++ b/packaging/tests/tas-webdav/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 6c9a7570b8..ebebc63d4d 100644
--- a/packaging/war/pom.xml
+++ b/packaging/war/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-packaging</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 0e33a988fc..5e75d866f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <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>alfresco-community-repo</artifactId>
-    <version>18.5-SNAPSHOT</version>
+    <version>18.5</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -149,7 +149,7 @@
         <connection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</connection>
         <developerConnection>scm:git:https://github.com/Alfresco/alfresco-community-repo.git</developerConnection>
         <url>https://github.com/Alfresco/alfresco-community-repo</url>
-        <tag>HEAD</tag>
+        <tag>18.5</tag>
     </scm>
 
     <distributionManagement>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index 3f1d793607..7713a49228 100644
--- a/remote-api/pom.xml
+++ b/remote-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 33a3da26ec..5b36770ba1 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>18.5-SNAPSHOT</version>
+        <version>18.5</version>
     </parent>
 
     <dependencies>