diff --git a/modules/distribution/src/analytics/conf/carbon.xml b/modules/distribution/src/analytics/conf/carbon.xml
index a23e7ff3..e393bf21 100644
--- a/modules/distribution/src/analytics/conf/carbon.xml
+++ b/modules/distribution/src/analytics/conf/carbon.xml
@@ -28,7 +28,7 @@
     <!--
        Product Name
     -->
-    <Name>${product.name}</Name>
+    <Name>Entgra IoT Analytics</Name>
 
     <!--
        machine readable unique key to identify each product
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index ea56eaca..e520f23c 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -18,8 +18,8 @@
 
 product.name=Entgra IoT Server
 product.key=IoT
-product.version=3.4.0
-product.doc.version=340
+product.version=3.6.0
+product.doc.version=360
 
 carbon.version=4.4.26
 default.server.role=IoTServer
diff --git a/modules/distribution/src/broker/conf/carbon.xml b/modules/distribution/src/broker/conf/carbon.xml
index 8e0549d3..46172d2c 100755
--- a/modules/distribution/src/broker/conf/carbon.xml
+++ b/modules/distribution/src/broker/conf/carbon.xml
@@ -26,17 +26,17 @@
     <!--
        Product Name
     -->
-    <Name>WSO2 Message Broker</Name>
+    <Name>Entgra IoT Message Broker</Name>
 
     <!--
        machine readable unique key to identify each product
     -->
-    <ServerKey>MB</ServerKey>
+    <ServerKey>${product.key}</ServerKey>
 
     <!--
        Product Version
     -->
-    <Version>3.4.0</Version>
+    <Version>${product.version}</Version>
 
     <!--
        Host name or IP address of the machine hosting this server