diff --git a/components/org.wso2.openbanking.cds.demo.backend/src/main/webapp/WEB-INF/web.xml b/components/org.wso2.openbanking.cds.demo.backend/src/main/webapp/WEB-INF/web.xml
index 6923ea26..b7d1d6be 100644
--- a/components/org.wso2.openbanking.cds.demo.backend/src/main/webapp/WEB-INF/web.xml
+++ b/components/org.wso2.openbanking.cds.demo.backend/src/main/webapp/WEB-INF/web.xml
@@ -28,7 +28,7 @@
         <display-name>JAX-WS/JAX-RS Servlet</display-name>
         <description>JAX-WS/JAX-RS Endpoint</description>
         <servlet-class>
-            org.apache.cxf.transport.servlet.CXFServlet
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
         </servlet-class>
         <init-param>
             <param-name>service-list-stylesheet</param-name>
@@ -39,6 +39,28 @@
             <param-value>org.glassfish.jersey.media.multipart.MultiPartFeature</param-value>
         </init-param>
 
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.openbanking.cds.demo.backend.services.BankingService,
+                org.wso2.openbanking.cds.demo.backend.services.CommonService,
+                org.wso2.openbanking.cds.demo.backend.services.DiscoveryService,
+                org.wso2.openbanking.cds.demo.backend.services.CustomerDetailsService,
+                org.wso2.openbanking.cds.demo.backend.services.BankAccountService
+            </param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>jaxrs.address</param-name>
+            <param-value>
+                /banking,
+                /common,
+                /discovery,
+                /customerdetails,
+                /bankaccounts
+            </param-value>
+        </init-param>
+
         <load-on-startup>1</load-on-startup>
     </servlet>
 
diff --git a/internal-apis/internal-webapps/org.wso2.openbanking.cds.metrics.endpoint/src/main/webapp/WEB-INF/web.xml b/internal-apis/internal-webapps/org.wso2.openbanking.cds.metrics.endpoint/src/main/webapp/WEB-INF/web.xml
index 7e6a5c63..20dc82ab 100644
--- a/internal-apis/internal-webapps/org.wso2.openbanking.cds.metrics.endpoint/src/main/webapp/WEB-INF/web.xml
+++ b/internal-apis/internal-webapps/org.wso2.openbanking.cds.metrics.endpoint/src/main/webapp/WEB-INF/web.xml
@@ -53,9 +53,28 @@
     <servlet>
         <servlet-name>CXFServlet</servlet-name>
         <servlet-class>
-            org.apache.cxf.transport.servlet.CXFServlet
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
         </servlet-class>
         <load-on-startup>1</load-on-startup>
+
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.openbanking.cds.metrics.endpoint.impl.MetricsApiImpl
+            </param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>jaxrs.address</param-name>
+            <param-value>/</param-value>
+        </init-param>
+
+        <init-param>
+            <param-name>jaxrs.providers</param-name>
+            <param-value>
+                com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider
+            </param-value>
+        </init-param>
     </servlet>
 
     <servlet-mapping>