diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 06521170..fa2f8f90 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -894,10 +894,12 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!--cdm config file-->
+        <!-- Copying product specific cdm-config.xml for enabling custom PushNotificationProviders such as
+        XMPP, MQTT which are disabled by default.
+        -->
         <file>
             <source>
-                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml
+                src/repository/conf/cdm-config.xml
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
             <filtered>true</filtered>
diff --git a/modules/distribution/src/repository/conf/cdm-config.xml b/modules/distribution/src/repository/conf/cdm-config.xml
index 4ac277e3..1e833eef 100644
--- a/modules/distribution/src/repository/conf/cdm-config.xml
+++ b/modules/distribution/src/repository/conf/cdm-config.xml
@@ -18,44 +18,54 @@
   -->
 
 <DeviceMgtConfiguration>
-	<ManagementRepository>
-		<DataSourceConfiguration>
-			<JndiLookupDefinition>
-				<Name>jdbc/DM_DS</Name>
-			</JndiLookupDefinition>
-		</DataSourceConfiguration>
-	</ManagementRepository>
-	<IdentityConfiguration>
-		<ServerUrl>https://localhost:9443</ServerUrl>
-		<AdminUsername>admin</AdminUsername>
-		<AdminPassword>admin</AdminPassword>
-	</IdentityConfiguration>
-	<PolicyConfiguration>
-		<MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
-		<MonitoringEnable>false</MonitoringEnable>
-		<MonitoringFrequency>60000</MonitoringFrequency>
-		<MaxRetries>5</MaxRetries>
-		<MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
-		<MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
-	</PolicyConfiguration>
-	<TaskConfiguration>
-		<Enable>false</Enable>
-		<Frequency>600000</Frequency>
-		<TaskClass>org.wso2.carbon.device.mgt.core.task.impl.DeviceDetailsRetrieverTask</TaskClass>
-		<Operations>
-			<Operation>
-				<Name>DEVICE_INFO</Name>
-				<RecurrentTimes>1</RecurrentTimes>
-			</Operation>
-			<Operation>
-				<Name>APPLICATION_LIST</Name>
-				<RecurrentTimes>5</RecurrentTimes>
-			</Operation>
-			<Operation>
-				<Name>DEVICE_LOCATION</Name>
-				<RecurrentTimes>1</RecurrentTimes>
-			</Operation>
-		</Operations>
-	</TaskConfiguration>
-</DeviceMgtConfiguration>
-
+    <ManagementRepository>
+        <DataSourceConfiguration>
+            <JndiLookupDefinition>
+                <Name>jdbc/DM_DS</Name>
+            </JndiLookupDefinition>
+        </DataSourceConfiguration>
+    </ManagementRepository>
+    <PushNotificationProviders>
+        <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
+        <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
+    </PushNotificationProviders>
+    <IdentityConfiguration>
+        <ServerUrl>https://localhost:9443</ServerUrl>
+        <AdminUsername>admin</AdminUsername>
+        <AdminPassword>admin</AdminPassword>
+    </IdentityConfiguration>
+    <PolicyConfiguration>
+        <MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
+        <MonitoringEnable>true</MonitoringEnable>
+        <MonitoringFrequency>60000</MonitoringFrequency>
+        <MaxRetries>5</MaxRetries>
+        <MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>
+        <MinRetriesToMarkInactive>20</MinRetriesToMarkInactive>
+    </PolicyConfiguration>
+    <TaskConfiguration>
+        <Enable>true</Enable>
+        <Frequency>600000</Frequency>
+        <TaskClass>org.wso2.carbon.device.mgt.core.task.impl.DeviceDetailsRetrieverTask</TaskClass>
+        <Operations>
+            <Operation>
+                <Name>DEVICE_INFO</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>APPLICATION_LIST</Name>
+                <RecurrentTimes>5</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>DEVICE_LOCATION</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+        </Operations>
+    </TaskConfiguration>
+    <!-- Default Page size configuration for paginated DM APIs-->
+    <PaginationConfiguration>
+        <DeviceListPageSize>20</DeviceListPageSize>
+        <NotificationListPageSize>20</NotificationListPageSize>
+        <ActivityListPageSize>20</ActivityListPageSize>
+        <OperationListPageSize>20</OperationListPageSize>
+    </PaginationConfiguration>
+</DeviceMgtConfiguration>
\ No newline at end of file