diff --git a/iot-core/pom.xml b/iot-core/pom.xml
index 4027ab8..05a5124 100644
--- a/iot-core/pom.xml
+++ b/iot-core/pom.xml
@@ -257,6 +257,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.keymgt.extension.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
@@ -283,6 +286,15 @@
                                 </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
+                                <!-- Grafana Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.analytics.mgt.grafana.proxy.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.analytics.mgt.grafana.proxy.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of Grafana Management Features -->
+
                                 <!-- SMS Management Features -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:io.entgra.transport.mgt.sms.handler.server.feature:${carbon.device.mgt.version}
@@ -337,6 +349,17 @@
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
 
+                                <!--Grafana Management Features-->
+                                <feature>
+                                    <id>io.entgra.analytics.mgt.grafana.proxy.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>io.entgra.analytics.mgt.grafana.proxy.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!--End of Grafana Management Features-->
+
                                 <!--App Manager Features-->
                                 <feature>
                                     <id>io.entgra.application.mgt.api.feature.group</id>
@@ -374,6 +397,10 @@
                                     <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.keymgt.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
 
                                 <!--Certificate Mgt Features-->
                                 <feature>
diff --git a/iot-core/src/assembly/bin.xml b/iot-core/src/assembly/bin.xml
index e2f6ca8..387dc92 100644
--- a/iot-core/src/assembly/bin.xml
+++ b/iot-core/src/assembly/bin.xml
@@ -96,6 +96,10 @@
             <source>src/core/keystores/wso2carbon.jks</source>
             <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>
         </file>
+        <file>
+            <source>src/core/keystores/client-truststore.jks</source>
+            <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>
+        </file>
     </files>
 
     <dependencySets>
diff --git a/iot-core/src/core/keystores/client-truststore.jks b/iot-core/src/core/keystores/client-truststore.jks
new file mode 100644
index 0000000..71adf40
Binary files /dev/null and b/iot-core/src/core/keystores/client-truststore.jks differ
diff --git a/pom.xml b/pom.xml
index 81f9518..24a6301 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
         <entgra-emm-community>entgra-emm-community-${project.version}</entgra-emm-community>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>5.0.20-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>5.0.21-SNAPSHOT</carbon.device.mgt.version>
 
         <carbon.p2.plugin.version>5.1.2</carbon.p2.plugin.version>