diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index c287b6b146..c86e7d473e 100644
--- a/coverage-reports/pom.xml
+++ b/coverage-reports/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.siddhi</groupId>
         <artifactId>siddhi</artifactId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/siddhi-annotations/pom.xml b/modules/siddhi-annotations/pom.xml
index 06e4e8575d..b7702813c0 100644
--- a/modules/siddhi-annotations/pom.xml
+++ b/modules/siddhi-annotations/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.siddhi</groupId>
         <artifactId>siddhi</artifactId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/modules/siddhi-core/pom.xml b/modules/siddhi-core/pom.xml
index 718ef37c65..b8bd650833 100644
--- a/modules/siddhi-core/pom.xml
+++ b/modules/siddhi-core/pom.xml
@@ -16,13 +16,12 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
 
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../pom.xml</relativePath>
 
     </parent>
diff --git a/modules/siddhi-core/siddhi-core-doc-gen/pom.xml b/modules/siddhi-core/siddhi-core-doc-gen/pom.xml
index 51077c54d2..286c4723ed 100644
--- a/modules/siddhi-core/siddhi-core-doc-gen/pom.xml
+++ b/modules/siddhi-core/siddhi-core-doc-gen/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/siddhi-doc-gen/pom.xml b/modules/siddhi-doc-gen/pom.xml
index 544a9e6f3b..6bf8664b74 100644
--- a/modules/siddhi-doc-gen/pom.xml
+++ b/modules/siddhi-doc-gen/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/siddhi-feature/pom.xml b/modules/siddhi-feature/pom.xml
index 96a82cea7a..5c1211bbb3 100644
--- a/modules/siddhi-feature/pom.xml
+++ b/modules/siddhi-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/siddhi-query-api/pom.xml b/modules/siddhi-query-api/pom.xml
index f52124b3a1..75490bd31b 100644
--- a/modules/siddhi-query-api/pom.xml
+++ b/modules/siddhi-query-api/pom.xml
@@ -16,12 +16,11 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/siddhi-query-compiler/pom.xml b/modules/siddhi-query-compiler/pom.xml
index 38244caf36..82d46e07a6 100644
--- a/modules/siddhi-query-compiler/pom.xml
+++ b/modules/siddhi-query-compiler/pom.xml
@@ -16,12 +16,11 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/siddhi-samples/performance-samples/pom.xml b/modules/siddhi-samples/performance-samples/pom.xml
index bc021be159..d96c1620ea 100644
--- a/modules/siddhi-samples/performance-samples/pom.xml
+++ b/modules/siddhi-samples/performance-samples/pom.xml
@@ -17,12 +17,11 @@
   ~ under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
     <parent>
         <groupId>io.siddhi</groupId>
         <artifactId>siddhi-samples</artifactId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>performance-samples</artifactId>
diff --git a/modules/siddhi-samples/pom.xml b/modules/siddhi-samples/pom.xml
index ea7de35b6f..ff01efc257 100644
--- a/modules/siddhi-samples/pom.xml
+++ b/modules/siddhi-samples/pom.xml
@@ -16,12 +16,11 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/siddhi-samples/quick-start-samples/pom.xml b/modules/siddhi-samples/quick-start-samples/pom.xml
index 4557897744..d4482048a0 100644
--- a/modules/siddhi-samples/quick-start-samples/pom.xml
+++ b/modules/siddhi-samples/quick-start-samples/pom.xml
@@ -17,12 +17,11 @@
   ~ under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
     <parent>
         <artifactId>siddhi-samples</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/siddhi-service/pom.xml b/modules/siddhi-service/pom.xml
index 4c964b29cd..f52165a8e9 100644
--- a/modules/siddhi-service/pom.xml
+++ b/modules/siddhi-service/pom.xml
@@ -16,12 +16,11 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.21-SNAPSHOT</version>
+        <version>5.1.21</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -122,10 +121,8 @@
                                 </filter>
                             </filters>
                             <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>io.siddhi.service.api.Application</mainClass>
                                 </transformer>
                             </transformers>
diff --git a/pom.xml b/pom.xml
index a778e994c0..619986530a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,14 +17,13 @@
   ~ under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
     <groupId>io.siddhi</groupId>
     <artifactId>siddhi</artifactId>
     <packaging>pom</packaging>
-    <version>5.1.21-SNAPSHOT</version>
+    <version>5.1.21</version>
     <name>Siddhi</name>
     <description>Siddhi, Stream Processing and Complex Event Processing Engine</description>
 
@@ -858,7 +857,7 @@
         <url>https://github.com/siddhi-io/siddhi.git</url>
         <developerConnection>scm:git:https://github.com/siddhi-io/siddhi.git</developerConnection>
         <connection>scm:git:https://github.com/siddhi-io/siddhi.git</connection>
-        <tag>HEAD</tag>
+        <tag>v5.1.21</tag>
     </scm>
 
     <repositories>