diff --git a/README.md b/README.md
index 85b398ae..159acb2f 100644
--- a/README.md
+++ b/README.md
@@ -53,11 +53,11 @@ https://entgra.atlassian.net/wiki/spaces/IoTS340/overview.
 * Support for SCEP protocol (encryption and authenticity)
 
 ### How to Run
-* Extract the downloaded entgraiot-3.4.0.zip file; this will create a folder named ‘entgraiot-3.4.0’.
+* Extract the downloaded entgraiot-3.6.0.zip file; this will create a folder named ‘entgraiot-3.6.0’.
 * IoT Server comes with three runnable components namely broker, core, and analytics. Start these components in following order by executing the following scripts:
-    * entgraiot-3.4.0/bin/broker.sh [.bat]
-    * entgraiot-3.4.0/bin/iot-server.sh [.bat]
-    * entgraiot-3.4.0/bin/analytics.sh [.bat]
+    * entgraiot-3.6.0/bin/broker.sh [.bat]
+    * entgraiot-3.6.0/bin/iot-server.sh [.bat]
+    * entgraiot-3.6.0/bin/analytics.sh [.bat]
 
 ### How to Contribute
 
diff --git a/modules/distribution/src/analytics/samples/device-plugins/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
index 33560cf5..9052c483 100644
--- a/modules/distribution/src/analytics/samples/device-plugins/pom.xml
+++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.iot.analytics.devicemgt-plugins</groupId>
     <artifactId>analytics-devicetype-feature-installation</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - Analytics</name>
     <url>http://wso2.org</url>
diff --git a/modules/distribution/src/core/bin/carbondump.bat b/modules/distribution/src/core/bin/carbondump.bat
index 7dc68fff..9f8515ee 100644
--- a/modules/distribution/src/core/bin/carbondump.bat
+++ b/modules/distribution/src/core/bin/carbondump.bat
@@ -193,6 +193,6 @@ goto end
 
 :invalidUsage
 echo Usage: carbondump.bat [-carbonHome path] [-pid of the carbon instance]
-echo   e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.4.0\ -pid 5151
+echo   e.g. carbondump.bat -carbonHome C:\user\wso2carbon-3.6.0\ -pid 5151
 
 :END
diff --git a/modules/distribution/src/core/release-notes.html b/modules/distribution/src/core/release-notes.html
index 3dca7d50..b2fea92f 100644
--- a/modules/distribution/src/core/release-notes.html
+++ b/modules/distribution/src/core/release-notes.html
@@ -8,14 +8,14 @@
 
 <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>
 
-<h1>Release Note - Entgra IoT Server Version 3.5.0</h1>
+<h1>Release Note - Entgra IoT Server Version 3.6.0</h1>
 
-<h2>We are pleased to announce Entgra IoT Server 3.5.0.</h2>
+<h2>We are pleased to announce Entgra IoT Server 3.6.0.</h2>
 
-<p>Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.5.0 pays special focus to Kiosk devices and many other EMM improvements.
+<p>Entgra IoT Server is the successor of WSO2 IoT server and includes capability to manage mobile devices(MDM), manage applications(MAM) and IoT devices in a single environment. It provides best of breed technologies for device manufacturers to develop connected smart products as well as anyone looking for a well established EMM solution to manage devices in their organisations. Entgra IoTs 3.6.0 pays special focus to Kiosk devices and many other EMM improvements.
 </p>
 
-<h4>What's new in Entgra IoTS 3.5.0</h4>
+<h4>What's new in Entgra IoTS 3.6.0</h4>
 
 <ul>
 	<li>Policy to install apps at device enrollment time</li>
@@ -39,7 +39,7 @@ Documentations: <a href='https://entgra.atlassian.net/wiki/spaces/IoTS350/overvi
 
 <h4>Known Issues</h4>
 
-The known set of issues this version can be found <a href='https://gitlab.com/entgra/product-iots/issues?scope=all&utf8=%E2%9C%93&state=opened&milestone_title=IoT%203.5.0-GA'> here.</a>
+The known set of issues this version can be found <a href='https://gitlab.com/entgra/product-iots/issues?scope=all&utf8=%E2%9C%93&state=opened&milestone_title=IoT%203.6.0-GA'> here.</a>
 
 <h3>Engaging with Community</h3>
 
diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
index 7436b64f..9805e595 100644
--- a/modules/distribution/src/core/samples/device-plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-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>3.4.0-SNAPSHOT</version>
+    <version>3.6.0</version>
     <packaging>pom</packaging>
     <name>Install Virtual Fire Alarm, Raspberry Pi, Arduino, Android Sense Device Types - IoT Core</name>
     <url>http://wso2.org</url>
diff --git a/modules/scripts/mobile-qsg/resources/Readme.txt b/modules/scripts/mobile-qsg/resources/Readme.txt
index 745e68f5..8e4b733a 100644
--- a/modules/scripts/mobile-qsg/resources/Readme.txt
+++ b/modules/scripts/mobile-qsg/resources/Readme.txt
@@ -1,5 +1,5 @@
 
-WSO2 IoTs 3.4.0 QSG Setup Guide
+WSO2 IoTs 3.6.0 QSG Setup Guide
 ---------------------------------
 
 1. Start the WSO2 IoTS server