diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml
deleted file mode 100644
index 876b4edb7c..0000000000
--- a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <context:property-placeholder/>
-    <context:annotation-config/>
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-    <bean class="org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer"/>
-    <jaxrs:server id="services" address="/">
-        <jaxrs:serviceBeans>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.ClaimsApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.RecoverPasswordApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.RecoverUsernameApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.SetPasswordApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.ValidateCodeApi"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.CaptchaApi"/>
-        </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.filter.ResponseValidationFilter" />
-            <bean class="org.wso2.carbon.identity.recovery.endpoint.Exceptions.RecoveryEndpointExceptionMapper"/>
-        </jaxrs:providers>
-    </jaxrs:server>
-</beans>
diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml
index b59b40c6b2..81508c0d5a 100644
--- a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml
+++ b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,6 @@
     <display-name>WSO2 Identity Server Recovery REST API</display-name>
     <description>WSO2 Identity Server Recovery REST API</description>
 
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/beans.xml</param-value>
-    </context-param>
-
     <filter>
         <filter-name>CaptchaFilter</filter-name>
         <filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>
@@ -63,18 +58,36 @@
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
 
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
     <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.carbon.identity.recovery.endpoint.ClaimsApi,
+                org.wso2.carbon.identity.recovery.endpoint.RecoverPasswordApi,
+                org.wso2.carbon.identity.recovery.endpoint.RecoverUsernameApi,
+                org.wso2.carbon.identity.recovery.endpoint.SetPasswordApi,
+                org.wso2.carbon.identity.recovery.endpoint.ValidateCodeApi,
+                org.wso2.carbon.identity.recovery.endpoint.CaptchaApi
+            </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,
+                org.wso2.carbon.identity.recovery.endpoint.filter.ResponseValidationFilter,
+                org.wso2.carbon.identity.recovery.endpoint.Exceptions.RecoveryEndpointExceptionMapper
+            </param-value>
+        </init-param>
     </servlet>
 
     <servlet-mapping>
diff --git a/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/beans.xml b/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/beans.xml
deleted file mode 100644
index 961a8b0f18..0000000000
--- a/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-    <import resource="classpath:META-INF/cxf/cxf.xml"/>
-    <context:property-placeholder/>
-    <context:annotation-config/>
-    <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"/>
-    <bean class="org.springframework.beans.factory.config.PreferencesPlaceholderConfigurer"/>
-    <jaxrs:server id="services" address="/">
-        <jaxrs:serviceBeans>
-            <bean class="org.wso2.carbon.identity.user.endpoint.IntrospectCodeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.LiteApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.MeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.PiInfoApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.ResendCodeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.UpdateUsernameApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.ValidateCodeApi"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.ValidateUsernameApi"/>
-            
-        </jaxrs:serviceBeans>
-        <jaxrs:providers>
-            <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/>
-            <bean class="org.wso2.carbon.identity.user.endpoint.exceptions.UserEndpointExceptionMapper"/>
-        </jaxrs:providers>
-    </jaxrs:server>
-</beans>
\ No newline at end of file
diff --git a/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml b/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml
index 4b03219e0a..5fa322b287 100644
--- a/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml
+++ b/components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,6 @@
     <display-name>WSO2 Identity Server User REST API</display-name>
     <description>WSO2 Identity Server User REST API</description>
 
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/beans.xml</param-value>
-    </context-param>
-
     <filter>
         <filter-name>CaptchaFilter</filter-name>
         <filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>
@@ -63,18 +58,37 @@
         <dispatcher>FORWARD</dispatcher>
     </filter-mapping>
 
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
     <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.carbon.identity.user.endpoint.IntrospectCodeApi,
+                org.wso2.carbon.identity.user.endpoint.LiteApi,
+                org.wso2.carbon.identity.user.endpoint.MeApi,
+                org.wso2.carbon.identity.user.endpoint.PiInfoApi,
+                org.wso2.carbon.identity.user.endpoint.ResendCodeApi,
+                org.wso2.carbon.identity.user.endpoint.UpdateUsernameApi,
+                org.wso2.carbon.identity.user.endpoint.ValidateCodeApi,
+                org.wso2.carbon.identity.user.endpoint.ValidateUsernameApi
+            </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,
+                org.wso2.carbon.identity.user.endpoint.exceptions.UserEndpointExceptionMapper
+            </param-value>
+        </init-param>
     </servlet>
 
     <servlet-mapping>
@@ -82,11 +96,6 @@
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
 
-    <!--<filter>-->
-    <!--<filter-name>CaptchaFilter</filter-name>-->
-    <!--<filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>-->
-    <!--</filter>-->
-
     <filter-mapping>
         <filter-name>CaptchaFilter</filter-name>
         <url-pattern>/resend-code</url-pattern>