diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index faa300d8a..82fb4f7fe 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2emm</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.1</version>
     <packaging>pom</packaging>
     <name>WSO2 Mobile Device Manager (MDM) - Distribution</name>
     <description>WSO2 Mobile Device Manager (MDM) Distribution</description>
@@ -450,21 +450,19 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <echo message="########### Creating APP Authentication Endpoint ##############"/>
-                                <mkdir dir="${basedir}/target/authenticationendpoint/"/>
-                                <mkdir dir="${basedir}/target/authenticationendpoint-dist/"/>
-                                <unzip src="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war"
-                                       dest="${basedir}/target/authenticationendpoint/">
+                                <echo message="########### Creating APP Authentication Endpoint ##############" />
+                                <mkdir dir="${basedir}/target/authenticationendpoint/" />
+                                <mkdir dir="${basedir}/target/authenticationendpoint-dist/" />
+                                <unzip src="${basedir}/../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/authenticationendpoint.war" dest="${basedir}/target/authenticationendpoint/">
                                 </unzip>
                                 <copy toDir="${basedir}/target/authenticationendpoint-dist/">
-                                    <fileset dir="${basedir}/target/authenticationendpoint/"/>
+                                    <fileset dir="${basedir}/target/authenticationendpoint/" />
                                 </copy>
                                 <copy todir="${basedir}/target/authenticationendpoint-dist/" overwrite="true">
                                     <fileset dir="${basedir}/src/repository/deployment/server/webapps/authenticationendpoint-overlay/" />
                                 </copy>
-                                <zip destfile="${basedir}/target/authenticationendpoint.war"
-                                     basedir="${basedir}/target/authenticationendpoint-dist"/>
-                                <echo message="######### Done creating APP Authentication Endpoint ###########"/>
+                                <zip destfile="${basedir}/target/authenticationendpoint.war" basedir="${basedir}/target/authenticationendpoint-dist" />
+                                <echo message="######### Done creating APP Authentication Endpoint ###########" />
                             </tasks>
                         </configuration>
                     </execution>
diff --git a/modules/features/org.wso2.mdm.styles.feature/pom.xml b/modules/features/org.wso2.mdm.styles.feature/pom.xml
index 4f92c16ca..7aece9e80 100644
--- a/modules/features/org.wso2.mdm.styles.feature/pom.xml
+++ b/modules/features/org.wso2.mdm.styles.feature/pom.xml
@@ -20,13 +20,13 @@
 	<parent>
 		<groupId>org.wso2.mdm</groupId>
 		<artifactId>wso2mdm-features</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.1.1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.mdm.styles.feature</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.1.1</version>
 	<packaging>pom</packaging>
 	<name>WSO2 Mobile Device Manager (MDM) Styles Feature</name>
 	<url>http://wso2.org</url>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>org.wso2.mdm</groupId>
 			<artifactId>org.wso2.mdm.admin.styles</artifactId>
-			<version>2.2.0-SNAPSHOT</version>
+			<version>2.1.1</version>
 		</dependency>
 	</dependencies>
 
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index d1bd2d38f..4b60cd21c 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -20,14 +20,14 @@
 	<parent>
 		<groupId>org.wso2.mdm</groupId>
 		<artifactId>wso2mdm-parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.1.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.wso2.mdm</groupId>
 	<artifactId>wso2mdm-features</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.1.1</version>
 	<packaging>pom</packaging>
 	<name>WSO2 Mobile Device Manager (MDM) Features</name>
 	<url>http://wso2.org</url>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 05183e515..fdf83b8a8 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-artifacts/pom.xml b/modules/integration/tests-artifacts/pom.xml
index 40fd072e9..14e078356 100644
--- a/modules/integration/tests-artifacts/pom.xml
+++ b/modules/integration/tests-artifacts/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-integration</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</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 690dbcc43..af9791cd9 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>tests-common</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</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 ba7c29071..3bba17a89 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>tests-common</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index b99bbca2e..21ece811e 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-integration</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</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 b5146a78c..f807beedb 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>tests-common</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index 0331698e9..08476acf0 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-integration</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-platform/pom.xml b/modules/integration/tests-platform/pom.xml
index 9a4a03628..75b67d603 100644
--- a/modules/integration/tests-platform/pom.xml
+++ b/modules/integration/tests-platform/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-integration</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</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 151e2be43..45ba77148 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.mdm</groupId>
         <artifactId>wso2mdm-integration</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/mdm-ui/pom.xml b/modules/mdm-ui/pom.xml
index 8bd59ab14..3714d618d 100644
--- a/modules/mdm-ui/pom.xml
+++ b/modules/mdm-ui/pom.xml
@@ -20,14 +20,14 @@
 	<parent>
 		<groupId>org.wso2.mdm</groupId>
 		<artifactId>wso2mdm-parent</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.1.1</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.mdm.admin.styles</artifactId>
 	<packaging>bundle</packaging>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.1.1</version>
 	<name>WSO2 Mobile Device Manager (MDM) - UI styles</name>
 	<url>http://wso2.org</url>
 
diff --git a/modules/mobile-agents/pom.xml b/modules/mobile-agents/pom.xml
index b8538af2b..4db8a066a 100644
--- a/modules/mobile-agents/pom.xml
+++ b/modules/mobile-agents/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index 539e1c37e..563309ba8 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/tools/emm-qsg/pom.xml b/modules/tools/emm-qsg/pom.xml
index f02cf5080..68cd186e1 100644
--- a/modules/tools/emm-qsg/pom.xml
+++ b/modules/tools/emm-qsg/pom.xml
@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-tools</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.mdm</groupId>
     <artifactId>emm-qsg</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.1</version>
     <name>WSO2 EMM QSG tools</name>
     <description>This includes the tools for EMM QSG</description>
     <packaging>jar</packaging>
diff --git a/modules/tools/pom.xml b/modules/tools/pom.xml
index cc59b4279..39a7c3326 100644
--- a/modules/tools/pom.xml
+++ b/modules/tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.mdm</groupId>
         <artifactId>wso2mdm-parent</artifactId>
-        <version>2.2.0-SNAPSHOT</version>
+        <version>2.1.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -29,7 +29,7 @@
     <groupId>org.wso2.mdm</groupId>
     <artifactId>wso2mdm-tools</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.1</version>
     <name>WSO2 EMM Tools</name>
     <url>http://maven.apache.org</url>
 
diff --git a/pom.xml b/pom.xml
index bfd582a12..7120244db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.mdm</groupId>
     <artifactId>wso2mdm-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>2.1.1</version>
     <name>WSO2 MDM - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 Mobile Device Manager</description>
@@ -1046,7 +1046,7 @@
 
         <!-- Carbon Mobile Device Management -->
         <carbon.mobile.device.mgt.version>2.2.4</carbon.mobile.device.mgt.version>
-        <mdm.version>2.2.0-SNAPSHOT</mdm.version>
+        <mdm.version>2.1.1</mdm.version>
 
         <!-- Carbon API Management -->
         <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>
@@ -1126,7 +1126,7 @@
         <url>https://github.com/wso2/product-mdm.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-mdm.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-mdm.git</connection>
-        <tag>HEAD</tag>
+        <tag>v2.1.1</tag>
     </scm>
 
     <build>