diff --git a/modules/components/org.wso2.iot.core.admin.styles/pom.xml b/modules/components/org.wso2.iot.core.admin.styles/pom.xml
index 530dd213..b2f5e74a 100644
--- a/modules/components/org.wso2.iot.core.admin.styles/pom.xml
+++ b/modules/components/org.wso2.iot.core.admin.styles/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-components</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/components/pom.xml b/modules/components/pom.xml
index 575d28b9..56b192e5 100644
--- a/modules/components/pom.xml
+++ b/modules/components/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 21f9c22b..afe8294a 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-parent</artifactId>
-		<version>3.1.0-SNAPSHOT</version>
+		<version>3.1.0-alpha</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -697,8 +697,8 @@
 								<property name="xmldir" value="src/core/resources/web-apps/web-xml" />
 								<property name="srcdir" value="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/webapps" />
 								<property name="wso2iothome" value="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}" />
-								<property name="wso2analyticshome" value="${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}"/>
-								<property name="wso2brokerhome" value="${basedir}/../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}"/>
+								<property name="wso2analyticshome" value="${basedir}/../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}" />
+								<property name="wso2brokerhome" value="${basedir}/../p2-profile/broker-profile/target/wso2carbon-core-${carbon.kernel.version}" />
 
 
 								<mkdir dir="${tempdir}" />
@@ -777,7 +777,7 @@
 								<zip destfile="${tempdir}/oauth2.war" basedir="${tempdir}/oauth2" />
 								<zip destfile="${tempdir}/shindig.war" basedir="${tempdir}/shindig" />
 
-								<mkdir dir="${tempdir}/registry"/>
+								<mkdir dir="${tempdir}/registry" />
 								<unzip src="${wso2iothome}/wso2/components/plugins/org.wso2.carbon.registry.indexing_${carbon.registry.version}.jar" dest="${tempdir}/registry" />
 								<replace file="${tempdir}/registry/core.properties" token="dataDir=../../../../solr/data" value="dataDir=../../../solr/data" />
 								<zip destfile="${wso2analyticshome}/wso2/components/plugins/org.wso2.carbon.registry.indexing_${carbon.registry.version}.jar" basedir="${tempdir}/registry" />
diff --git a/modules/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/features/org.wso2.iot.core.styles.feature/pom.xml
index ffd51945..8106b770 100644
--- a/modules/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/features/org.wso2.iot.core.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-features</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index 35cd7fa8..64ca5be8 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -18,13 +18,12 @@
   ~ under the License.
   -->
 
-<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/maven-v4_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/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 373a5ea6..aa36cef3 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/integration-common/pom.xml b/modules/integration/tests-common/integration-common/pom.xml
index 12c927cb..ab7fb918 100644
--- a/modules/integration/tests-common/integration-common/pom.xml
+++ b/modules/integration/tests-common/integration-common/pom.xml
@@ -17,13 +17,12 @@
   ~ under the License.
   -->
 
-<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">
+<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>org.wso2.iot</groupId>
         <artifactId>tests-common</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 053d8c77..3f46913f 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/web-ui-pages/pom.xml b/modules/integration/tests-common/web-ui-pages/pom.xml
index 7dcce232..29bf344a 100644
--- a/modules/integration/tests-common/web-ui-pages/pom.xml
+++ b/modules/integration/tests-common/web-ui-pages/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>tests-common</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index b2ace0cb..3b18c6d9 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/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>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules/integration/tests-iot-web-ui/pom.xml
index 92951f25..30dde73c 100644
--- a/modules/integration/tests-iot-web-ui/pom.xml
+++ b/modules/integration/tests-iot-web-ui/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-integration</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index a1808ba5..cde5d3cf 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -854,9 +854,9 @@
                             <tasks>
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf" />
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf">
-                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf"/>
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" />
                                 </copy>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" includeemptydirs="true"/>
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" includeemptydirs="true" />
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/etc/bundle-config/hadoop-client" />
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/analytics/spark" />
                                 <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server" />
diff --git a/modules/p2-profile/broker-profile/pom.xml b/modules/p2-profile/broker-profile/pom.xml
index 3dd699fd..ffb57662 100644
--- a/modules/p2-profile/broker-profile/pom.xml
+++ b/modules/p2-profile/broker-profile/pom.xml
@@ -15,13 +15,12 @@
  ~ limitations under the License.
 -->
 
-<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/maven-v4_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/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -353,12 +352,11 @@
                         <phase>test</phase>
                         <configuration>
                             <tasks>
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf"/>
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf" />
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf">
-                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf"/>
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" />
                                 </copy>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf"
-                                        includeemptydirs="true"/>
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" includeemptydirs="true" />
                             </tasks>
                         </configuration>
                         <goals>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index d63a842c..35089b39 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -18,12 +18,11 @@
   ~ under the License.
   -->
 
-<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">
+<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>org.wso2.iot</groupId>
         <artifactId>wso2iot-p2-profile</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -3192,12 +3191,11 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf"/>
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf" />
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf">
-                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf"/>
+                                    <fileset dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" />
                                 </copy>
-                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf"
-                                        includeemptydirs="true"/>
+                                <delete dir="target/wso2carbon-core-${carbon.kernel.version}/repository/conf" includeemptydirs="true" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -3206,7 +3204,7 @@
                         <phase>generate-resources</phase>
                         <configuration>
                             <tasks>
-                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server"/>
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -3217,9 +3215,8 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <replace token="false" value="true"
-                                         dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/components">
-                                    <include name="**/bundles.info"/>
+                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/components">
+                                    <include name="**/bundles.info" />
                                 </replace>
                             </tasks>
                         </configuration>
diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml
index fda24794..65844fce 100644
--- a/modules/p2-profile/pom.xml
+++ b/modules/p2-profile/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/scripts/mobile-qsg/pom.xml b/modules/scripts/mobile-qsg/pom.xml
index 017fd5c0..82e0fc27 100644
--- a/modules/scripts/mobile-qsg/pom.xml
+++ b/modules/scripts/mobile-qsg/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-scripts</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mobile-qsg</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0-alpha</version>
     <name>WSO2 IoT - QSG Script</name>
     <description>This includes the tools for IoTs Quick Start Guide</description>
     <packaging>jar</packaging>
diff --git a/modules/scripts/pom.xml b/modules/scripts/pom.xml
index ceb94983..a3eaba62 100644
--- a/modules/scripts/pom.xml
+++ b/modules/scripts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml
index dde30e71..b08583a3 100644
--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-tools</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0-alpha</version>
     <name>WSO2 IoT - Device Type Archetype</name>
     <description>WSO2 IoT Device Type Archetype</description>
     <packaging>maven-archetype</packaging>
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index 82a7001a..e254d090 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0-alpha</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index aed887b9..6746e9ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.iot</groupId>
     <artifactId>wso2iot-parent</artifactId>
     <packaging>pom</packaging>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0-alpha</version>
     <name>WSO2 IoT - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 IoT Server</description>
@@ -1671,7 +1671,7 @@
         <url>https://github.com/wso2/product-iots.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-iots.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-iots.git</connection>
-        <tag>HEAD</tag>
+        <tag>v3.1.0-alpha</tag>
     </scm>
 
     <build>