diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
index 99d5473b46..6f468399dc 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml
@@ -66,5 +66,8 @@
         <ActivityListPageSize>20</ActivityListPageSize>
         <OperationListPageSize>20</OperationListPageSize>
     </PaginationConfiguration>
+    <GeoLocationConfiguration>
+        <PublishLocationOperationResponse>true</PublishLocationOperationResponse>
+    </GeoLocationConfiguration>
 </DeviceMgtConfiguration>
 
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
index 5675919164..797a60556b 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
@@ -5,4 +5,5 @@ org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../featur
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/email-templates);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/streams,target:${installFolder}/../../../repository/resources/devicetypes/analytics/streams,overwrite:true);\
\ No newline at end of file
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/artifact.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/artifact.xml
new file mode 100644
index 0000000000..074706d62d
--- /dev/null
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/artifact.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+  ~ 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.
+  -->
+
+<artifact name="org.wso2.iot.LocationStream" version="1.0.0" type="event/stream" serverRole="GeoDashboard">
+    <file>org.wso2.iot.LocationStream-1.0.0.json</file>
+</artifact>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/org.wso2.iot.LocationStream-1.0.0.json b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/org.wso2.iot.LocationStream-1.0.0.json
new file mode 100644
index 0000000000..d275099901
--- /dev/null
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/streams/org.wso2.iot.LocationStream_1.0.0/org.wso2.iot.LocationStream-1.0.0.json
@@ -0,0 +1,30 @@
+{
+    "name": "org.wso2.iot.LocationStream",
+    "version": "1.0.0",
+    "nickName": "",
+    "description": "IoT Server Location Stream",
+    "metaData": [
+        {
+            "name": "deviceId",
+            "type": "STRING"
+        },
+        {
+            "name": "deviceType",
+            "type": "STRING"
+        }
+    ],
+    "payloadData": [
+        {
+            "name": "timeStamp",
+            "type": "LONG"
+        },
+        {
+            "name": "latitude",
+            "type": "DOUBLE"
+        },
+        {
+            "name": "longitude",
+            "type": "DOUBLE"
+        }
+    ]
+}
\ No newline at end of file