diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 97b40fe6..5ee53d0f 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -141,11 +141,8 @@
                                 https://wso2.org/jira/browse/IDENTITY-3489 -->
                                 <echo message="########### Comment out GetAllRolesOfUserEnabled property ##############" />
                                 <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/user-mgt.xml" token="&lt;Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property&gt;" value="&lt;!--Property name=&quot;GetAllRolesOfUserEnabled&quot;&gt;true&lt;/Property--&gt;" />
-                                <replace
-                                        file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties"
-                                        token="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*"
-                                        value="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*${line.separator}org.owasp.csrfguard.unprotected.Endpoints=%servletContext%/endpoints/*${line.separator}org.owasp.csrfguard.unprotected.RestApi=%servletContext%/analytics/*${line.separator}org.owasp.csrfguard.unprotected.JsApi=%servletContext%/portal/apis/analytics/*${line.separator}org.owasp.csrfguard.unprotected.Servlet=%servletContext%/analytics-api/*${line.separator}org.owasp.csrfguard.unprotected.ml=%servletContext%/api/login"/>
-                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/carbon/WEB-INF/web.xml" token="/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" value="repository/conf/security/Owasp.CsrfGuard.Carbon.properties"/>
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" token="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*" value="org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*${line.separator}org.owasp.csrfguard.unprotected.Endpoints=%servletContext%/endpoints/*${line.separator}org.owasp.csrfguard.unprotected.RestApi=%servletContext%/analytics/*${line.separator}org.owasp.csrfguard.unprotected.JsApi=%servletContext%/portal/apis/analytics/*${line.separator}org.owasp.csrfguard.unprotected.Servlet=%servletContext%/analytics-api/*${line.separator}org.owasp.csrfguard.unprotected.ml=%servletContext%/api/login" />
+                                <replace file="target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/carbon/WEB-INF/web.xml" token="/repository/conf/security/Owasp.CsrfGuard.Carbon.properties" value="repository/conf/security/Owasp.CsrfGuard.Carbon.properties" />
                             </target>
                         </configuration>
                     </execution>
@@ -210,19 +207,19 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <property name="tempdir" value="target/cepsamples-temp"/>
-                                <mkdir dir="${tempdir}"/>
+                                <property name="tempdir" value="target/cepsamples-temp" />
+                                <mkdir dir="${tempdir}" />
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="org.wso2.cep.samples.distribution-${cep.samples.distribution.version}/samples.zip"/>
+                                        <include name="org.wso2.cep.samples.distribution-${cep.samples.distribution.version}/samples.zip" />
                                     </fileset>
                                 </unzip>
                                 <copy todir="../samples/cep">
                                 <fileset dir="${tempdir}">
                                 </fileset>
                             </copy>
-                                <delete dir="${tempdir}"/>
-                                <delete dir="target/org.wso2.cep.samples.distribution-${cep.samples.distribution.version}"/>
+                                <delete dir="${tempdir}" />
+                                <delete dir="target/org.wso2.cep.samples.distribution-${cep.samples.distribution.version}" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index cd2a87c6..070931dd 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/product/org.wso2.das.styles.feature/pom.xml b/modules/features/product/org.wso2.das.styles.feature/pom.xml
index 6832bd0c..b61eb9b4 100644
--- a/modules/features/product/org.wso2.das.styles.feature/pom.xml
+++ b/modules/features/product/org.wso2.das.styles.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-features</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/product/pom.xml b/modules/features/product/pom.xml
index 2f86913f..eed27408 100644
--- a/modules/features/product/pom.xml
+++ b/modules/features/product/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-features-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.das.multitenancy.dashboard.ui.feature/pom.xml b/modules/features/service/org.wso2.das.multitenancy.dashboard.ui.feature/pom.xml
index 2cd18bfd..6fe1bb09 100644
--- a/modules/features/service/org.wso2.das.multitenancy.dashboard.ui.feature/pom.xml
+++ b/modules/features/service/org.wso2.das.multitenancy.dashboard.ui.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-multitenancy-features</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.das.multitenancy.styles.feature/pom.xml b/modules/features/service/org.wso2.das.multitenancy.styles.feature/pom.xml
index fcdf9a23..7cd19866 100644
--- a/modules/features/service/org.wso2.das.multitenancy.styles.feature/pom.xml
+++ b/modules/features/service/org.wso2.das.multitenancy.styles.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-multitenancy-features</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/pom.xml b/modules/features/service/pom.xml
index fa81f0b4..789b38c7 100644
--- a/modules/features/service/pom.xml
+++ b/modules/features/service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-features-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 1bc4a393..c1feed5b 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index c1a2d91f..3d0942a5 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index 6750a351..4664f7ed 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
index 50676945..c71c252c 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 8b7bb3d9..e492b0e0 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-ui-integration/pom.xml b/modules/integration/tests-ui-integration/pom.xml
index 59fb1485..6755759b 100644
--- a/modules/integration/tests-ui-integration/pom.xml
+++ b/modules/integration/tests-ui-integration/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-ui-integration/tests-ui/pom.xml b/modules/integration/tests-ui-integration/tests-ui/pom.xml
index 7c891f16..1bddf239 100644
--- a/modules/integration/tests-ui-integration/tests-ui/pom.xml
+++ b/modules/integration/tests-ui-integration/tests-ui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/org.wso2.das.multitenancy.dashboard.ui/pom.xml b/modules/org.wso2.das.multitenancy.dashboard.ui/pom.xml
index f7f194de..baa94c70 100644
--- a/modules/org.wso2.das.multitenancy.dashboard.ui/pom.xml
+++ b/modules/org.wso2.das.multitenancy.dashboard.ui/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 3af8e84d..8833cb1e 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/capps/pom.xml b/modules/samples/capps/pom.xml
index db9f84ab..333e3471 100644
--- a/modules/samples/capps/pom.xml
+++ b/modules/samples/capps/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>das-samples</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/pom.xml b/modules/samples/pom.xml
index 0a2cdb4e..77187894 100644
--- a/modules/samples/pom.xml
+++ b/modules/samples/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/publishers/pom.xml b/modules/samples/publishers/pom.xml
index 021f0aae..a7d55d64 100644
--- a/modules/samples/publishers/pom.xml
+++ b/modules/samples/publishers/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>das-samples</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/udfs/country-code-ip/pom.xml b/modules/samples/udfs/country-code-ip/pom.xml
index e87297b9..e97594ba 100644
--- a/modules/samples/udfs/country-code-ip/pom.xml
+++ b/modules/samples/udfs/country-code-ip/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>das-sample-udfs</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/samples/udfs/pom.xml b/modules/samples/udfs/pom.xml
index d21e463a..85f71e65 100644
--- a/modules/samples/udfs/pom.xml
+++ b/modules/samples/udfs/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>das-samples</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index ad4b910f..791811dd 100644
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>wso2das-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index 70ac20c7..130d04eb 100644
--- a/modules/styles/product/pom.xml
+++ b/modules/styles/product/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>org.wso2.das.styles.parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/service/pom.xml b/modules/styles/service/pom.xml
index a3ae9dfd..12e39d55 100644
--- a/modules/styles/service/pom.xml
+++ b/modules/styles/service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.das</groupId>
         <artifactId>org.wso2.das.styles.parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 4c9e70ee..49f62d04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <groupId>org.wso2.das</groupId>
     <artifactId>wso2das-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0</version>
     <name>WSO2 Data Analytics Server</name>
     <url>http://wso2.com/products/business-activity-monitor/</url>
     <description>WSO2 Data Analytics Server</description>
@@ -404,7 +404,7 @@
         <url>https://github.com/wso2/product-das.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-das.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-das.git</connection>
-        <tag>HEAD</tag>
+        <tag>v3.1.0-RC2</tag>
     </scm>
 
     <profiles>
@@ -436,7 +436,7 @@
     </profiles>
 
     <properties>
-        <das.release.version>3.1.0-SNAPSHOT</das.release.version>
+        <das.release.version>3.1.0</das.release.version>
 
         <carbon.kernel.version>4.4.9</carbon.kernel.version>