diff --git a/modules/analytics/distribution/pom.xml b/modules/analytics/distribution/pom.xml
index 35b8c570..6ac4ace9 100644
--- a/modules/analytics/distribution/pom.xml
+++ b/modules/analytics/distribution/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules/analytics/distribution/src/ues/designer.json
index b55701c9..116aeb3c 100644
--- a/modules/analytics/distribution/src/ues/designer.json
+++ b/modules/analytics/distribution/src/ues/designer.json
@@ -7,16 +7,21 @@
         "ignoreProviders": ["rt"]
     },
     "authentication": {
-        "activeMethod": "basic",
+        "activeMethod": "sso",
         "methods": {
             "sso": {
                 "attributes": {
-                    "issuer": "portal",
+                    "issuer": "analyticsportal",
                     "identityProviderURL": "https://localhost:9443/samlsso",
-                    "responseSigningEnabled": "false",
-                    "acs": "https://localhost:9444/portal/acs",
+                    "responseSigningEnabled": true,
+                    "validateAssertionValidityPeriod": true,
+                    "validateAudienceRestriction": true,
+                    "assertionSigningEnabled": true,
+                    "acs": "https://localhost:9445/portal/acs",
                     "identityAlias": "wso2carbon",
-                    "useTenantKey": false
+                    "defaultNameIDPolicy": "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified",
+                    "useTenantKey": false,
+                    "isPassive": false
                 }
             },
             "basic": {
@@ -25,21 +30,32 @@
         }
     },
     "authorization": {
-        "activeMethod": "",
+        "activeMethod": "oauth",
         "methods": {
             "oauth": {
                 "attributes": {
-                    "idPServer": "%https.ip%/oauth2/token",
-                    "dynamicClientProperties": {
-                        "callbackUrl": "%https.ip%/portal",
-                        "clientName": "portal",
-                        "owner": "admin",
-                        "applicationType": "JaggeryApp",
-                        "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
-                        "saasApp": false,
-                        "dynamicClientRegistrationEndPoint": "%https.ip%/dynamic-client-web/register/",
-                        "tokenScope": "Production"
-                    }
+                    "apimgt-gateway": false,
+                    "oauthProvider": {
+                        "appRegistration": {
+                            "appType": "webapp",
+                            "clientName": "analyticsportal",
+                            "owner": "admin",
+                            "password":"admin",
+                            "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
+                            "apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants",
+                            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
+                            "tokenScope": "admin",
+                            "callbackUrl": "https://localhost:9445/portal",
+                            "saasApp":true
+                        },
+                        "tokenServiceURL": "https://localhost:9443/oauth2/token"
+                    },
+                    "adminUser":"admin@carbon.super",
+                    "adminUserTenantId":"-1234",
+                    "adminRole":"admin",
+                    "scopes" : [
+                        "device:view"
+                    ]
                 }
             }
         }
@@ -54,6 +70,15 @@
     "cacheSizeBytes": "1073741824",
     "defaultDashboardRedirect": false,
     "isCreateGadgetEnable": true,
+    "isSecureVaultEnabled" : false,
+    "assets": {
+        "gadget": {
+            "fileSizeLimit": 5
+        },
+        "layout": {
+            "fileSizeLimit": 1
+        }
+    },
     "oauth": {
         "username": "admin",
         "password": "admin"
@@ -66,4 +91,4 @@
     "queryParameters" : {
         "passBetweenPages" : ["shared"]
     }
-}
+}
\ No newline at end of file
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules/analytics/p2-profile-gen/pom.xml
index f7eee6fa..13836fa9 100644
--- a/modules/analytics/p2-profile-gen/pom.xml
+++ b/modules/analytics/p2-profile-gen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-analytics-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/analytics/pom.xml b/modules/analytics/pom.xml
index 9e40aca5..12445503 100644
--- a/modules/analytics/pom.xml
+++ b/modules/analytics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/distribution/pom.xml b/modules/broker/distribution/pom.xml
index 494a3c93..2f00ff18 100644
--- a/modules/broker/distribution/pom.xml
+++ b/modules/broker/distribution/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-broker-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/p2-profile/pom.xml b/modules/broker/p2-profile/pom.xml
index 25d629de..135a9bd8 100644
--- a/modules/broker/p2-profile/pom.xml
+++ b/modules/broker/p2-profile/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-broker-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/broker/pom.xml b/modules/broker/pom.xml
index b63c86ca..f36f3104 100644
--- a/modules/broker/pom.xml
+++ b/modules/broker/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/distribution/pom.xml b/modules/core/distribution/pom.xml
index 65480742..041401d3 100644
--- a/modules/core/distribution/pom.xml
+++ b/modules/core/distribution/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.wso2.iot</groupId>
 		<artifactId>wso2iot-core-parent</artifactId>
-		<version>3.0.1-SNAPSHOT</version>
+		<version>3.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
index 21adc90b..fb00571f 100755
--- a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
+++ b/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
@@ -100,5 +100,21 @@
                 <Recipient>https://localhost:9443/oauth2/token</Recipient>
             </RecipientList>
         </ServiceProvider>
+        <ServiceProvider>
+            <Issuer>analyticsportal</Issuer>
+            <AssertionConsumerServiceURLs>
+                <AssertionConsumerServiceURL>https://localhost:9445/portal/acs</AssertionConsumerServiceURL>
+            </AssertionConsumerServiceURLs>
+            <DefaultAssertionConsumerServiceURL>https://localhost:9445/portal/acs</DefaultAssertionConsumerServiceURL>
+            <SignResponse>true</SignResponse>
+            <EnableAudienceRestriction>true</EnableAudienceRestriction>
+            <EnableRecipients>true</EnableRecipients>
+            <AudiencesList>
+                <Audience>https://localhost:9443/oauth2/token</Audience>
+            </AudiencesList>
+            <RecipientList>
+                <Recipient>https://localhost:9443/oauth2/token</Recipient>
+            </RecipientList>
+        </ServiceProvider>
     </ServiceProviders>
 </SSOIdentityProviderConfig>
\ No newline at end of file
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
index 7fa6049a..f6c0c85a 100644
--- a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
+++ b/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
@@ -34,17 +34,28 @@
     "methods": {
       "oauth": {
         "attributes": {
-          "idPServer": "%https.host%/oauth2/token",
-          "dynamicClientProperties": {
-            "callbackUrl": "%https.host%/portal",
-            "clientName": "portal",
-            "owner": "admin",
-            "applicationType": "JaggeryApp",
-            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
-            "saasApp": false,
-            "dynamicClientRegistrationEndPoint": "%https.host%/dynamic-client-web/register/",
-            "tokenScope": "Production"
-          }
+          "apimgt-gateway": false,
+          "oauthProvider": {
+            "appRegistration": {
+              "appType": "webapp",
+              "clientName": "portal",
+              "owner": "admin",
+              "password":"admin",
+              "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
+              "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
+              "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
+              "tokenScope": "admin",
+              "callbackUrl": "%https.host%/portal",
+              "saasApp":true
+            },
+            "tokenServiceURL": "https://localhost:9443/oauth2/token"
+          },
+          "adminUser":"admin@carbon.super",
+          "adminUserTenantId":"-1234",
+          "adminRole":"admin",
+          "scopes" : [
+            "device:view"
+          ]
         }
       }
     }
diff --git a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
index 20f33d01..6180edb3 100644
--- a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
+++ b/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-features</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/features/pom.xml b/modules/core/features/pom.xml
index 180c9f68..c7b1c8f2 100644
--- a/modules/core/features/pom.xml
+++ b/modules/core/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/iotserver-ui/pom.xml b/modules/core/iotserver-ui/pom.xml
index a9fe5f02..d469e34e 100644
--- a/modules/core/iotserver-ui/pom.xml
+++ b/modules/core/iotserver-ui/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 99e5f00c..0e9b4487 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -585,6 +585,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.dcr.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of API Management Features -->
 
                                 <!-- TCP Transport -->
@@ -988,6 +991,10 @@
                                     <id>org.wso2.carbon.apimgt.core.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
                                 <!-- API Manager Publisher and Store Features -->
                                 <feature>
                                     <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 6bf0ecf1..8e5da14d 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/core/tools/cdmf-devicetype-archetype/pom.xml b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
index d9079662..2d07c182 100644
--- a/modules/core/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/core/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-tools</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>iot-devicetype-archetype</artifactId>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <name>WSO2 IoT - Device Type Archetype</name>
     <description>WSO2 IoT Device Type Archetype</description>
     <packaging>maven-archetype</packaging>
diff --git a/modules/core/tools/pom.xml b/modules/core/tools/pom.xml
index 3e38f92b..51fa219d 100644
--- a/modules/core/tools/pom.xml
+++ b/modules/core/tools/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.iot</groupId>
         <artifactId>wso2iot-core-parent</artifactId>
-        <version>3.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index b7c3bc05..5b4e8a18 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.0.1-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules/distribution/src/resources/plugins/plugins-deployer.xml
index 805117f5..c22b90df 100644
--- a/modules/distribution/src/resources/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/resources/plugins/plugins-deployer.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.iot.devicemgt-plugins</groupId>
     <artifactId>iot-devicetype-feature-installation</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Creating custom distribution</name>
     <url>http://wso2.org</url>
diff --git a/pom.xml b/pom.xml
index 31bc99cb..aad4b3c7 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.0.1-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <name>WSO2 IoT - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 IoT Server</description>
@@ -1532,7 +1532,7 @@
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
-        <product.iot.version>3.0.1-SNAPSHOT</product.iot.version>
+        <product.iot.version>3.0.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
         <carbon.device.mgt.plugin.version>3.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>
@@ -1633,7 +1633,7 @@
         <orbit.version.h2>1.2.140.wso2v3</orbit.version.h2>
         <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
         <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
-        <carbon.dashboard.version>2.0.4</carbon.dashboard.version>
+        <carbon.dashboard.version>2.0.5-SNAPSHOT</carbon.dashboard.version>
         <carbon.event-processing.version>2.1.4</carbon.event-processing.version>
         <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
         <akka.version>2.3.4-spark</akka.version>