diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index 6c4d753c1c..5d62844128 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.8-SNAPSHOT</version>
+        <version>5.1.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/siddhi-annotations/pom.xml b/modules/siddhi-annotations/pom.xml
index 9cd190026b..a12129535b 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.8-SNAPSHOT</version>
+        <version>5.1.8</version>
         <relativePath>../..</relativePath>
     </parent>
 
diff --git a/modules/siddhi-core/pom.xml b/modules/siddhi-core/pom.xml
index 894f0e4b0e..0b57512a77 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.8-SNAPSHOT</version>
+        <version>5.1.8</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 9f5bd92e04..00b53e9612 100644
--- a/modules/siddhi-core/siddhi-core-doc-gen/pom.xml
+++ b/modules/siddhi-core/siddhi-core-doc-gen/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.8-SNAPSHOT</version>
+        <version>5.1.8</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 19fb1739ae..bb27133cf1 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.8-SNAPSHOT</version>
+        <version>5.1.8</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 83c444afef..890db52503 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.8-SNAPSHOT</version>
+        <version>5.1.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/siddhi-query-api/pom.xml b/modules/siddhi-query-api/pom.xml
index 96b958f259..32a4f220b9 100644
--- a/modules/siddhi-query-api/pom.xml
+++ b/modules/siddhi-query-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.8-SNAPSHOT</version>
+        <version>5.1.8</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 92cf32511f..2ad2a3c289 100644
--- a/modules/siddhi-query-compiler/pom.xml
+++ b/modules/siddhi-query-compiler/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.8-SNAPSHOT</version>
+        <version>5.1.8</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 8711b1fc75..1a50141918 100644
--- a/modules/siddhi-samples/performance-samples/pom.xml
+++ b/modules/siddhi-samples/performance-samples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.siddhi</groupId>
         <artifactId>siddhi-samples</artifactId>
-        <version>5.1.8-SNAPSHOT</version>
+        <version>5.1.8</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 1ff58e142c..1a9a491889 100644
--- a/modules/siddhi-samples/pom.xml
+++ b/modules/siddhi-samples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.8-SNAPSHOT</version>
+        <version>5.1.8</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 cc6aec99fd..b8b36dd67a 100644
--- a/modules/siddhi-samples/quick-start-samples/pom.xml
+++ b/modules/siddhi-samples/quick-start-samples/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>siddhi-samples</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.8-SNAPSHOT</version>
+        <version>5.1.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/modules/siddhi-service/pom.xml b/modules/siddhi-service/pom.xml
index 7d9618c707..0b552f1529 100644
--- a/modules/siddhi-service/pom.xml
+++ b/modules/siddhi-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siddhi</artifactId>
         <groupId>io.siddhi</groupId>
-        <version>5.1.8-SNAPSHOT</version>
+        <version>5.1.8</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index a94003f956..91ab0a2a62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>io.siddhi</groupId>
     <artifactId>siddhi</artifactId>
     <packaging>pom</packaging>
-    <version>5.1.8-SNAPSHOT</version>
+    <version>5.1.8</version>
     <name>Siddhi</name>
     <description>Siddhi, Stream Processing and Complex Event Processing Engine</description>
 
@@ -834,7 +834,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.8</tag>
     </scm>
 
     <repositories>