diff --git a/modules/core/distribution/release-notes.html b/modules/core/distribution/release-notes.html
index 67c39923..f4b4e774 100644
--- a/modules/core/distribution/release-notes.html
+++ b/modules/core/distribution/release-notes.html
@@ -1,119 +1,244 @@
+Release Notes - WSO2 IOT Server - Version 3.0.0
- Release Notes - WSO2 IOT Server - Version 1.0.0 - Alpha
-
Bug
-- [IOTS-17] - MQTT endpoints are not secured for agent communication
-
-- [IOTS-19] - XMPP sessions not closed before server shutdown
-
-- [IOTS-21] - Jaggery API calls are not secured
-
-- [IOTS-34] - Backend Service Invoker Fails Intermittently with Unexpected token: <
-
-- [IOTS-37] - Could not generate a new access token (using refresh token) by using the current token endpoint
-
-- [IOTS-47] - Update the release note in the release packs as it is about EMM
-
-- [IOTS-50] - users whos iot-admin role is removed is shown all options for enrol devices as users with iot-admin role
-
-- [IOTS-55] - Considerable delay in server startup
-
-- [IOTS-57] - Error when starting the IOT pack after pointing to the mysql database
-
-- [IOTS-64] - The wso2carbon log file is growing rapidly
-
-- [IOTS-68] - when a tenant is created with the same user name as super tenant seems the super tenant data are shown
-
-- [IOTS-69] - until device admin was disabled the camera policy was in effect preventing the use of camera on android device
-
-- [IOTS-75] - view API throws a Caused by: java.lang.NullPointerException: Tenant domain has not been set in CarbonContext
-
-- [IOTS-81] - IOT devices are allways in active status
-
-- [IOTS-92] - Error in executing task: Table Not Found: X1234_DeviceBatterySummaryData java.lang.RuntimeException: Table Not Found: X1234_DeviceBatterySummaryData is thown when pointing to mysql
-
-- [IOTS-93] - XMPP server details are hardcoded in virtual fire alarm and devicemgt-config.xml file
-
-- [IOTS-94] - Virtual firealarms that were downloaded before xmpp was enabled can not connect to xmpp protocol after enabling.
-
-- [IOTS-100] - When integrating ActiveMQ as an external message broker IOTS fails to start
-
-- [IOTS-102] - Device analytic line graph does not get generated when the device type has a capital letter
-
-- [IOTS-104] - Remove the device type configs that is used for UI from conf directory
-
-- [IOTS-105] - clean unnecessary jaggery apis
-
-- [IOTS-106] - A emm console url is shown in carbon log at server startup
-
-- [IOTS-110] - No email confirmation is sent to user when administrator creates a user
-
-- [IOTS-112] - A prefix as " Device " is set to the devices that is been created
-
-- [IOTS-114] - Change Role permissions: the user is unable to deselect a child node
-
-- [IOTS-117] - Edit/ create Role: Domain needs to be marked as a mandatory field
-
-- [IOTS-122] - Tenant - admin cannot enroll to virtual fire alarm, raspberry pi & arduino
-
-- [IOTS-124] - Group: View analytics loads an error
-
-- [IOTS-127] - Admin cannot reset user passwords
-
-- [IOTS-129] - If devicemgt-user role is deleted users cannot register
-
-- [IOTS-130] - The line graph is not generated correctly for virtual firealarm
-
-- [IOTS-131] - Publishing stats via MQTT protocol to iot server fails
-
-- [IOTS-134] - Server startup fails when configured to use MySQL
-
-- [IOTS-136] - User signup for tenant is not supported
-
-- [IOTS-150] - Arduino sample is not getting proper responses
-
-- [IOTS-151] - Server startup fails when configured to use Oracle
-
-- [IOTS-152] - Platform Configuration display android, iOS and windows Configuration
-
-- [IOTS-153] - Error is thrown when accessing device API details page
-
-- [IOTS-154] - Typo /enrollmentdevicesg/download for raspberypi (g)
-
-- [IOTS-155] - When browsing analytics error 500 shown to user from a group which has no devices assigned
-
-- [IOTS-156] - 404 page when cancel clicked in "Add New Group" page
-
-- [IOTS-157] - Signed up users shown an error page when navigated to policy page
-
-- [IOTS-158] - Signed up users cannot create policies
-
-- [IOTS-159] - Meaningful message to be shown when On / Off issued to virtual fire alarm
-
-- [IOTS-161] - Remove the phrase "Below QR code can also be used to enroll a device"
-
-- [IOTS-163] - Android sensor: only admin can login to the app
-
-- [IOTS-164] - When an existing user name is used by admin no proper validation message shown
-
-- [IOTS-165] - Server startup throws "The following exception occurred when fetching http://www.google-analytics.com/urchin"
-
-- [IOTS-166] - Connected cup device analytics is failing to load
-
-- [IOTS-167] - Considerable delay is taken to initialize transports for device types
-
+ - [IOTS-181] - The Graphs are rendered incorrectly
+
+ - [IOTS-182] - The units are missing from Y axis
+
+ - [IOTS-222] - INSTALL.txt needs to be updated
+
+ - [IOTS-262] - APIThrottleHandler Unable to find throttling info continuously printed.
+
+ - [IOTS-4] - Fresh Pack - Table Not Found: X1234_DeviceGRAVITYSummaryData
+
+ - [IOTS-115] - Edit Role: The domain name can be typed
+
+ - [IOTS-116] - Edit Role: The user is unable to change name
+
+ - [IOTS-119] - When existing role name is used to create a role no validation message is shown
+
+ - [IOTS-128] - Previously selected permission tree is shown for another admin user
+
+ - [IOTS-138] - Remove the admin-device-access role permission
+
+ - [IOTS-144] - Operations Log: the data doesn't load
+
+ - [IOTS-170] - Proper validation is not fired when an invalid domain is used to login
+
+ - [IOTS-179] - Users who register from APIM Store can login to IOTS and enroll devices
+
+ - [IOTS-190] - Multi Tenancy: error 500 loads on logging for the first time.
+
+ - [IOTS-198] - wso2.anonymous.user in API-Store does not have permission to access custom device types API
+
+ - [IOTS-202] - OAuth2BasedMQTTAuthenticator errors thrown if server is bounced while MQTT clients are publishing
+
+ - [IOTS-226] - MqttException thrown when a device is pushing erroneous events
+
+ - [IOTS-227] - When a device is publishing erroneous events at a high rate over MQTT other device events are dropped
+
+ - [IOTS-244] - MQTT clients can authenticate/authorize using tokens generated with credentials not belonging to them
+
+ - [IOTS-255] - [External APIM] https-ep in deviceConfig.properties is not populated with APIM details
+
+ - [IOTS-256] - Errors thrown at HTTP Gateway profile startup
+
+ - [IOTS-257] - transports not bound for HTTP Gateway profile node
+
+ - [IOTS-259] - ERROR - js {} thrown from devicemgt
+
+ - [IOTS-260] - Error loading properties from a file printed due to missing properties files
+
+ - [IOTS-269] - [Intermittent] Force shutdown fails with errors
+
+ - [IOTS-270] - Arduino device type control events are lost if the server is restarted
+
+ - [IOTS-274] - [IOT] /oauth2/token cannot be called directly
+
+ - [IOTS-277] - Accessing swagger definition failed with CNF
+
+ - [IOTS-315] - Missing the start-all.bat and stop-all.bat files
+
+ - [IOTS-339] - Error occurred while registering device management plugin 'android'
+
+ - [IOTS-369] - Add missing grant types in identity.xml
+
+ - [IOTS-378] - Windows Device location is not showing in Device view page
+
+ - [IOTS-391] - Notification Pane position issue
+
+ - [IOTS-18] - Need to add refresh token generation in Android Sense agent.
+
+ - [IOTS-103] - Grouping: need a mechanisam to add devices to a group from the grouping page
+
+ - [IOTS-108] - When user shares device policies fails with 401
+
+ - [IOTS-118] - Change Role permissions: Selecting the rights need to be synced correctly
+
+ - [IOTS-120] - Last name should allow space in-between when creating / editing the name
+
+ - [IOTS-151] - Server startup fails when configured to use Oracle
+
+ - [IOTS-168] - A role with permission assigned to a user is not functioning
+
+ - [IOTS-173] - Same device can be added multiple times to the same group
+
+ - [IOTS-178] - User cannot login to APIM store with IOT credentials
+
+ - [IOTS-183] - Some buttons are not visible
+
+ - [IOTS-193] - Policies: User is unable to add a policy
+
+ - [IOTS-200] - IllegalTransactionStateException when trying to add a new policy
+
+ - [IOTS-204] - Duplicate log4j.properties file in CARBON_HOME/repository
+
+ - [IOTS-212] - [External APIM] NPE thrown when downloading virtual fire alarm, rasp pi and arduino agents
+
+ - [IOTS-218] - Group: when a device is removed from the group the device is completely removed from the devices list
+
+ - [IOTS-232] - Multi Tenancy: error 500 loads when user access the system
+
+ - [IOTS-236] - Sharing a group fails silently if there is group with the same name and no roles are selected
+
+ - [IOTS-239] - SSO failing due to getting the access token from APIM
+
+ - [IOTS-254] - samples-deployer build fails with missing dependency
+
+ - [IOTS-263] - [UI] Same device can be added to a group multiple times
+
+ - [IOTS-344] - Need to remove Android IOT gadget from IoT Core Dashboard
+
+ - [IOTS-346] - Cannot view devices when registered as a new user
+
+ - [IOTS-356] - When UI is configured to use Gateway, Cannot Login
+
+ - [IOTS-365] - Make Policy Management to be part of device management
+
+ - [IOTS-366] - Dynamic values for push notification needs to have default values
+
+ - [IOTS-137] - -Detup fails, logging exceptions
+
+ - [IOTS-151] - Server startup fails when configured to use Oracle
+
+ - [IOTS-160] - Although two roles are shown in roles section several roles are shown when assigning to users
+
+ - [IOTS-172] - The db scripts are not executed with -Dsetup
+
+ - [IOTS-176] - Creating a New Device Type - device-deployer build failed
+
+ - [IOTS-177] - Device types fail to register to IOTS when configured with Oracle db
+
+ - [IOTS-184] - Windows startup error on hadoop
+
+ - [IOTS-195] - Single sign-on(SSO) cannot enable Between devicemgt and DS
+
+ - [IOTS-201] - DashboardDeployer Gadget directory copying to Wrong path
+
+ - [IOTS-316] - Publisher and store apps are not working
+
+ - [IOTS-319] - Implement enrolment functionality for AndroidSens
+
+ - [IOTS-325] - Unable to delete policies associated with a group
+
+ - [IOTS-330] - Policy not added for Virtual firealarm
+
+ - [IOTS-332] - Devices listing page doesn't honor analyticsEnabled and groupingEnabled configs
+
+ - [IOTS-333] - Devices listing page doesn't honor analyticsEnabled and groupingEnabled configs
+
+ - [IOTS-335] - View Dashboard Permissions missing in the role permission tree
+
+ - [IOTS-337] - Permissions (except device-mgt permissions) added through carbon console gets removed when adding permissions through deviceMgt UI
+
+ - [IOTS-340] - NPE for username thrown on Broker
+
-
+
+ Task
+
+
+ - [IOTS-292] - Migrating to synapse gateway
+
+ - [IOTS-381] - device type listing fails when only windows and android features are installed
+
+ - [IOTS-363] - Windows and IOS enrollment related UI page Logos (Wso2 EMM) should be changed into wso2 IOT
+
+ - [IOTS-307] - Stabilize Android Sense + Integrating with new dashboard
+
+
+
Improvement
-- [IOTS-87] - not able to compare two event streams in current IOT server
-
-- [IOTS-145] - Remove the second confirmation message to remove a user or role
-
-- [IOTS-149] - Remove Windows device type from IOTS
-
+ - [IOTS-145] - Remove the second confirmation message to remove a user or role
+
+ - [IOTS-282] - Distributed setup - device-key-manager node gives 405 when try to access /devicemgt
+
+ - [IOTS-370] - Move adapter configs as global configs
+
+ - [IOTS-374] - Updating font wso2 to newest version
+
+ - [IOTS-379] - Modal markup fixes
+
+ - [IOTS-382] - Windows 10 Reboot operation support
+
+ - [IOTS-383] - Modal opening for multiple times
+
+ - [IOTS-390] - Missing action buttons on details views
+
+ - [IOTS-392] - Inconsistent notification pane messege
+
+ - [IOTS-394] - Data table selection issue
+
+ - [IOTS-397] - Advance Search for devices view
+
+ - [IOTS-171] - Register User Form: username message
+
+ - [IOTS-187] - The UI for Role creation should have an option for the user to tick if he wants to have the group name prefix added
+
+ - [IOTS-271] - Viewing Group Details
+
+ - [IOTS-273] - about.html is for UES
+
+ - [IOTS-283] - Distributed Setup - mqtt profile - Class not found error
+
+ - [IOTS-306] - Refactoring permission to scope mapping
+
+ - [IOTS-348] - OOTB H2 needs to be shared with DAS and Core
+
+ - [IOTS-351] - Windows 10 Device Location support
+
+ - [IOTS-352] - CDMF Android agent must use the new gateway DCR endpoints
+
+ - [IOTS-362] - UI configurations need to refactor
+
+ - [IOTS-368] - Federated login page should be compatible with Windows 10 Laptop
+
+ - [IOTS-334] - Add three buttons to improve device enrollment screens
+
+ - [IOTS-336] - The UI to download the Android Agent uses the old EMM UI
+
+ - [IOTS-338] - Windows 10 MDM support
+
+ - [IOTS-341] - Re-word message when selecting roles for group sharing
+
+ - [IOTS-342] - Re-word the message for adding users to the role when sharing a group with users
+
-
+
+
+ Sub-task
+
+
+ - [IOTS-354] - Test Android with Gateway
+
+ - [IOTS-355] - Test Windows with Gateway
+
+ - [IOTS-359] - Re-Enable Integration tests for the new IOT pack.
+
+ - [IOTS-360] - Modify the existing tests and make them working for the current IOT pack.
+
+
\ No newline at end of file