diff --git a/amps/ags/pom.xml b/amps/ags/pom.xml
index 14c07c0d5e..ad73570c8f 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>17.36-SNAPSHOT</version>
+      <version>17.36</version>
    </parent>
 
    <modules>
diff --git a/amps/ags/rm-automation/pom.xml b/amps/ags/rm-automation/pom.xml
index 85cfbcc85c..e8216f2b82 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>17.36-SNAPSHOT</version>
+      <version>17.36</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 4ad753f00f..5440181984 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>17.36-SNAPSHOT</version>
+      <version>17.36</version>
    </parent>
 
    <build>
diff --git a/amps/ags/rm-community/pom.xml b/amps/ags/rm-community/pom.xml
index 30da4c27ce..e16cd446ba 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>17.36-SNAPSHOT</version>
+      <version>17.36</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 921d273b0b..042777a127 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>17.36-SNAPSHOT</version>
+      <version>17.36</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 66e3f7675e..610e4e66cc 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <build>
diff --git a/amps/pom.xml b/amps/pom.xml
index 58ba38c3a9..b981df1ece 100644
--- a/amps/pom.xml
+++ b/amps/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <modules>
diff --git a/amps/share-services/pom.xml b/amps/share-services/pom.xml
index a3f79e5c35..1e9b483776 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <properties>
diff --git a/core/pom.xml b/core/pom.xml
index 876f6fb369..d8f6d62bbd 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -7,7 +7,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-community-repo</artifactId>
-      <version>17.36-SNAPSHOT</version>
+      <version>17.36</version>
    </parent>
 
    <dependencies>
diff --git a/data-model/pom.xml b/data-model/pom.xml
index 5971f2a291..7502bc8f2a 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <properties>
diff --git a/mmt/pom.xml b/mmt/pom.xml
index 66cd515984..dd4d32365e 100644
--- a/mmt/pom.xml
+++ b/mmt/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <dependencies>
diff --git a/packaging/distribution/pom.xml b/packaging/distribution/pom.xml
index 2d4262f7bf..f1b83e21fb 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 </project>
diff --git a/packaging/docker-alfresco/pom.xml b/packaging/docker-alfresco/pom.xml
index 74228ccd0d..f6d97c3ed5 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <properties>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index f7a23eba4e..edccc5dcb8 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/pom.xml b/packaging/tests/pom.xml
index 2cf73ffc6f..7bf10ed7d4 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <modules>
diff --git a/packaging/tests/tas-cmis/pom.xml b/packaging/tests/tas-cmis/pom.xml
index 04405e689e..54875e42c3 100644
--- a/packaging/tests/tas-cmis/pom.xml
+++ b/packaging/tests/tas-cmis/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo-tests</artifactId>
-        <version>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-email/pom.xml b/packaging/tests/tas-email/pom.xml
index 8a0106b799..052c1429ce 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-integration/pom.xml b/packaging/tests/tas-integration/pom.xml
index 44b0d9d5a5..56bae7ee82 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-restapi/pom.xml b/packaging/tests/tas-restapi/pom.xml
index c1af4a06d5..b715063134 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <developers>
diff --git a/packaging/tests/tas-webdav/pom.xml b/packaging/tests/tas-webdav/pom.xml
index 089e476be5..08b5e457c6 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <developers>
diff --git a/packaging/war/pom.xml b/packaging/war/pom.xml
index 07af396d71..93c912c51a 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <properties>
diff --git a/pom.xml b/pom.xml
index bda9ce47e9..bc36ad86b5 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>17.36-SNAPSHOT</version>
+    <version>17.36</version>
     <packaging>pom</packaging>
     <name>Alfresco Community Repo Parent</name>
 
@@ -147,7 +147,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>17.36</tag>
     </scm>
 
     <distributionManagement>
diff --git a/remote-api/pom.xml b/remote-api/pom.xml
index f02c01944c..950b79b9ee 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>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <dependencies>
diff --git a/repository/pom.xml b/repository/pom.xml
index 10fd517e16..c103ad485c 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-community-repo</artifactId>
-        <version>17.36-SNAPSHOT</version>
+        <version>17.36</version>
     </parent>
 
     <dependencies>