diff --git a/e2e-test/pom.xml b/e2e-test/pom.xml
index 2b890a516..ec81c7c29 100644
--- a/e2e-test/pom.xml
+++ b/e2e-test/pom.xml
@@ -3,7 +3,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-search-and-insight-parent</artifactId>
-      <version>2.0.21-A.3-SNAPSHOT</version>
+      <version>2.0.21</version>
    </parent>
    <groupId>org.alfresco</groupId>
    <artifactId>search-analytics-e2e-test</artifactId>
diff --git a/pom.xml b/pom.xml
index 5d776cac9..d54be60d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
       <version>12</version>
    </parent>
    <artifactId>alfresco-search-and-insight-parent</artifactId>
-   <version>2.0.21-A.3-SNAPSHOT</version>
+   <version>2.0.21</version>
    <packaging>pom</packaging>
    <name>Alfresco Search And Insight Engine</name>
    <distributionManagement>
@@ -38,7 +38,7 @@
       <connection>scm:git:https://github.com/Alfresco/InsightEngine.git</connection>
       <developerConnection>scm:git:https://github.com/Alfresco/InsightEngine.git</developerConnection>
       <url>https://github.com/Alfresco/InsightEngine</url>
-      <tag>HEAD</tag>
+      <tag>2.0.21</tag>
    </scm>
    <properties>
       <maven.build.sourceVersion>11</maven.build.sourceVersion>
diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index f92a561de..266ce65eb 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-search-parent</artifactId>
-        <version>2.0.21-A.3-SNAPSHOT</version>
+        <version>2.0.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-solrclient-lib</artifactId>
-            <version>2.0.21-A.3-SNAPSHOT</version>
+            <version>2.0.21</version>
             <exclusions>
                 <exclusion>
                     <artifactId>servlet-api</artifactId>
diff --git a/search-services/alfresco-solrclient-lib/pom.xml b/search-services/alfresco-solrclient-lib/pom.xml
index 982e96436..94f224679 100644
--- a/search-services/alfresco-solrclient-lib/pom.xml
+++ b/search-services/alfresco-solrclient-lib/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-search-parent</artifactId>
-        <version>2.0.21-A.3-SNAPSHOT</version>
+        <version>2.0.21</version>
     </parent>
 
     <dependencies>
diff --git a/search-services/packaging/pom.xml b/search-services/packaging/pom.xml
index b4cdedc05..431ae0b28 100644
--- a/search-services/packaging/pom.xml
+++ b/search-services/packaging/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-search-parent</artifactId>
-        <version>2.0.21-A.3-SNAPSHOT</version>
+        <version>2.0.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <dependencies>
diff --git a/search-services/pom.xml b/search-services/pom.xml
index 3ee92539a..16f50bbdf 100644
--- a/search-services/pom.xml
+++ b/search-services/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-search-and-insight-parent</artifactId>
-        <version>2.0.21-A.3-SNAPSHOT</version>
+        <version>2.0.21</version>
     </parent>
     <artifactId>alfresco-search-parent</artifactId>
-    <version>2.0.21-A.3-SNAPSHOT</version>
+    <version>2.0.21</version>
     <packaging>pom</packaging>
     <name>Alfresco Solr Search parent</name>
     <properties>