diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
index 5401c99d7d..0bd2486331 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml
@@ -96,15 +96,15 @@
         <PublishDeviceInfoResponse>false</PublishDeviceInfoResponse>
         <PublishOperationResponse>
             <isEnabled>false</isEnabled>
-            <operations>
+            <Operations>
                 <!-- Publish specific operation responses -->
                 <!--
-                    <operation>BATTERY_LEVEL</operation>
-                    <operation>CHECK_LOCK_STATUS</operation>
+                    <Operation>BATTERY_LEVEL</Operation>
+                    <Operation>CHECK_LOCK_STATUS</Operation>
                 -->
                 <!-- use wildcard '*' to publish all responses -->
-                <operation>*</operation>
-            </operations>
+                <Operation>*</Operation>
+            </Operations>
         </PublishOperationResponse>
     </OperationAnalyticsConfiguration>
     <DefaultGroupsConfiguration>BYOD,COPE</DefaultGroupsConfiguration>
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
index fa6e580215..32e200f6d1 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml
@@ -126,15 +126,15 @@
         <PublishDeviceInfoResponse>false</PublishDeviceInfoResponse>
         <PublishOperationResponse>
             <isEnabled>false</isEnabled>
-            <operations>
+            <Operations>
                 <!-- Publish specific operation responses -->
                 <!--
-                    <operation>BATTERY_LEVEL</operation>
-                    <operation>CHECK_LOCK_STATUS</operation>
+                    <Operation>BATTERY_LEVEL</Operation>
+                    <Operation>CHECK_LOCK_STATUS</Operation>
                 -->
                 <!-- use wildcard '*' to publish all responses -->
-                <operation>*</operation>
-            </operations>
+                <Operation>*</Operation>
+            </Operations>
         </PublishOperationResponse>
     </OperationAnalyticsConfiguration>
     <!--This configuration used to configure the options for remote device control feature -->