diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/WEB-INF/web.xml
index a3bf334047c..db708d84b9e 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/webapp/WEB-INF/web.xml
@@ -37,7 +37,7 @@
     </session-config>
     <context-param>
         <param-name>doAuthentication</param-name>
-        <param-value>true</param-value>
+        <param-value>false</param-value>
     </context-param>
 
     <!--publish to apim-->
@@ -55,8 +55,20 @@
     </context-param>
 
     <filter>
-        <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.device.application.mgt.api.util.ApiOriginFilter</filter-class>
+        <filter-name>CorsFilter</filter-name>
+        <filter-class>org.apache.catalina.filters.CorsFilter</filter-class>
+        <init-param>
+            <param-name>cors.allowed.origins</param-name>
+            <param-value>*</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.allowed.methods</param-name>
+            <param-value>GET,POST,DELETE,PUT</param-value>
+        </init-param>
+        <init-param>
+            <param-name>cors.allowed.headers</param-name>
+            <param-value>Content-Type</param-value>
+        </init-param>
     </filter>
 
     <filter>
@@ -96,7 +108,7 @@
     </filter-mapping>
 
     <filter-mapping>
-        <filter-name>ApiOriginFilter</filter-name>
+        <filter-name>CorsFilter</filter-name>
         <url-pattern>/*</url-pattern>
     </filter-mapping>