diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules/analytics/distribution/src/assembly/bin.xml
index 54af562a..b2b13d93 100644
--- a/modules/analytics/distribution/src/assembly/bin.xml
+++ b/modules/analytics/distribution/src/assembly/bin.xml
@@ -701,6 +701,10 @@
             <source>src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security</outputDirectory>
         </file>
+        <file>
+            <source>src/repository/conf/etc/jwt.properties</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/etc</outputDirectory>
+        </file>
 
         <!-- Copying metrics feature related files -->
         <file>
diff --git a/modules/analytics/distribution/src/bin/wso2server.bat b/modules/analytics/distribution/src/bin/wso2server.bat
index c11340a5..999592c2 100644
--- a/modules/analytics/distribution/src/bin/wso2server.bat
+++ b/modules/analytics/distribution/src/bin/wso2server.bat
@@ -196,7 +196,7 @@ set CARBON_CLASSPATH=.\lib;%CARBON_CLASSPATH%
 
 set JAVA_ENDORSED=".\lib\endorsed";"%JAVA_HOME%\jre\lib\endorsed";"%JAVA_HOME%\lib\endorsed"
 
-set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Analytics" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8
+set CMD_LINE_ARGS=-Xbootclasspath/a:%CARBON_XBOOTCLASSPATH% -Xms256m -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%CARBON_HOME%\repository\logs\heap-dump.hprof"  -Dcom.sun.management.jmxremote -classpath %CARBON_CLASSPATH% %JAVA_OPTS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dcarbon.registry.root=/ -Dcarbon.home="%CARBON_HOME%" -Dlogger.server.name="IoT-Analytics" -Dwso2.server.standalone=true -Djava.command="%JAVA_HOME%\bin\java" -Djava.opts="%JAVA_OPTS%" -Djava.io.tmpdir="%CARBON_HOME%\tmp" -Dcatalina.base="%CARBON_HOME%\lib\tomcat" -Dwso2.carbon.xml=%CARBON_HOME%\repository\conf\carbon.xml -Dwso2.registry.xml="%CARBON_HOME%\repository\conf\registry.xml" -Dwso2.user.mgt.xml="%CARBON_HOME%\repository\conf\user-mgt.xml" -Dwso2.transports.xml="%CARBON_HOME%\repository\conf\mgt-transports.xml" -Djava.util.logging.config.file="%CARBON_HOME%\repository\conf\etc\logging-bridge.properties" -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Dcarbon.config.dir.path="%CARBON_HOME%\repository\conf"  -Dcomponents.repo="%CARBON_HOME%\repository\components" -Dconf.location="%CARBON_HOME%\repository\conf" -Dcom.atomikos.icatch.file="%CARBON_HOME%\lib\transactions.properties" -Dcom.atomikos.icatch.hide_init_file_path="true" -Dorg.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING=false -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dcom.sun.jndi.ldap.connect.pool.authentication=simple -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1886" -Diot.core.host="localhost" -Diot.core.https.port="9443" -Dcom.sun.jndi.ldap.connect.pool.timeout=3000 -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8
 
 :runJava
 echo JAVA_HOME environment variable is set to %JAVA_HOME%
diff --git a/modules/analytics/distribution/src/bin/wso2server.sh b/modules/analytics/distribution/src/bin/wso2server.sh
index 1033e7e2..c99980c3 100755
--- a/modules/analytics/distribution/src/bin/wso2server.sh
+++ b/modules/analytics/distribution/src/bin/wso2server.sh
@@ -322,6 +322,10 @@ do
     -Dfile.encoding=UTF8 \
     -Djava.net.preferIPv4Stack=true \
     -Dcom.ibm.cacheLocalHost=true \
+    -Dmqtt.broker.host="localhost" \
+    -Dmqtt.broker.port="1886" \
+    -Diot.core.host="localhost" \
+    -Diot.core.https.port="9443" \
     $NODE_PARAMS \
     org.wso2.carbon.bootstrap.Bootstrap $*
     status=$?
diff --git a/modules/analytics/distribution/src/repository/conf/etc/jwt.properties b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
new file mode 100644
index 00000000..40548373
--- /dev/null
+++ b/modules/analytics/distribution/src/repository/conf/etc/jwt.properties
@@ -0,0 +1,57 @@
+#
+# Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# WSO2 Inc. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#issuer of the JWT
+iss=CDMF_DEFAULT_IDP
+
+TokenEndpoint=https://localhost:${iot.core.https.port}/oauth2/token
+
+#audience of JWT claim
+#comma seperated values
+aud=JwtIdentityAudience
+
+#expiration time of JWT (number of minutes from the current time)
+exp=1000
+
+#issued at time of JWT (number of minutes from the current time)
+iat=0
+
+#nbf time of JWT (number of minutes from current time)
+nbf=0
+
+#skew between IDP and issuer(seconds)
+skew=0
+
+# JWT Id
+#jti=token123
+
+#KeyStore to cryptographic credentials
+#KeyStore=repository/resources/security/wso2carbon.jks
+
+#Password of the KeyStore
+#KeyStorePassword=wso2carbon
+
+#Alias of the SP's private key
+#PrivateKeyAlias=wso2carbon
+
+#Private key password to retrieve the private key used to sign
+#AuthnRequest and LogoutRequest messages
+#PrivateKeyPassword=wso2carbon
+
+#this will be used as the default IDP config if there isn't any config available for tenants.
+default-jwt-client=true
diff --git a/modules/broker/distribution/src/main/assembly/bin.xml b/modules/broker/distribution/src/main/assembly/bin.xml
index e0bd0e5d..b76a5117 100644
--- a/modules/broker/distribution/src/main/assembly/bin.xml
+++ b/modules/broker/distribution/src/main/assembly/bin.xml
@@ -38,7 +38,7 @@
                 <exclude>**/carbon.xml</exclude>
                 <exclude>**/master-datasources.xml</exclude>
                 <exclude>**/release-notes.html</exclude>
-                <exclude>**/repository/conf/axis2/axis2.xml</exclude>
+                <exclude>**/repository/conf/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>
@@ -47,6 +47,17 @@
             <excludes>
                 <exclude>**/wso2server.sh</exclude>
                 <exclude>**/wso2server.bat</exclude>
+                <exclude>**/broker.xml</exclude>
+                <exclude>**/axis2.xml</exclude>
+                <exclude>**/carbon.xml</exclude>
+                <exclude>**/cipher-text.properties</exclude>
+                <exclude>**/cipher-tool.properties</exclude>
+                <exclude>**/hazelcast.properties</exclude>
+                <exclude>**/master-datasources.xml</exclude>
+                <exclude>**/messaging-event-broker.xml</exclude>
+                <exclude>**/metrics.xml</exclude>
+                <exclude>**/launch.ini</exclude>
+                <exclude>**/log4j.properties</exclude>
             </excludes>
             <includes>
                 <include>**/*.sh</include>
@@ -197,36 +208,19 @@
             </directory>
             <outputDirectory>wso2iot-broker-${pom.version}/repository/conf
             </outputDirectory>
-            <includes>
-                <include>**/broker.xml</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <!--QPID related configurations-->
-        <fileSet>
-            <directory>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/advanced/
-            </directory>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/advanced</outputDirectory>
-            <includes>
-                <include>**/qpid-config.xml</include>
-                <include>**/qpid-virtualhosts.xml</include>
-                <include>**/qpid-jmxremote.access</include>
-            </includes>
-            <fileMode>644</fileMode>
-        </fileSet>
-        <!--Multitenancy related file -->
-        <fileSet>
-            <directory>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/multitenancy/
-            </directory>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/multitenancy</outputDirectory>
-            <includes>
-                <include>**/stratos.xml</include>
-                <include>**/multitenancy-packages.xml</include>
-                <include>**/usage-throttling-agent-config.xml</include>
-                <include>**/cloud-services-desc.xml</include>
-            </includes>
+            <excludes>
+                <exclude>**/broker.xml</exclude>
+                <exclude>**/axis2.xml</exclude>
+                <exclude>**/carbon.xml</exclude>
+                <exclude>**/cipher-text.properties</exclude>
+                <exclude>**/cipher-tool.properties</exclude>
+                <exclude>**/hazelcast.properties</exclude>
+                <exclude>**/master-datasources.xml</exclude>
+                <exclude>**/messaging-event-broker.xml</exclude>
+                <exclude>**/metrics.xml</exclude>
+                <exclude>**/launch.ini</exclude>
+                <exclude>**/log4j.properties</exclude>
+            </excludes>
             <fileMode>644</fileMode>
         </fileSet>
         <!-- copy the landing page webapp -->
@@ -281,14 +275,6 @@
             <fileMode>644</fileMode>
             <directoryMode>775</directoryMode>
         </fileSet>
-        <fileSet>
-            <directory>src/main/conf</directory>
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf</outputDirectory>
-            <includes>
-                <include>**/broker.xml</include>
-            </includes>
-        </fileSet>
     </fileSets>
 
     <dependencySets>
@@ -333,17 +319,24 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--<file>
-            <source>target/wso2carbon-core-${carbon.kernel.version}/repository/conf/carbon.xml</source>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-        </file>-->
         <file>
             <source>src/main/conf/carbon.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
             <filtered>true</filtered>
         </file>
+        <file>
+            <source>src/main/conf/metrics.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+            <filtered>true</filtered>
+        </file>
+        <file>
+            <source>src/main/conf/broker.xml
+            </source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/</outputDirectory>
+            <filtered>true</filtered>
+        </file>
         <file>
             <source>src/main/conf/messaging-event-broker.xml</source>
             <outputDirectory>wso2iot-broker-${pom.version}/repository/conf</outputDirectory>
@@ -416,45 +409,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <file>
-            <source>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/etc/logging-config.xml
-            </source>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/etc/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
-        <!--<file>
-            <source>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity.xml
-            </source>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>true</filtered>
-        </file>-->
-
-       <!-- <file>
-            <source>../../modules/samples/product/services/EventSinkService/EventSinkService.aar
-            </source>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/deployment/server/axis2services/
-            </outputDirectory>
-            <fileMode>644</fileMode>
-        </file>-->
-        <file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/metrics.properties</source>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>false</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>src/main/conf/metrics.xml</source>
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf/</outputDirectory>
-            <filtered>false</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/datasources/metrics-datasources.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/datasources/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
         <file>
             <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2METRICS_DB.h2.db</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
@@ -488,26 +442,5 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/lib</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <!--End of Cipher Tool Files-->
-        <file>
-            <source>../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/identity.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/identity</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
-        <file>
-            <source>
-                ../p2-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/data-bridge/data-agent-config.xml
-            </source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/data-bridge</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
-        <!-- Copying broker.xml -->
-        <file>
-            <source>src/main/conf/broker.xml</source>
-           <!-- <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>-->
-            <outputDirectory>wso2iot-broker-${pom.version}/repository/conf</outputDirectory>
-            <fileMode>644</fileMode>
-        </file>
     </files>
 </assembly>
diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 4081713c..5ce94fe8 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -685,73 +685,6 @@
             </excludes>
             <filtered>true</filtered>
         </fileSet>
-
-        <!-- TODO: Remove below Andriod Analytics -->
-
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--src/repository/analytics/android/store-->
-            <!--</directory>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/store</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>**/*</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--src/repository/analytics/android/streams-->
-            <!--</directory>-->
-            <!--<outputDirectory>-->
-                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/eventstreams-->
-            <!--</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>**/*</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--src/repository/analytics/android/event-sink-->
-            <!--</directory>-->
-            <!--<outputDirectory>-->
-                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/eventsink-->
-            <!--</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>**/*</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--src/repository/analytics/android/eventpublishers-->
-            <!--</directory>-->
-            <!--<outputDirectory>-->
-                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/eventpublishers-->
-            <!--</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>**/*</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--src/repository/analytics/android/executionplans-->
-            <!--</directory>-->
-            <!--<outputDirectory>-->
-                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/executionplans-->
-            <!--</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>**/*</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--src/repository/analytics/android/simulators-->
-            <!--</directory>-->
-            <!--<outputDirectory>-->
-                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/eventsimulatorfiles-->
-            <!--</outputDirectory>-->
-            <!--<includes>-->
-                <!--<include>**/*</include>-->
-            <!--</includes>-->
-        <!--</fileSet>-->
     </fileSets>
 
     <dependencySets>
@@ -782,34 +715,6 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/bin</outputDirectory>
             <fileMode>755</fileMode>
         </file>
-
-        <!-- Copying the "portal" app specific modifications to the distribution pack-->
-        <!--<file>-->
-            <!--<source>src/repository/jaggeryapps/portal/controllers/apis/analytics.jag</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/controllers/apis-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
-        <!--<file>-->
-            <!--<source>src/repository/jaggeryapps/portal/js/outputAdapterUiLibrary.js</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/js-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
-        <!--<file>-->
-            <!--<source>src/repository/jaggeryapps/portal/templates/gadgets/igviz/js/outputAdapterUiLibrary.js</source>-->
-            <!--<outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/templates/gadgets/igviz/js-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
-        <!-- TODO: Uncomment below -->
-        <!--<file>-->
-            <!--<source>src/repository/jaggeryapps/portal/uipublisher/websocketSubscriptionEndpoint.jag</source>-->
-            <!--<outputDirectory>-->
-                <!--${pom.artifactId}-${pom.version}/repository/deployment/server/jaggeryapps/portal/uipublisher/-->
-            <!--</outputDirectory>-->
-            <!--<fileMode>755</fileMode>-->
-        <!--</file>-->
         <file>
             <source>src/repository/jaggeryapps/portal/configs/designer.json</source>
             <outputDirectory>
@@ -906,14 +811,6 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!-- Copying event-broker.xml -->
-        <!--file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/messaging-event-broker.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file-->
-        <!-- Copying application-authentication.xml -->
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/application-authentication.xml
@@ -1045,11 +942,6 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
-        <!--file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2MB_DB.h2.db</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/database/</outputDirectory>
-            <fileMode>644</fileMode>
-        </file-->
         <!-- nTask Component -->
         <file>
             <source>
diff --git a/modules/distribution/src/resources/bin/start-all.sh b/modules/distribution/src/resources/bin/start-all.sh
index efa57488..3926f8bf 100644
--- a/modules/distribution/src/resources/bin/start-all.sh
+++ b/modules/distribution/src/resources/bin/start-all.sh
@@ -34,9 +34,11 @@ PRGDIR=`dirname "$PRG"`
 # Only set CARBON_HOME if not already set
 [ -z "$CARBON_HOME" ] && CARBON_HOME=`cd "$PRGDIR/.." ; pwd`
 
+sh "$CARBON_HOME/broker/bin/wso2server.sh" $* &
+sleep 10
 sh "$CARBON_HOME/core/bin/wso2server.sh" $* &
+sleep 20
 sh "$CARBON_HOME/analytics/bin/wso2server.sh" $* &
-sh "$CARBON_HOME/broker/bin/wso2server.sh" $* &
 
 if [ ! -z "$*" ]; then
     exit;