diff --git a/modules/api-import-export/pom.xml b/modules/api-import-export/pom.xml
index 2fd58cb365..98886ac77c 100644
--- a/modules/api-import-export/pom.xml
+++ b/modules/api-import-export/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index d960b5c6ae..0efd9ebe6a 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/product/pom.xml b/modules/distribution/product/pom.xml
index fca19dad85..d9c50f9e7e 100644
--- a/modules/distribution/product/pom.xml
+++ b/modules/distribution/product/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-distribution-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -228,8 +228,8 @@
                         <phase>prepare-package</phase>
                         <configuration>
                             <tasks>
-            			<replace token= "PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../../p2-profile/product/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
-              			   <include name="entitlement.properties"/>
+            			<replace token="PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" value="#PIP.AttributeDesignators.Designator.2=org.wso2.carbon.identity.application.authz.xacml.pip.AuthenticationContextAttributePIP" dir="${basedir}/../../p2-profile/product/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
+              			   <include name="entitlement.properties" />
             			</replace>
                             </tasks>
                         </configuration>
@@ -242,11 +242,11 @@
                         <phase>prepare-package</phase>
                         <configuration>
                             <tasks>
-                                <replace token= "&lt;AuthorizationHandler&gt;" value="&lt;!--AuthorizationHandler&gt;" dir="${basedir}/../../p2-profile/product/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
-                                   <include name="application-authentication.xml"/>
+                                <replace token="&lt;AuthorizationHandler&gt;" value="&lt;!--AuthorizationHandler&gt;" dir="${basedir}/../../p2-profile/product/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
+                                   <include name="application-authentication.xml" />
                                 </replace>
-				<replace token= "&lt;/AuthorizationHandler&gt;" value="&lt;/AuthorizationHandler--&gt;" dir="${basedir}/../../p2-profile/product/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
-                                   <include name="application-authentication.xml"/>
+				<replace token="&lt;/AuthorizationHandler&gt;" value="&lt;/AuthorizationHandler--&gt;" dir="${basedir}/../../p2-profile/product/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/">
+                                   <include name="application-authentication.xml" />
                                 </replace>
                             </tasks>
                         </configuration>
diff --git a/modules/features/pom.xml b/modules/features/pom.xml
index bd6830d97b..67d2a93825 100644
--- a/modules/features/pom.xml
+++ b/modules/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml b/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml
index 6945a34041..276e06e9ea 100644
--- a/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml
+++ b/modules/features/product/org.wso2.am.multitenancy.dashboard.ui.feature/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>am-features</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/features/product/org.wso2.am.styles.feature/pom.xml b/modules/features/product/org.wso2.am.styles.feature/pom.xml
index b62d5a93d6..a3b2ba3737 100644
--- a/modules/features/product/org.wso2.am.styles.feature/pom.xml
+++ b/modules/features/product/org.wso2.am.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-features</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/product/pom.xml b/modules/features/product/pom.xml
index e5d3f94871..80aba41a11 100644
--- a/modules/features/product/pom.xml
+++ b/modules/features/product/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
     	<artifactId>am-features-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.stratos.apimgt.dashboard.ui.feature/pom.xml b/modules/features/service/org.wso2.stratos.apimgt.dashboard.ui.feature/pom.xml
index 1582499f57..d20a8df80d 100644
--- a/modules/features/service/org.wso2.stratos.apimgt.dashboard.ui.feature/pom.xml
+++ b/modules/features/service/org.wso2.stratos.apimgt.dashboard.ui.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>wso2stratos-am-features</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.stratos.apimgt.login.ui.feature/pom.xml b/modules/features/service/org.wso2.stratos.apimgt.login.ui.feature/pom.xml
index 843691ade2..8b1631f60d 100644
--- a/modules/features/service/org.wso2.stratos.apimgt.login.ui.feature/pom.xml
+++ b/modules/features/service/org.wso2.stratos.apimgt.login.ui.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>wso2stratos-am-features</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.stratos.apimgt.styles.feature/pom.xml b/modules/features/service/org.wso2.stratos.apimgt.styles.feature/pom.xml
index 3a645cf2ed..aab9c9ef88 100644
--- a/modules/features/service/org.wso2.stratos.apimgt.styles.feature/pom.xml
+++ b/modules/features/service/org.wso2.stratos.apimgt.styles.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>wso2stratos-am-features</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/org.wso2.stratos.apimgt.utils.feature/pom.xml b/modules/features/service/org.wso2.stratos.apimgt.utils.feature/pom.xml
index b5f0a6c126..844c158107 100644
--- a/modules/features/service/org.wso2.stratos.apimgt.utils.feature/pom.xml
+++ b/modules/features/service/org.wso2.stratos.apimgt.utils.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>wso2stratos-am-features</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/features/service/pom.xml b/modules/features/service/pom.xml
index b6c0b7dd7b..53d0f4c975 100644
--- a/modules/features/service/pom.xml
+++ b/modules/features/service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-features-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 6892212e83..a76f5a102b 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.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 6dee8972fa..8471740ca1 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -21,7 +21,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml b/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml
index f490f1a38b..ea12f81601 100644
--- a/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml
+++ b/modules/integration/tests-common/backend-service/jaxrs-app/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>test-artifacts</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/backend-service/monitor-app/pom.xml b/modules/integration/tests-common/backend-service/monitor-app/pom.xml
index 7c14572719..4cf72a2426 100644
--- a/modules/integration/tests-common/backend-service/monitor-app/pom.xml
+++ b/modules/integration/tests-common/backend-service/monitor-app/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>test-artifacts</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
diff --git a/modules/integration/tests-common/backend-service/pom.xml b/modules/integration/tests-common/backend-service/pom.xml
index 70b6325fbd..1757582c00 100644
--- a/modules/integration/tests-common/backend-service/pom.xml
+++ b/modules/integration/tests-common/backend-service/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/framework-extensions/pom.xml b/modules/integration/tests-common/framework-extensions/pom.xml
index 514df07fcb..29da5ed368 100644
--- a/modules/integration/tests-common/framework-extensions/pom.xml
+++ b/modules/integration/tests-common/framework-extensions/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/integration-test-extensions/pom.xml b/modules/integration/tests-common/integration-test-extensions/pom.xml
index 8f351b8455..c2aa4d647f 100644
--- a/modules/integration/tests-common/integration-test-extensions/pom.xml
+++ b/modules/integration/tests-common/integration-test-extensions/pom.xml
@@ -18,7 +18,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -35,7 +35,7 @@ under the License.
         <dependency>
             <groupId>org.wso2.am</groupId>
             <artifactId>org.wso2.am.framework.extensions</artifactId>
-            <version>2.1.0-SNAPSHOT</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.am</groupId>
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index d0fa68b932..45c05a8ebc 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 55b17d29b4..b6fcd8d2c6 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>integration</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.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 e0e5c82fbe..84f72d506e 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>tests-common</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.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 4f557a55ea..a9ef62cd7e 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -21,7 +21,7 @@ under the License.
     <parent>
         <artifactId>integration</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/integration/tests-integration/tests-backend/pom.xml b/modules/integration/tests-integration/tests-backend/pom.xml
index 3906436249..3bf33d13ea 100644
--- a/modules/integration/tests-integration/tests-backend/pom.xml
+++ b/modules/integration/tests-integration/tests-backend/pom.xml
@@ -20,7 +20,7 @@ under the License.
     <parent>
         <artifactId>org.wso2.carbon.am.integration.test</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml b/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml
index 797eb977d7..18f09e43be 100644
--- a/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml
+++ b/modules/org.wso2.am.multitenancy.dashboard.ui/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>am-parent</artifactId>
         <groupId>org.wso2.am</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/modules/org.wso2.stratos.apimgt.dashboard.ui/pom.xml b/modules/org.wso2.stratos.apimgt.dashboard.ui/pom.xml
index 331f979c64..fa8e7f0115 100644
--- a/modules/org.wso2.stratos.apimgt.dashboard.ui/pom.xml
+++ b/modules/org.wso2.stratos.apimgt.dashboard.ui/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/org.wso2.stratos.apimgt.login.ui/pom.xml b/modules/org.wso2.stratos.apimgt.login.ui/pom.xml
index 9e3290c134..fa294364d0 100644
--- a/modules/org.wso2.stratos.apimgt.login.ui/pom.xml
+++ b/modules/org.wso2.stratos.apimgt.login.ui/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml
index 5f596befd1..1660195e7a 100644
--- a/modules/p2-profile/pom.xml
+++ b/modules/p2-profile/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/p2-profile/product/pom.xml b/modules/p2-profile/product/pom.xml
index 209dc01f3b..0201e7e652 100644
--- a/modules/p2-profile/product/pom.xml
+++ b/modules/p2-profile/product/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-p2-profile-gen-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/pom.xml b/modules/styles/pom.xml
index 1a0c1887b7..c20c700d61 100644
--- a/modules/styles/pom.xml
+++ b/modules/styles/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/product/pom.xml b/modules/styles/product/pom.xml
index e2c55ffcae..1020114f37 100644
--- a/modules/styles/product/pom.xml
+++ b/modules/styles/product/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-styles-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/styles/service/pom.xml b/modules/styles/service/pom.xml
index fb83bba6cb..b447e7f1a9 100644
--- a/modules/styles/service/pom.xml
+++ b/modules/styles/service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.am</groupId>
         <artifactId>am-styles-parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index e778384106..2120336dfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <groupId>org.wso2.am</groupId>
     <artifactId>am-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.0</version>
     <name>WSO2 API Manager - Aggregator Module</name>
     <url>http://wso2.com/products/api-manager</url>
     <description>WSO2 API Manager</description>
@@ -58,7 +58,7 @@
         <url>https://github.com/wso2/product-apim.git</url>
         <developerConnection>scm:git:https://github.com/wso2/product-apim.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/product-apim.git</connection>
-        <tag>HEAD</tag>
+        <tag>v2.1.0-rc1</tag>
     </scm>
 
     <repositories>
@@ -918,7 +918,7 @@
 
         <!--carbon versions-->
         <carbon.kernel.version>4.4.11</carbon.kernel.version>
-        <apimserver.version>2.1.0-SNAPSHOT</apimserver.version>
+        <apimserver.version>2.1.0</apimserver.version>
         <ws.feature.version>1.4.2</ws.feature.version>
 
 	    <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>