diff --git a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/webapp/WEB-INF/web.xml b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/webapp/WEB-INF/web.xml
index 3b97a83bbcb..aafbcec0e0a 100644
--- a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/src/main/webapp/WEB-INF/web.xml
@@ -49,8 +49,7 @@
         <param-name>nonSecuredEndPoints</param-name>
         <param-value>
             /api/device-mgt-config/v1.0/configurations,
-            /api/device-mgt-config/v1.0/configurations/ui-config,
-            /api/device-mgt-config/v1.0/tenant
+            /api/device-mgt-config/v1.0/configurations/ui-config
         </param-value>
     </context-param>
 
@@ -125,4 +124,4 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/OTPInvokerHandler.java b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/OTPInvokerHandler.java
index 1378f5af4c6..624814f327d 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/OTPInvokerHandler.java
+++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/OTPInvokerHandler.java
@@ -53,7 +53,7 @@ import java.util.Enumeration;
 import java.util.List;
 
 @WebServlet(
-        name = "RequestHandlerServlet",
+        name = "OTPRequestHandlerServlet",
         description = "This servlet intercepts the otp-api requests initiated from the user interface and validate "
                 + "before forwarding to the backend",
         urlPatterns = {