diff --git a/modules/distribution/src/api-resources/api_templates/default_api_template.xml b/modules/distribution/src/api-resources/api_templates/default_api_template.xml
index e69e8ade..85b78243 100644
--- a/modules/distribution/src/api-resources/api_templates/default_api_template.xml
+++ b/modules/distribution/src/api-resources/api_templates/default_api_template.xml
@@ -1,6 +1,6 @@
 <api xmlns="http://ws.apache.org/ns/synapse"  name="$!apiName" context="$!apiContext" transports="$!transport">
-   <resource methods="POST PATCH GET DELETE HEAD PUT"
-             uri-template="/*"
+   <resource methods="POST PATCH GET DELETE HEAD PUT OPTIONS"
+             url-mapping="/*"
              faultSequence="fault">
 	<inSequence>
 		<property name="isDefault" expression="$trp:WSO2_AM_API_DEFAULT_VERSION"/>
diff --git a/modules/distribution/src/repository/conf/cdm-config.xml b/modules/distribution/src/repository/conf/cdm-config.xml
index 85998819..bd22a4b0 100644
--- a/modules/distribution/src/repository/conf/cdm-config.xml
+++ b/modules/distribution/src/repository/conf/cdm-config.xml
@@ -36,7 +36,7 @@
     </IdentityConfiguration>
     <PolicyConfiguration>
         <MonitoringClass>org.wso2.carbon.policy.mgt</MonitoringClass>
-        <MonitoringEnable>true</MonitoringEnable>
+        <MonitoringEnable>false</MonitoringEnable>
         <MonitoringFrequency>60000</MonitoringFrequency>
         <MaxRetries>5</MaxRetries>
         <MinRetriesToMarkUnreachable>8</MinRetriesToMarkUnreachable>