diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 33b445f29f..c5117954e0 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>20.18-SNAPSHOT</version>
+      <version>20.18</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index bf73831dec..8b2bca584d 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>20.18-SNAPSHOT</version>
+      <version>20.18</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 4276481fa4..1eff169001 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>20.18-SNAPSHOT</version>
+      <version>20.18</version>
    </parent>
 
    <build>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 206d322cf6..e68134a03c 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>20.18-SNAPSHOT</version>
+      <version>20.18</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 fd2f1c0960..3adb46b5da 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>20.18-SNAPSHOT</version>
+      <version>20.18</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 f48266149f..10b372e5e9 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <build>
diff --git a/amps/pom.xml b/amps/pom.xml
index ccdd2291c0..4c183a9941 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <modules>
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index 551917c93b..a8278f8319 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <properties>
diff --git a/core/pom.xml b/core/pom.xml
index 688aa63f31..03a06e74fe 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>20.18-SNAPSHOT</version>
+      <version>20.18</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 07981c598f..9e512ad525 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <properties>
diff --git a/mmt/pom.xml b/mmt/pom.xml
index 063670d155..84d4dea3ae 100644
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <dependencies>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 2e5991e7b6..8bb4205c4e 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index ffdfa29d62..ebbf036883 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 7f525bc386..074645a960 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 86f8659494..814a3d28d7 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index 05aaf3ddb5..44ac4c7374 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <organization>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index 32ea89a8ff..2826610b92 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index d35666f4fb..513c1da05a 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index cd69fed609..829cf2e3fb 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 6861464f91..602db60d04 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index dd3126915b..8ee5e5ff0a 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index 519b4b3c67..525a89fa9e 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>20.18-SNAPSHOT</version>
+    <version>20.18</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>20.18</tag>
     </scm>
 
     <distributionManagement>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index c75b8de93e..4c4d74e986 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>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 8a3e568f1b..719a88a452 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>20.18-SNAPSHOT</version>
+        <version>20.18</version>
     </parent>
 
     <dependencies>