diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
index 6b11a6f42e..345f7fa7c2 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -31,11 +31,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/ApplicationManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/ApplicationManagementServiceHolder.java
index a0fbc6486d..da34ee99ea 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/ApplicationManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/ApplicationManagementServiceHolder.java
@@ -1,20 +1,26 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.wso2.carbon.identity.api.server.application.management.common;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
 import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
 import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
@@ -32,166 +38,213 @@
  */
 public class ApplicationManagementServiceHolder {
 
-    private static ApplicationManagementService applicationManagementService;
-    private static OAuthAdminServiceImpl oauthAdminService;
-    private static STSAdminServiceInterface stsAdminService;
-    private static SAMLSSOConfigServiceImpl samlssoConfigService;
-    private static OAuthServerConfiguration oAuthServerConfiguration;
-    private static TemplateManager templateManager;
-    private static CORSManagementService corsManagementService;
-    private static RealmService realmService;
-    private static APIResourceManager apiResourceManager;
-    private static AuthorizedAPIManagementService authorizedAPIManagementService;
-    private static OrgApplicationManager orgApplicationManager;
+    private ApplicationManagementServiceHolder() {
 
-    public static ApplicationManagementService getApplicationManagementService() {
+    }
+
+    private static class ApplicationServiceHolder {
 
-        return applicationManagementService;
+        static final ApplicationManagementService SERVICE = (ApplicationManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(ApplicationManagementService.class, null);
     }
 
-    public static void setApplicationManagementService(ApplicationManagementService applicationManagementService) {
+    private static class OAuthAdminServiceImplHolder {
 
-        ApplicationManagementServiceHolder.applicationManagementService = applicationManagementService;
+        static final OAuthAdminServiceImpl SERVICE = (OAuthAdminServiceImpl) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OAuthAdminServiceImpl.class, null);
     }
 
-    public static OAuthAdminServiceImpl getOAuthAdminService() {
+    private static class STSAdminServiceInterfaceHolder {
+
+        private static final Log log = LogFactory.getLog(STSAdminServiceInterfaceHolder.class);
+        static final STSAdminServiceInterface SERVICE = initializeService();
+
+        /**
+         * Initializes the STSAdminServiceInterface from the OSGi context.
+         *
+         * @return STSAdminServiceInterface or null if the service is unavailable.
+         */
+        private static STSAdminServiceInterface initializeService() {
 
-        return oauthAdminService;
+            try {
+                STSAdminServiceInterface service = (STSAdminServiceInterface) PrivilegedCarbonContext
+                        .getThreadLocalCarbonContext().getOSGiService(STSAdminServiceInterface.class, null);
+
+                if (service == null) {
+                    // Log a warning if the service is not available, but don't throw an exception
+                    log.warn("STSAdminServiceInterface is not available from OSGi context. This may occur if " +
+                            "the STS connector is not present.");
+                }
+                return service;
+
+            } catch (NullPointerException e) {
+                // Catch NullPointerException if the context or the service isn't properly set
+                log.warn("NullPointerException occurred while retrieving STSAdminServiceInterface. " +
+                        "Context or service might not be available.");
+                return null;
+            } catch (Exception e) {
+                // Catch any other exceptions and log them
+                log.error("Error occurred while retrieving STSAdminServiceInterface: " + e.getMessage(), e);
+                return null;
+            }
+        }
     }
 
-    public static void setOauthAdminService(OAuthAdminServiceImpl oauthAdminService) {
+    private static class SAMLSSOConfigServiceImplHolder {
 
-        ApplicationManagementServiceHolder.oauthAdminService = oauthAdminService;
+        static final SAMLSSOConfigServiceImpl SERVICE = (SAMLSSOConfigServiceImpl) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(SAMLSSOConfigServiceImpl.class, null);
     }
 
-    public static STSAdminServiceInterface getStsAdminService() {
+    private static class OAuthServerConfigurationHolder {
 
-        return stsAdminService;
+        static final OAuthServerConfiguration SERVICE = (OAuthServerConfiguration) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OAuthServerConfiguration.class, null);
     }
 
-    public static void setStsAdminService(STSAdminServiceInterface stsAdminService) {
+    private static class TemplateManagerHolder {
 
-        ApplicationManagementServiceHolder.stsAdminService = stsAdminService;
+        static final TemplateManager SERVICE = (TemplateManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(TemplateManager.class, null);
     }
 
-    public static SAMLSSOConfigServiceImpl getSamlssoConfigService() {
+    private static class CORSManagementServiceHolder {
 
-        return samlssoConfigService;
+        static final CORSManagementService SERVICE = (CORSManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(CORSManagementService.class, null);
     }
 
-    public static void setSamlssoConfigService(SAMLSSOConfigServiceImpl samlssoConfigService) {
+    private static class RealmServiceHolder {
 
-        ApplicationManagementServiceHolder.samlssoConfigService = samlssoConfigService;
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);
     }
 
-    public static OAuthServerConfiguration getoAuthServerConfiguration() {
+    private static class APIResourceManagerHolder {
 
-        return oAuthServerConfiguration;
+        static final APIResourceManager SERVICE = (APIResourceManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
     }
 
-    public static void setoAuthServerConfiguration(OAuthServerConfiguration oAuthServerConfiguration) {
+    private static class AuthorizedAPIManagementServiceHolder {
 
-        ApplicationManagementServiceHolder.oAuthServerConfiguration = oAuthServerConfiguration;
+        static final AuthorizedAPIManagementService SERVICE = (AuthorizedAPIManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(AuthorizedAPIManagementService.class, null);
     }
 
-    public static TemplateManager getTemplateManager() {
+    private static class OrgApplicationManagerHolder {
 
-        return templateManager;
+        static final OrgApplicationManager SERVICE = (OrgApplicationManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OrgApplicationManager.class, null);
     }
 
-    public static void setTemplateManager(TemplateManager templateManager) {
+    /**
+     * Get ApplicationManagementService.
+     *
+     * @return ApplicationManagementService.
+     */
+    public static ApplicationManagementService getApplicationManagementService() {
 
-        ApplicationManagementServiceHolder.templateManager = templateManager;
+        return ApplicationServiceHolder.SERVICE;
     }
 
-    public static CORSManagementService getCorsManagementService() {
+    /**
+     * Get OAuthAdminServiceImpl.
+     *
+     * @return OAuthAdminServiceImpl.
+     */
+    public static OAuthAdminServiceImpl getOAuthAdminService() {
 
-        return corsManagementService;
+        return OAuthAdminServiceImplHolder.SERVICE;
     }
 
-    public static void setCorsManagementService(CORSManagementService corsManagementService) {
+    /**
+     * Get STSAdminServiceInterface.
+     *
+     * @return STSAdminServiceInterface.
+     */
+    public static STSAdminServiceInterface getStsAdminService() {
 
-        ApplicationManagementServiceHolder.corsManagementService = corsManagementService;
+        return STSAdminServiceInterfaceHolder.SERVICE;
     }
 
     /**
-     * Get RealmService.
+     * Get SAMLSSOConfigServiceImpl.
      *
-     * @return RealmService.
+     * @return SAMLSSOConfigServiceImpl.
      */
-    public static RealmService getRealmService() {
+    public static SAMLSSOConfigServiceImpl getSamlssoConfigService() {
 
-        return realmService;
+        return SAMLSSOConfigServiceImplHolder.SERVICE;
     }
 
     /**
-     * Set RealmService.
+     * Get OAuthServerConfiguration.
      *
-     * @param realmService RealmService.
+     * @return OAuthServerConfiguration.
      */
-    public static void setRealmService(RealmService realmService) {
+    public static OAuthServerConfiguration getoAuthServerConfiguration() {
 
-        ApplicationManagementServiceHolder.realmService = realmService;
+        return OAuthServerConfigurationHolder.SERVICE;
     }
 
     /**
-     * Get APIResourceManager.
+     * Get TemplateManager.
      *
-     * @return APIResourceManager.
+     * @return TemplateManager.
      */
-    public static APIResourceManager getApiResourceManager() {
+    public static TemplateManager getTemplateManager() {
 
-        return apiResourceManager;
+        return TemplateManagerHolder.SERVICE;
     }
 
     /**
-     * Set APIResourceManager.
+     * Get CORSManagementService.
      *
-     * @param apiResourceManager APIResourceManager.
+     * @return CORSManagementService.
      */
-    public static void setApiResourceManager(APIResourceManager apiResourceManager) {
+    public static CORSManagementService getCorsManagementService() {
 
-        ApplicationManagementServiceHolder.apiResourceManager = apiResourceManager;
+        return CORSManagementServiceHolder.SERVICE;
     }
 
     /**
-     * Get AuthorizedAPIManagementService.
+     * Get RealmService.
      *
-     * @return AuthorizedAPIManagementService.
+     * @return RealmService.
      */
-    public static AuthorizedAPIManagementService getAuthorizedAPIManagementService() {
+    public static RealmService getRealmService() {
 
-        return authorizedAPIManagementService;
+        return RealmServiceHolder.SERVICE;
     }
 
     /**
-     * Set AuthorizedAPIManagementService.
+     * Get APIResourceManager.
      *
-     * @param authorizedAPIManagementService AuthorizedAPIManagementService.
+     * @return APIResourceManager.
      */
-    public static void setAuthorizedAPIManagementService(AuthorizedAPIManagementService
-                                                                 authorizedAPIManagementService) {
+    public static APIResourceManager getApiResourceManager() {
 
-        ApplicationManagementServiceHolder.authorizedAPIManagementService = authorizedAPIManagementService;
+        return APIResourceManagerHolder.SERVICE;
     }
 
     /**
-     * Get OrgApplicationManager OSGi service.
+     * Get AuthorizedAPIManagementService.
      *
-     * @return OrgApplicationManager.
+     * @return AuthorizedAPIManagementService.
      */
-    public static OrgApplicationManager getOrgApplicationManager() {
+    public static AuthorizedAPIManagementService getAuthorizedAPIManagementService() {
 
-        return orgApplicationManager;
+        return AuthorizedAPIManagementServiceHolder.SERVICE;
     }
 
     /**
-     * Set OrgApplicationManager OSGi service.
+     * Get OrgApplicationManager OSGi service.
      *
-     * @param orgApplicationManager OrgApplicationManager.
+     * @return OrgApplicationManager.
      */
-    public static void setOrgApplicationManager(OrgApplicationManager orgApplicationManager) {
+    public static OrgApplicationManager getOrgApplicationManager() {
 
-        ApplicationManagementServiceHolder.orgApplicationManager = orgApplicationManager;
+        return OrgApplicationManagerHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/APIResourceMgtOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/APIResourceMgtOSGiServiceFactory.java
deleted file mode 100644
index d56aac2dfa..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/APIResourceMgtOSGiServiceFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
-
-/**
- * Factory class for APIResourceManagementOSGiService.
- */
-public class APIResourceMgtOSGiServiceFactory extends AbstractFactoryBean<APIResourceManager> {
-
-    private APIResourceManager apiResourceManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected APIResourceManager createInstance() throws Exception {
-
-        if (this.apiResourceManager == null) {
-            apiResourceManager = (APIResourceManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
-            if (apiResourceManager == null) {
-                throw new Exception("Unable to retrieve APIResourceManager service.");
-            }
-        }
-        return this.apiResourceManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/ApplicationManagementOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/ApplicationManagementOSGiServiceFactory.java
deleted file mode 100644
index a274fd4add..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/ApplicationManagementOSGiServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the ApplicationManagementService type of object inside the container.
- */
-public class ApplicationManagementOSGiServiceFactory extends AbstractFactoryBean<ApplicationManagementService> {
-
-    private ApplicationManagementService applicationManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-        return Object.class;
-    }
-
-    @Override
-    protected ApplicationManagementService createInstance() throws Exception {
-
-        if (this.applicationManagementService == null) {
-            ApplicationManagementService applicationManagementService =
-                    (ApplicationManagementService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(ApplicationManagementService.class, null);
-
-            if (applicationManagementService != null) {
-                this.applicationManagementService = applicationManagementService;
-            } else {
-                throw new Exception("Unable to retrieve ApplicationManagementService service.");
-            }
-        }
-        return this.applicationManagementService;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/AuthorizedAPIMgtOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/AuthorizedAPIMgtOSGiServiceFactory.java
deleted file mode 100644
index 3021870d79..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/AuthorizedAPIMgtOSGiServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the AuthorizedAPIManagementService type of object inside the container.
- */
-public class AuthorizedAPIMgtOSGiServiceFactory extends AbstractFactoryBean<AuthorizedAPIManagementService> {
-
-    private AuthorizedAPIManagementService authorizedAPIManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected AuthorizedAPIManagementService createInstance() throws Exception {
-
-        if (this.authorizedAPIManagementService == null) {
-            authorizedAPIManagementService = (AuthorizedAPIManagementService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(AuthorizedAPIManagementService.class, null);
-            if (authorizedAPIManagementService == null) {
-                throw new Exception("Unable to retrieve AuthorizedAPIManagement service.");
-            }
-        }
-        return this.authorizedAPIManagementService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/CORSMgtOGSiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/CORSMgtOGSiServiceFactory.java
deleted file mode 100644
index 9808fb05db..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/CORSMgtOGSiServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *                                                                         
- * Licensed under the Apache License, Version 2.0 (the "License");         
- * you may not use this file except in compliance with the License.        
- * You may obtain a copy of the License at                                 
- *                                                                         
- * http://www.apache.org/licenses/LICENSE-2.0                              
- *                                                                         
- * Unless required by applicable law or agreed to in writing, software     
- * distributed under the License is distributed on an "AS IS" BASIS,       
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and     
- * limitations under the License.
- */
-
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.cors.mgt.core.CORSManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the CORSManager type of object inside the container.
- */
-public class CORSMgtOGSiServiceFactory extends AbstractFactoryBean<CORSManagementService> {
-
-    private CORSManagementService corsManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected CORSManagementService createInstance() throws Exception {
-
-        if (this.corsManagementService == null) {
-            CORSManagementService taskOperationService = (CORSManagementService) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(CORSManagementService.class, null);
-
-            if (taskOperationService != null) {
-                this.corsManagementService = taskOperationService;
-            } else {
-                throw new Exception("Unable to retrieve corsManagementService service.");
-            }
-        }
-        return this.corsManagementService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/OAuthAdminOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/OAuthAdminOSGiServiceFactory.java
deleted file mode 100644
index 6f9da9fb10..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/OAuthAdminOSGiServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OAuthAdminServiceImpl type of object inside the container.
- */
-public class OAuthAdminOSGiServiceFactory extends AbstractFactoryBean<OAuthAdminServiceImpl> {
-
-    private OAuthAdminServiceImpl oauthAdminService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OAuthAdminServiceImpl createInstance() throws Exception {
-
-        if (this.oauthAdminService == null) {
-            OAuthAdminServiceImpl oauthAdminService =
-                    (OAuthAdminServiceImpl) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(OAuthAdminServiceImpl.class, null);
-
-            if (oauthAdminService != null) {
-                this.oauthAdminService = oauthAdminService;
-            } else {
-                throw new Exception("Unable to retrieve OAuthAdminServiceImpl service.");
-            }
-        }
-        return this.oauthAdminService;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/OrgApplicationManagerOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/OrgApplicationManagerOSGiServiceFactory.java
deleted file mode 100644
index 2a192080b3..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/OrgApplicationManagerOSGiServiceFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrgApplicationManager type of object inside the container.
- */
-public class OrgApplicationManagerOSGiServiceFactory extends AbstractFactoryBean<OrgApplicationManager> {
-
-    private OrgApplicationManager orgApplicationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OrgApplicationManager createInstance() throws Exception {
-
-        if (this.orgApplicationManager == null) {
-            orgApplicationManager = (OrgApplicationManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(OrgApplicationManager.class, null);
-            if (orgApplicationManager == null) {
-                throw new Exception("Unable to retrieve OrgApplicationManager service.");
-            }
-        }
-        return this.orgApplicationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index 7955323189..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com).
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService = (RealmService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService service.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/SAMLSSOConfigOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/SAMLSSOConfigOSGiServiceFactory.java
deleted file mode 100644
index 789e80fa30..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/SAMLSSOConfigOSGiServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.sso.saml.SAMLSSOConfigServiceImpl;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the SAMLSSOConfigService type of object inside the container.
- */
-public class SAMLSSOConfigOSGiServiceFactory extends AbstractFactoryBean<SAMLSSOConfigServiceImpl> {
-
-    private SAMLSSOConfigServiceImpl samlssoConfigService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected SAMLSSOConfigServiceImpl createInstance() throws Exception {
-
-        if (this.samlssoConfigService == null) {
-            SAMLSSOConfigServiceImpl samlssoConfigService =
-                    (SAMLSSOConfigServiceImpl) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(SAMLSSOConfigServiceImpl.class, null);
-
-            if (samlssoConfigService != null) {
-                this.samlssoConfigService = samlssoConfigService;
-            } else {
-                throw new Exception("Unable to retrieve SAMLSSOConfigService.");
-            }
-        }
-        return this.samlssoConfigService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/STSAdminOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/STSAdminOSGiServiceFactory.java
deleted file mode 100644
index edea5d485c..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/STSAdminOSGiServiceFactory.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.lang.Nullable;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.security.sts.service.STSAdminServiceInterface;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the STSAdminServiceImpl type of object inside the container.
- */
-public class STSAdminOSGiServiceFactory extends AbstractFactoryBean<STSAdminServiceInterface> {
-
-    private STSAdminServiceInterface stsAdminService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    @Nullable
-    protected STSAdminServiceInterface createInstance() throws Exception {
-
-        if (this.stsAdminService == null) {
-            /* Try catch statement is included due to a NullPointerException which occurs at the server
-               startup when the STS functionality is not available in the product. */
-            try {
-                STSAdminServiceInterface stsAdminService =
-                        (STSAdminServiceInterface) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                                .getOSGiService(STSAdminServiceInterface.class, null);
-
-                if (stsAdminService != null) {
-                    this.stsAdminService = stsAdminService;
-                } else {
-                    throw new Exception("Unable to retrieve STSAdminService.");
-                }
-            } catch (NullPointerException e) {
-                /* Catch block without implementation so that the STS Admin Service will be set to null
-                   in-turn helps in validating the rest API requests. */
-            }
-        }
-        return this.stsAdminService;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/TemplateManagementOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/TemplateManagementOSGiServiceFactory.java
deleted file mode 100644
index c2212d142b..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.common/src/main/java/org/wso2/carbon/identity/api/server/application/management/common/factory/TemplateManagementOSGiServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.application.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.template.mgt.TemplateManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the TemplateManager type of object inside the container.
- */
-public class TemplateManagementOSGiServiceFactory extends AbstractFactoryBean<TemplateManager> {
-
-    private TemplateManager templateManager;
-
-    @Override
-    public Class<?> getObjectType() {
-        return Object.class;
-    }
-
-    @Override
-    protected TemplateManager createInstance() throws Exception {
-
-        if (this.templateManager == null) {
-            TemplateManager templateManager =
-                    (TemplateManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(TemplateManager.class, null);
-
-            if (templateManager != null) {
-                this.templateManager = templateManager;
-            } else {
-                throw new Exception("Unable to retrieve TemplateManager service.");
-            }
-        }
-        return this.templateManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
index bbc978df8a..8e4fe88a3a 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -83,11 +83,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java
index f0cd6db86e..1cf4a14058 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/ApplicationsApi.java
@@ -19,7 +19,6 @@
 package org.wso2.carbon.identity.api.server.application.management.v1;
 
 import org.apache.cxf.jaxrs.ext.search.SearchContext;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
@@ -63,6 +62,7 @@
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
 import io.swagger.annotations.*;
+import org.wso2.carbon.identity.api.server.application.management.v1.factories.ApplicationsApiServiceFactory;
 
 import javax.validation.constraints.*;
 
@@ -71,8 +71,12 @@
 
 public class ApplicationsApi  {
 
-    @Autowired
-    private ApplicationsApiService delegate;
+    private final ApplicationsApiService delegate;
+
+    public ApplicationsApi() {
+
+        this.delegate = ApplicationsApiServiceFactory.getApplicationsApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ApplicationsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ApplicationsApiServiceFactory.java
index 2512b016aa..c9b318c647 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ApplicationsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ApplicationsApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.application.management.v1.ApplicationsApiService;
 import org.wso2.carbon.identity.api.server.application.management.v1.impl.ApplicationsApiServiceImpl;
 
+/**
+ * Factory class for ApplicationsApiService.
+ */
 public class ApplicationsApiServiceFactory {
 
-   private final static ApplicationsApiService service = new ApplicationsApiServiceImpl();
+   private final static ApplicationsApiService SERVICE = new ApplicationsApiServiceImpl();
 
+   /**
+    * Get ApplicationsApiService.
+    *
+    * @return ApplicationsApiService.
+    */
    public static ApplicationsApiService getApplicationsApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java
index 98b26b3272..cf03115278 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationManagementService.java
@@ -32,9 +32,6 @@
 import org.apache.cxf.jaxrs.ext.search.PrimitiveStatement;
 import org.apache.cxf.jaxrs.ext.search.SearchCondition;
 import org.apache.cxf.jaxrs.ext.search.SearchContext;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.MediaType;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceMgtException;
@@ -85,6 +82,7 @@
 import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.template.ApplicationTemplateApiModelToTemplate;
 import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.template.TemplateToApplicationTemplate;
 import org.wso2.carbon.identity.api.server.application.management.v1.core.functions.template.TemplateToApplicationTemplateListItem;
+import org.wso2.carbon.identity.api.server.application.management.v1.factories.ServerApplicationMetadataServiceFactory;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.common.Util;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
@@ -166,6 +164,9 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+
+import javax.activation.MimeType;
+import javax.activation.MimeTypeParseException;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
@@ -212,6 +213,21 @@
  */
 public class ServerApplicationManagementService {
 
+    private final ApplicationManagementService applicationManagementService;
+    private final AuthorizedAPIManagementService authorizedAPIManagementService;
+    private final TemplateManager templateManager;
+    private final ServerApplicationMetadataService applicationMetadataService;
+
+    public ServerApplicationManagementService(ApplicationManagementService applicationManagementService,
+                                              AuthorizedAPIManagementService authorizedAPIManagementService,
+                                              TemplateManager templateManager) {
+
+        this.applicationManagementService = applicationManagementService;
+        this.authorizedAPIManagementService = authorizedAPIManagementService;
+        this.templateManager = templateManager;
+        this.applicationMetadataService = ServerApplicationMetadataServiceFactory.getServerApplicationMetadataService();
+    }
+
     private static final Log log = LogFactory.getLog(ServerApplicationManagementService.class);
 
     // Allowed filter attributes mapped to real field names.
@@ -248,9 +264,6 @@ public class ServerApplicationManagementService {
         SUPPORTED_REQUIRED_ATTRIBUTES.add(IdentityApplicationConstants.ALLOWED_ROLE_AUDIENCE_REQUEST_ATTRIBUTE_NAME);
     }
 
-    @Autowired
-    private ServerApplicationMetadataService applicationMetadataService;
-
     public ApplicationListResponse getAllApplications(Integer limit, Integer offset, String filter, String sortOrder,
                                                       String sortBy, String requiredAttributes) {
 
@@ -276,11 +289,10 @@ public ApplicationListResponse getAllApplications(Integer limit, Integer offset,
 
         String username = ContextLoader.getUsernameFromContext();
         try {
-            int totalResults = getApplicationManagementService()
-                    .getCountOfApplications(tenantDomain, username, filter);
+            int totalResults = applicationManagementService.getCountOfApplications(tenantDomain, username, filter);
 
-            ApplicationBasicInfo[] filteredAppList = getApplicationManagementService()
-                    .getApplicationBasicInfo(tenantDomain, username, filter, offset, limit);
+            ApplicationBasicInfo[] filteredAppList = applicationManagementService.getApplicationBasicInfo(tenantDomain,
+                    username, filter, offset, limit);
             int resultsInCurrentPage = filteredAppList.length;
 
             List<String> requestedAttributeList = new ArrayList<>();
@@ -377,8 +389,8 @@ private List<ServiceProvider> getSpWithRequiredAttributes(ApplicationBasicInfo[]
 
         List<ServiceProvider> serviceProviderList = new ArrayList<>();
         for (ApplicationBasicInfo applicationBasicInfo : filteredAppList) {
-            ServiceProvider serviceProvider = getApplicationManagementService().
-                    getApplicationWithRequiredAttributes(applicationBasicInfo.getApplicationId(),
+            ServiceProvider serviceProvider = applicationManagementService
+                    .getApplicationWithRequiredAttributes(applicationBasicInfo.getApplicationId(),
                             requestedAttributeList);
             serviceProviderList.add(serviceProvider);
         }
@@ -427,7 +439,7 @@ public ArrayList<ConfiguredAuthenticatorsModal> getConfiguredAuthenticators(Stri
         String tenantDomain = ContextLoader.getTenantDomainFromContext();
         ArrayList<ConfiguredAuthenticatorsModal> response = new ArrayList<>();
         try {
-            AuthenticationStep[] authenticationSteps = getApplicationManagementService()
+            AuthenticationStep[] authenticationSteps = applicationManagementService
                     .getConfiguredAuthenticators(applicationId, tenantDomain);
 
             if (authenticationSteps == null) {
@@ -478,7 +490,7 @@ public String exportApplication(String applicationId, Boolean exportSecrets) {
 
         try {
             String tenantDomain = ContextLoader.getTenantDomainFromContext();
-            return getApplicationManagementService().exportSPApplicationFromAppID(
+            return applicationManagementService.exportSPApplicationFromAppID(
                     applicationId, exportSecrets, tenantDomain);
         } catch (IdentityApplicationManagementException e) {
             String msg = "Error exporting application with id: " + applicationId;
@@ -507,7 +519,7 @@ public TransferResource exportApplicationAsFile(String applicationId, Boolean ex
         ServiceProvider serviceProvider;
         try {
             String tenantDomain = ContextLoader.getTenantDomainFromContext();
-            serviceProvider = getApplicationManagementService().exportSPFromAppID(
+            serviceProvider = applicationManagementService.exportSPFromAppID(
                     applicationId, exportSecrets, tenantDomain);
         } catch (IdentityApplicationManagementException e) {
             String msg = "Error exporting application with id: " + applicationId;
@@ -548,11 +560,15 @@ private TransferResource generateFileFromModel(String fileType, ServiceProvider
                     + Arrays.toString(VALID_MEDIA_TYPES_YAML) + ", " + Arrays.toString(VALID_MEDIA_TYPES_JSON));
         }
 
-        return new TransferResource(
-                fileNameSB.toString(),
-                new ByteArrayResource(fileContent.getBytes(StandardCharsets.UTF_8)),
-                MediaType.APPLICATION_OCTET_STREAM
-        );
+        try {
+            return new TransferResource(
+                    fileNameSB.toString(),
+                    fileContent.getBytes(StandardCharsets.UTF_8),
+                    new MimeType("application/octet-stream")
+            );
+        } catch (MimeTypeParseException e) {
+            throw new RuntimeException("Failed to parse MIME type", e);
+        }
     }
 
     private String parseXmlFromServiceProvider(ServiceProvider serviceProvider) {
@@ -647,8 +663,8 @@ private String doImportApplication(InputStream fileInputStream, Attachment fileD
 
             ServiceProvider serviceProvider = parseSP(spFileContent, fileType, tenantDomain);
 
-            ImportResponse importResponse = getApplicationManagementService()
-                    .importSPApplication(serviceProvider, tenantDomain, username, isAppUpdate);
+            ImportResponse importResponse = applicationManagementService.importSPApplication(serviceProvider,
+                    tenantDomain, username, isAppUpdate);
 
             if (importResponse.getResponseCode() == ImportResponse.FAILED) {
                 throw handleErrorResponse(importResponse);
@@ -818,7 +834,7 @@ public String createApplication(ApplicationModel applicationModel, String templa
         String applicationId = null;
         try {
             ApplicationDTO applicationDTO = new ApiModelToServiceProvider().apply(applicationModel);
-            applicationId = getApplicationManagementService().createApplication(applicationDTO, tenantDomain, username);
+            applicationId = applicationManagementService.createApplication(applicationDTO, tenantDomain, username);
 
             // Update owner for B2B Self Service applications.
             if (applicationDTO.getServiceProvider().isB2BSelfServiceApp()) {
@@ -897,8 +913,8 @@ public void patchApplication(String applicationId, ApplicationPatchModel applica
             }
             String tenantDomain = ContextLoader.getTenantDomainFromContext();
             String username = ContextLoader.getUsernameFromContext();
-            getApplicationManagementService()
-                    .updateApplicationByResourceId(applicationId, appToUpdate, tenantDomain, username);
+            applicationManagementService.updateApplicationByResourceId(applicationId, appToUpdate,
+                    tenantDomain, username);
         } catch (IdentityApplicationManagementException e) {
             String msg = "Error patching application with id: " + applicationId;
             throw handleIdentityApplicationManagementException(e, msg);
@@ -942,7 +958,7 @@ public void deleteApplication(String applicationId) {
             }
 
             // Delete Application.
-            getApplicationManagementService().deleteApplicationByResourceId(applicationId, tenantDomain, username);
+            applicationManagementService.deleteApplicationByResourceId(applicationId, tenantDomain, username);
         } catch (IdentityApplicationManagementException e) {
             String msg = "Error deleting application with id: " + applicationId;
             throw handleIdentityApplicationManagementException(e, msg);
@@ -995,8 +1011,8 @@ public ResidentApplication updateResidentApplication(ProvisioningConfiguration p
 
     private ServiceProvider getResidentSp(String tenantDomain) throws IdentityApplicationManagementException {
 
-        ServiceProvider application =
-                getApplicationManagementService().getServiceProvider(ApplicationConstants.LOCAL_SP, tenantDomain);
+        ServiceProvider application = applicationManagementService.getServiceProvider(ApplicationConstants.LOCAL_SP,
+                tenantDomain);
         if (application == null) {
             throw Utils.buildServerError("Resident application cannot be found for tenantDomain: " + tenantDomain);
         }
@@ -1130,7 +1146,7 @@ public String createApplicationTemplate(ApplicationTemplateModel applicationTemp
         Template template = new ApplicationTemplateApiModelToTemplate().apply(applicationTemplateModel);
 
         try {
-            return getTemplateManager().addTemplate(template);
+            return templateManager.addTemplate(template);
         } catch (TemplateManagementException e) {
             throw handleTemplateManagementException(e, "Error while adding the new application template.");
         }
@@ -1148,7 +1164,7 @@ public ApplicationTemplatesList listApplicationTemplates(Integer limit, Integer
 
         validatePaginationSupport(limit, offset);
         try {
-            List<Template> templateList = getTemplateManager().listTemplates(TemplateMgtConstants.TemplateType
+            List<Template> templateList = templateManager.listTemplates(TemplateMgtConstants.TemplateType
                     .APPLICATION_TEMPLATE.toString(), null, null, getSearchCondition
                     (TemplateMgtConstants.TemplateType.APPLICATION_TEMPLATE.toString(), ContextLoader
                             .getTenantDomainFromContext(), searchContext));
@@ -1172,8 +1188,7 @@ public ApplicationTemplatesList listApplicationTemplates(Integer limit, Integer
      */
     private boolean isAllowUpdateSystemApplication(String appName, ApplicationPatchModel applicationPatchModel) {
 
-        Set<String> systemApplications =
-                ApplicationManagementServiceHolder.getApplicationManagementService().getSystemApplications();
+        Set<String> systemApplications = applicationManagementService.getSystemApplications();
         if (systemApplications == null || systemApplications.stream().noneMatch(appName::equalsIgnoreCase)) {
             return false;
         }
@@ -1336,7 +1351,7 @@ private Condition buildSearchCondition(SearchCondition searchCondition) {
     public ApplicationTemplateModel getApplicationTemplateById(String templateId) {
 
         try {
-            return new TemplateToApplicationTemplate().apply(getTemplateManager().getTemplateById(templateId));
+            return new TemplateToApplicationTemplate().apply(templateManager.getTemplateById(templateId));
         } catch (TemplateManagementException e) {
             if (TemplateMgtConstants.ErrorMessages.ERROR_CODE_TEMPLATE_NOT_FOUND.getCode().equals(e.getErrorCode())) {
                 throw handleTemplateNotFoundException(e);
@@ -1354,7 +1369,7 @@ public ApplicationTemplateModel getApplicationTemplateById(String templateId) {
     public void deleteApplicationTemplateById(String templateId) {
 
         try {
-            getTemplateManager().deleteTemplateById(templateId);
+            templateManager.deleteTemplateById(templateId);
         } catch (TemplateManagementException e) {
             if (TemplateMgtConstants.ErrorMessages.ERROR_CODE_TEMPLATE_NOT_FOUND.getCode().equals(e.getErrorCode())) {
                 throw handleTemplateNotFoundException(e);
@@ -1373,7 +1388,7 @@ public void deleteApplicationTemplateById(String templateId) {
     public void updateApplicationTemplateById(String templateId, ApplicationTemplateModel model) {
 
         try {
-            getTemplateManager().updateTemplateById(templateId,
+            templateManager.updateTemplateById(templateId,
                     new ApplicationTemplateApiModelToTemplate().apply(model));
         } catch (TemplateManagementException e) {
             if (TemplateMgtConstants.ErrorMessages.ERROR_CODE_TEMPLATE_NOT_FOUND.getCode().equals(e.getErrorCode())) {
@@ -1415,7 +1430,7 @@ public void addAuthorizedAPI(String applicationId, AuthorizedAPICreationModel au
         try {
             String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
             String authorizedAPIId = authorizedAPICreationModel.getId();
-            AuthorizedAPI authorizedAPI = getAuthorizedAPIManagementService().getAuthorizedAPI(applicationId,
+            AuthorizedAPI authorizedAPI = authorizedAPIManagementService.getAuthorizedAPI(applicationId,
                     authorizedAPIId, tenantDomain);
             if (authorizedAPI != null) {
                 throw handleAuthorizedAPIConflictError(applicationId, authorizedAPIId);
@@ -1439,7 +1454,7 @@ public void addAuthorizedAPI(String applicationId, AuthorizedAPICreationModel au
                         policyIdentifier);
             }
 
-            getAuthorizedAPIManagementService().addAuthorizedAPI(applicationId,
+            authorizedAPIManagementService.addAuthorizedAPI(applicationId,
                     new AuthorizedAPI.AuthorizedAPIBuilder()
                             .appId(applicationId)
                             .apiId(authorizedAPIId)
@@ -1466,7 +1481,7 @@ public void addAuthorizedAPI(String applicationId, AuthorizedAPICreationModel au
     public void deleteAuthorizedAPI(String applicationId, String apiId) {
 
         try {
-            getAuthorizedAPIManagementService().deleteAuthorizedAPI(applicationId, apiId,
+            authorizedAPIManagementService.deleteAuthorizedAPI(applicationId, apiId,
                     CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
         } catch (IdentityApplicationManagementException e) {
             String msg = "Error while deleting authorized API with id: " + apiId + " from the application with  id: "
@@ -1502,7 +1517,7 @@ public void updateAuthorizedAPI(String applicationId, String apiId,
             validateAPIResourceScopes(apiResource, addedScopes);
 
             // Remove already authorized scopes from the added scopes list.
-            AuthorizedAPI currentAuthorizedAPI = getAuthorizedAPIManagementService().getAuthorizedAPI(applicationId,
+            AuthorizedAPI currentAuthorizedAPI = authorizedAPIManagementService.getAuthorizedAPI(applicationId,
                     apiId, tenantDomain);
             if (currentAuthorizedAPI == null) {
                 throw buildClientError(ErrorMessage.AUTHORIZED_API_NOT_FOUND, apiId, applicationId);
@@ -1512,7 +1527,7 @@ public void updateAuthorizedAPI(String applicationId, String apiId,
                         scope.getName().equals(scopeName)));
             }
 
-            getAuthorizedAPIManagementService().patchAuthorizedAPI(applicationId, apiId, addedScopes, removedScopes,
+            authorizedAPIManagementService.patchAuthorizedAPI(applicationId, apiId, addedScopes, removedScopes,
                     tenantDomain);
         } catch (APIResourceMgtException e) {
             String msg = "Error while fetching API resource with id: " + apiId;
@@ -1534,7 +1549,7 @@ public List<AuthorizedAPIResponse> getAuthorizedAPIs(String applicationId) {
 
         try {
             List<AuthorizedAPIResponse> authorizedAPIResponses = new ArrayList<>();
-            List<AuthorizedAPI> authorizedAPIs = getAuthorizedAPIManagementService().getAuthorizedAPIs(applicationId,
+            List<AuthorizedAPI> authorizedAPIs = authorizedAPIManagementService.getAuthorizedAPIs(applicationId,
                     PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             if (authorizedAPIs == null) {
                 return new ArrayList<>();
@@ -1684,7 +1699,7 @@ private ServiceProvider getServiceProvider(String applicationId) {
         ServiceProvider application;
         try {
             String tenantDomain = ContextLoader.getTenantDomainFromContext();
-            application = getApplicationManagementService().getApplicationByResourceId(applicationId, tenantDomain);
+            application = applicationManagementService.getApplicationByResourceId(applicationId, tenantDomain);
             if (application == null) {
                 throw buildClientError(ErrorMessage.APPLICATION_NOT_FOUND, applicationId, tenantDomain);
             }
@@ -1824,7 +1839,7 @@ private void updateServiceProvider(String applicationId, ServiceProvider updated
 
             // Inbound auth config details are already added to the service provider. Therefore we don't need to pass
             // the inboundDTO information here.
-            getApplicationManagementService().updateApplicationByResourceId(
+            applicationManagementService.updateApplicationByResourceId(
                     applicationId, updatedApplication, null, tenantDomain, username);
         } catch (IdentityApplicationManagementException e) {
             String msg = "Error updating application with id: " + applicationId;
@@ -1839,7 +1854,7 @@ private void updateServiceProvider(String applicationId, ServiceProvider updated
             String tenantDomain = ContextLoader.getTenantDomainFromContext();
             String username = ContextLoader.getUsernameFromContext();
 
-            getApplicationManagementService().updateApplicationByResourceId(
+            applicationManagementService.updateApplicationByResourceId(
                     applicationId, updatedApplication, inboundDTO, tenantDomain, username);
         } catch (IdentityApplicationManagementException e) {
             String msg = "Error updating application with id: " + applicationId;
@@ -1866,21 +1881,6 @@ private void validatePaginationSupport(Integer limit, Integer offset) {
         }
     }
 
-    private ApplicationManagementService getApplicationManagementService() {
-
-        return ApplicationManagementServiceHolder.getApplicationManagementService();
-    }
-
-    private AuthorizedAPIManagementService getAuthorizedAPIManagementService() {
-
-        return ApplicationManagementServiceHolder.getAuthorizedAPIManagementService();
-    }
-
-    private TemplateManager getTemplateManager() {
-
-        return ApplicationManagementServiceHolder.getTemplateManager();
-    }
-
     private APIError handleIdentityApplicationManagementException(IdentityApplicationManagementException e,
                                                                   String msg) {
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationMetadataService.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationMetadataService.java
index 0fdaebaf41..d606ed3a97 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationMetadataService.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationMetadataService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -23,7 +23,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementConstants;
 import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementConstants.ErrorMessage;
-import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.application.management.v1.AdaptiveAuthTemplates;
 import org.wso2.carbon.identity.api.server.application.management.v1.AuthProtocolMetadata;
 import org.wso2.carbon.identity.api.server.application.management.v1.ClientAuthenticationMethod;
@@ -41,6 +40,7 @@
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.application.common.model.Property;
 import org.wso2.carbon.identity.application.mgt.AbstractInboundAuthenticatorConfig;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
 import org.wso2.carbon.identity.base.IdentityException;
 import org.wso2.carbon.identity.core.util.IdentityUtil;
 import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
@@ -51,6 +51,7 @@
 import org.wso2.carbon.identity.oauth2.util.OAuth2Util;
 import org.wso2.carbon.identity.sso.saml.SAMLSSOConfigServiceImpl;
 import org.wso2.carbon.security.SecurityConfigException;
+import org.wso2.carbon.security.sts.service.STSAdminServiceInterface;
 
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -73,6 +74,23 @@
  */
 public class ServerApplicationMetadataService {
 
+    private final ApplicationManagementService applicationManagementService;
+    private final SAMLSSOConfigServiceImpl samlSSOConfigService;
+    private final OAuthAdminServiceImpl oAuthAdminService;
+    private final STSAdminServiceInterface sTSAdminServiceInterface;
+
+    public ServerApplicationMetadataService(ApplicationManagementService applicationManagementService,
+                                            SAMLSSOConfigServiceImpl samlSSOConfigService,
+                                            OAuthAdminServiceImpl oAuthAdminService,
+                                            STSAdminServiceInterface sTSAdminServiceInterface) {
+
+        this.applicationManagementService = applicationManagementService;
+        this.samlSSOConfigService = samlSSOConfigService;
+        this.oAuthAdminService = oAuthAdminService;
+        this.sTSAdminServiceInterface = sTSAdminServiceInterface;
+    }
+
+
     private static final Log LOG = LogFactory.getLog(ServerApplicationMetadataService.class);
 
     /**
@@ -87,9 +105,8 @@ public List<AuthProtocolMetadata> getInboundProtocols(Boolean customOnly) {
         List<AuthProtocolMetadata> authProtocolMetadataList = new ArrayList<>();
 
         // Add custom inbound protocols
-        Map<String, AbstractInboundAuthenticatorConfig> allCustomAuthenticators =
-                ApplicationManagementServiceHolder.getApplicationManagementService()
-                        .getAllInboundAuthenticatorConfig();
+        Map<String, AbstractInboundAuthenticatorConfig> allCustomAuthenticators = applicationManagementService
+                .getAllInboundAuthenticatorConfig();
 
         for (Map.Entry<String, AbstractInboundAuthenticatorConfig> entry : allCustomAuthenticators
                 .entrySet()) {
@@ -120,8 +137,6 @@ public List<AuthProtocolMetadata> getInboundProtocols(Boolean customOnly) {
     public SAMLMetaData getSAMLMetadata() {
 
         SAMLMetaData samlMetaData = new SAMLMetaData();
-        SAMLSSOConfigServiceImpl samlSSOConfigService = ApplicationManagementServiceHolder.getSamlssoConfigService();
-
         samlMetaData.setDefaultNameIdFormat(DEFAULT_NAME_ID_FORMAT);
 
         try {
@@ -159,7 +174,6 @@ public SAMLMetaData getSAMLMetadata() {
     public OIDCMetaData getOIDCMetadata() {
 
         OIDCMetaData oidcMetaData = new OIDCMetaData();
-        OAuthAdminServiceImpl oAuthAdminService = ApplicationManagementServiceHolder.getOAuthAdminService();
 
         List<ClientAuthenticationMethod> supportedClientAuthMethods = new ArrayList<>();
         // 'Select Option' is added to the api until the clearable UI dropdown is implemented
@@ -297,11 +311,10 @@ public WSTrustMetaData getWSTrustMetadata() {
         WSTrustMetaData wsTrustMetaData = new WSTrustMetaData();
         try {
             // Check if WS-Trust is deployed.
-            if (ApplicationManagementServiceHolder.getStsAdminService() != null) {
+            if (sTSAdminServiceInterface != null) {
                 wsTrustMetaData.setCertificateAlias(new MetadataProperty()
                         .defaultValue(null)
-                        .options(Arrays.asList(ApplicationManagementServiceHolder.getStsAdminService()
-                                .getCertAliasOfPrimaryKeyStore())));
+                        .options(Arrays.asList(sTSAdminServiceInterface.getCertAliasOfPrimaryKeyStore())));
             } else {
                 throw new SecurityConfigException(ERROR_WS_TRUST_METADATA_SERVICE_NOT_FOUND.getDescription());
             }
@@ -325,8 +338,7 @@ public WSTrustMetaData getWSTrustMetadata() {
     public CustomInboundProtocolMetaData getCustomProtocolMetadata(String inboundProtocolName) {
 
         String protocolName = URLDecoder.decode(inboundProtocolName);
-        Map<String, AbstractInboundAuthenticatorConfig> allCustomAuthenticators =
-                ApplicationManagementServiceHolder.getApplicationManagementService()
+        Map<String, AbstractInboundAuthenticatorConfig> allCustomAuthenticators = applicationManagementService
                         .getAllInboundAuthenticatorConfig();
 
         // Loop through all custom inbound protocols and match the name.
@@ -389,8 +401,7 @@ private List<CustomInboundProtocolProperty> getCustomInboundProtocolProperties(P
     public AdaptiveAuthTemplates getAdaptiveAuthTemplates() {
 
         AdaptiveAuthTemplates adaptiveAuthTemplates = new AdaptiveAuthTemplates();
-        adaptiveAuthTemplates.setTemplatesJSON(ApplicationManagementServiceHolder.getApplicationManagementService()
-                .getAuthenticationTemplatesJSON());
+        adaptiveAuthTemplates.setTemplatesJSON(applicationManagementService.getAuthenticationTemplatesJSON());
         return adaptiveAuthTemplates;
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationSharingService.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationSharingService.java
index cb050369b2..c4867da19a 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationSharingService.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/ServerApplicationSharingService.java
@@ -19,7 +19,6 @@
 package org.wso2.carbon.identity.api.server.application.management.v1.core;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.application.management.v1.ApplicationSharePOSTRequest;
 import org.wso2.carbon.identity.api.server.application.management.v1.BasicOrganizationResponse;
 import org.wso2.carbon.identity.api.server.application.management.v1.SharedApplicationResponse;
@@ -52,6 +51,13 @@
  */
 public class ServerApplicationSharingService {
 
+    private final OrgApplicationManager orgApplicationManager;
+
+    public ServerApplicationSharingService(OrgApplicationManager orgApplicationManager) {
+
+        this.orgApplicationManager = orgApplicationManager;
+    }
+
     /**
      * Returns the shared applications list of a given primary application, along with their organizations.
      *
@@ -61,8 +67,8 @@ public class ServerApplicationSharingService {
     public Response getSharedApplications(String applicationId) {
 
         try {
-            List<SharedApplication> sharedApplications =
-                    getOrgApplicationManager().getSharedApplications(getOrganizationId(), applicationId);
+            List<SharedApplication> sharedApplications = orgApplicationManager
+                    .getSharedApplications(getOrganizationId(), applicationId);
             return Response.ok(createSharedApplicationsResponse(sharedApplications)).build();
         } catch (OrganizationManagementClientException e) {
             throw Utils.buildClientError(e.getErrorCode(), e.getMessage(), e.getDescription());
@@ -81,7 +87,7 @@ public Response getSharedApplications(String applicationId) {
     public Response deleteSharedApplication(String applicationId, String sharedOrganizationId) {
 
         try {
-            getOrgApplicationManager().deleteSharedApplication(getOrganizationId(), applicationId,
+            orgApplicationManager.deleteSharedApplication(getOrganizationId(), applicationId,
                     sharedOrganizationId);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
@@ -100,8 +106,8 @@ public Response deleteSharedApplication(String applicationId, String sharedOrgan
     public Response getApplicationSharedOrganizations(String applicationId) {
 
         try {
-            List<BasicOrganization> basicOrganizations =
-                    getOrgApplicationManager().getApplicationSharedOrganizations(getOrganizationId(), applicationId);
+            List<BasicOrganization> basicOrganizations = orgApplicationManager
+                    .getApplicationSharedOrganizations(getOrganizationId(), applicationId);
             return Response.ok(createSharedOrgResponse(basicOrganizations)).build();
         } catch (OrganizationManagementClientException e) {
             throw Utils.buildClientError(e.getErrorCode(), e.getMessage(), e.getDescription());
@@ -124,7 +130,7 @@ public Response shareOrganizationApplication(String applicationId,
             validateApplicationSharePostRequestBody(requestBody);
             boolean shareWithAllChildren = (requestBody.getShareWithAllChildren() != null)
                     ? requestBody.getShareWithAllChildren() : false;
-            getOrgApplicationManager().shareOrganizationApplication(getOrganizationId(), applicationId,
+            orgApplicationManager.shareOrganizationApplication(getOrganizationId(), applicationId,
                     shareWithAllChildren, requestBody.getSharedOrganizations());
             return Response.ok().build();
         } catch (OrganizationManagementClientException e) {
@@ -143,7 +149,7 @@ public Response shareOrganizationApplication(String applicationId,
     public Response deleteAllSharedApplications(String applicationId) {
 
         try {
-            getOrgApplicationManager().deleteSharedApplication(getOrganizationId(), applicationId, null);
+            orgApplicationManager.deleteSharedApplication(getOrganizationId(), applicationId, null);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             throw Utils.buildClientError(e.getErrorCode(), e.getMessage(), e.getDescription());
@@ -199,9 +205,4 @@ private static URI buildOrganizationURL(String organizationId) {
         return buildURIForBody(PATH_SEPARATOR + V1_API_PATH_COMPONENT + PATH_SEPARATOR + ORGANIZATION_PATH +
                 PATH_SEPARATOR + organizationId);
     }
-
-    private OrgApplicationManager getOrgApplicationManager() {
-
-        return ApplicationManagementServiceHolder.getOrgApplicationManager();
-    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/TransferResource.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/TransferResource.java
index 1f78901c29..445e77cc2b 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/TransferResource.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/core/TransferResource.java
@@ -18,8 +18,8 @@
 
 package org.wso2.carbon.identity.api.server.application.management.v1.core;
 
-import org.springframework.core.io.ByteArrayResource;
-import org.springframework.http.MediaType;
+import java.util.Arrays;
+import javax.activation.MimeType;
 
 /**
  * The TransferResource class represents a resource to be transferred,
@@ -28,13 +28,13 @@
 public class TransferResource {
 
     private String resourceName;
-    private MediaType resourceType;
-    private ByteArrayResource resource;
+    private MimeType resourceType;
+    private byte[] resource;
 
-    public TransferResource(String resourceName, ByteArrayResource resource, MediaType resourceType) {
+    public TransferResource(String resourceName, byte[] resource, MimeType resourceType) {
 
         this.resourceName = resourceName;
-        this.resource = resource;
+        this.resource = resource != null ? Arrays.copyOf(resource, resource.length) : new byte[0];
         this.resourceType = resourceType;
     }
 
@@ -48,22 +48,22 @@ public void setResourceName(String resourceName) {
         this.resourceName = resourceName;
     }
 
-    public ByteArrayResource getResource() {
+    public byte[] getResource() {
 
-        return resource;
+        return resource != null ? Arrays.copyOf(resource, resource.length) : new byte[0];
     }
 
-    public void setResource(ByteArrayResource resource) {
+    public void setResource(byte[] resource) {
 
-        this.resource = resource;
+        this.resource = resource != null ? Arrays.copyOf(resource, resource.length) : new byte[0];
     }
 
-    public MediaType getResourceType() {
+    public MimeType getResourceType() {
 
         return resourceType;
     }
 
-    public void setResourceType(MediaType resourceType) {
+    public void setResourceType(MimeType resourceType) {
 
         this.resourceType = resourceType;
     }
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationManagementServiceFactory.java
new file mode 100644
index 0000000000..4cdb44f426
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationManagementServiceFactory.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.application.management.v1.factories;
+
+import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationManagementService;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
+import org.wso2.carbon.identity.template.mgt.TemplateManager;
+
+/**
+ * Factory class for ServerApplicationManagementService.
+ */
+public class ServerApplicationManagementServiceFactory {
+
+    private ServerApplicationManagementServiceFactory() {
+
+    }
+
+    private static class ServerApplicationManagementServiceHolder {
+
+        private static final ServerApplicationManagementService SERVICE = createServiceInstance();
+    }
+
+    private static ServerApplicationManagementService createServiceInstance() {
+
+        ApplicationManagementService applicationManagementService = getApplicationManagementService();
+        AuthorizedAPIManagementService authorizedAPIManagementService = getAuthorizedAPIManagementService();
+        TemplateManager templateManager = getTemplateManager();
+
+        return new ServerApplicationManagementService(applicationManagementService, authorizedAPIManagementService,
+                templateManager);
+    }
+
+    /**
+     * Get ServerAPIResourceManagementService instance.
+     *
+     * @return ServerAPIResourceManagementService.
+     */
+    public static ServerApplicationManagementService getServerApplicationManagementService() {
+
+        return ServerApplicationManagementServiceHolder.SERVICE;
+    }
+
+    private static ApplicationManagementService getApplicationManagementService() {
+
+        ApplicationManagementService service = ApplicationManagementServiceHolder.getApplicationManagementService();
+        if (service == null) {
+            throw new IllegalStateException("ApplicationManagementService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static AuthorizedAPIManagementService getAuthorizedAPIManagementService() {
+
+        AuthorizedAPIManagementService service = ApplicationManagementServiceHolder.getAuthorizedAPIManagementService();
+        if (service == null) {
+            throw new IllegalStateException("AuthorizedAPIManagementService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static TemplateManager getTemplateManager() {
+
+        TemplateManager service = ApplicationManagementServiceHolder.getTemplateManager();
+        if (service == null) {
+            throw new IllegalStateException("TemplateManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationMetadataServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationMetadataServiceFactory.java
new file mode 100644
index 0000000000..def4caa1bf
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationMetadataServiceFactory.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.application.management.v1.factories;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationMetadataService;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
+import org.wso2.carbon.identity.sso.saml.SAMLSSOConfigServiceImpl;
+import org.wso2.carbon.security.sts.service.STSAdminServiceInterface;
+
+/**
+ * Factory class for ServerApplicationMetadataService.
+ */
+public class ServerApplicationMetadataServiceFactory {
+
+    private static final Log log = LogFactory.getLog(ServerApplicationMetadataServiceFactory.class);
+
+    private ServerApplicationMetadataServiceFactory() {
+
+    }
+
+    private static class ServerApplicationMetadataServiceHolder {
+
+        private static final ServerApplicationMetadataService SERVICE = createServiceInstance();
+    }
+
+    private static ServerApplicationMetadataService createServiceInstance() {
+
+        ApplicationManagementService applicationManagementService = getApplicationManagementService();
+        SAMLSSOConfigServiceImpl samlSSOConfigService = getSAMLSSOConfigServiceImpl();
+        OAuthAdminServiceImpl oAuthAdminService = getOAuthAdminServiceImpl();
+        STSAdminServiceInterface sTSAdminServiceInterface = getSTSAdminServiceInterface();
+
+        return new ServerApplicationMetadataService(applicationManagementService, samlSSOConfigService,
+                oAuthAdminService, sTSAdminServiceInterface);
+    }
+
+    /**
+     * Get ServerAPIResourceManagementService instance.
+     *
+     * @return ServerAPIResourceManagementService.
+     */
+    public static ServerApplicationMetadataService getServerApplicationMetadataService() {
+
+        return ServerApplicationMetadataServiceHolder.SERVICE;
+    }
+
+    private static ApplicationManagementService getApplicationManagementService() {
+
+        ApplicationManagementService service = ApplicationManagementServiceHolder.getApplicationManagementService();
+        if (service == null) {
+            throw new IllegalStateException("ApplicationManagementService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static SAMLSSOConfigServiceImpl getSAMLSSOConfigServiceImpl() {
+
+        SAMLSSOConfigServiceImpl service = ApplicationManagementServiceHolder.getSamlssoConfigService();
+        if (service == null) {
+            throw new IllegalStateException("SAMLSSOConfigServiceImpl is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static OAuthAdminServiceImpl getOAuthAdminServiceImpl() {
+
+        OAuthAdminServiceImpl service = ApplicationManagementServiceHolder.getOAuthAdminService();
+        if (service == null) {
+            throw new IllegalStateException("OAuthAdminServiceImpl is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static STSAdminServiceInterface getSTSAdminServiceInterface() {
+
+        STSAdminServiceInterface service = ApplicationManagementServiceHolder.getStsAdminService();
+        if (service == null) {
+            log.warn("STSAdminServiceInterface is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationSharingServiceFactory.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationSharingServiceFactory.java
new file mode 100644
index 0000000000..990e88733b
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/factories/ServerApplicationSharingServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.application.management.v1.factories;
+
+import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationSharingService;
+import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
+
+/**
+ * Factory class for ServerApplicationSharingService.
+ */
+public class ServerApplicationSharingServiceFactory {
+
+    private static final ServerApplicationSharingService SERVICE;
+
+    static {
+
+        OrgApplicationManager orgApplicationManager = ApplicationManagementServiceHolder.getOrgApplicationManager();
+
+        if (orgApplicationManager == null) {
+            throw new IllegalStateException("OrgApplicationManager is not available from OSGi context.");
+        }
+
+        SERVICE = new ServerApplicationSharingService(orgApplicationManager);
+    }
+
+    /**
+     * Get ServerAPIResourceManagementService instance.
+     *
+     * @return ServerAPIResourceManagementService.
+     */
+    public static ServerApplicationSharingService getServerApplicationSharingService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/impl/ApplicationsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/impl/ApplicationsApiServiceImpl.java
index d6fef0ca9b..87194e9383 100644
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/impl/ApplicationsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/java/org/wso2/carbon/identity/api/server/application/management/v1/impl/ApplicationsApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,9 +18,6 @@
 
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.search.SearchContext;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementConstants;
 import org.wso2.carbon.identity.api.server.application.management.v1.ApplicationListResponse;
 import org.wso2.carbon.identity.api.server.application.management.v1.ApplicationModel;
@@ -44,6 +41,9 @@
 import org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationMetadataService;
 import org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationSharingService;
 import org.wso2.carbon.identity.api.server.application.management.v1.core.TransferResource;
+import org.wso2.carbon.identity.api.server.application.management.v1.factories.ServerApplicationManagementServiceFactory;
+import org.wso2.carbon.identity.api.server.application.management.v1.factories.ServerApplicationMetadataServiceFactory;
+import org.wso2.carbon.identity.api.server.application.management.v1.factories.ServerApplicationSharingServiceFactory;
 import org.wso2.carbon.identity.api.server.common.Constants;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 
@@ -58,14 +58,22 @@
  */
 public class ApplicationsApiServiceImpl implements ApplicationsApiService {
 
-    @Autowired
-    private ServerApplicationManagementService applicationManagementService;
+    private final ServerApplicationManagementService applicationManagementService;
+    private final ServerApplicationMetadataService applicationMetadataService;
+    private final ServerApplicationSharingService applicationSharingService;
 
-    @Autowired
-    private ServerApplicationMetadataService applicationMetadataService;
-
-    @Autowired
-    private ServerApplicationSharingService applicationSharingService;
+    public ApplicationsApiServiceImpl() {
+        try {
+            this.applicationManagementService = ServerApplicationManagementServiceFactory
+                    .getServerApplicationManagementService();
+            this.applicationMetadataService = ServerApplicationMetadataServiceFactory
+                    .getServerApplicationMetadataService();
+            this.applicationSharingService = ServerApplicationSharingServiceFactory
+                    .getServerApplicationSharingService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating application management services.", e);
+        }
+    }
 
     @Override
     public Response getAllApplications(Integer limit, Integer offset, String filter, String sortOrder, String sortBy,
@@ -253,13 +261,13 @@ public Response exportApplicationAsFile(String applicationId, Boolean exportSecr
         );
 
         return Response.ok()
-                .type(MediaType.APPLICATION_OCTET_STREAM_VALUE)
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\""
+                .type("application/octet-stream")
+                .header("Content-Disposition", "attachment; filename=\""
                         + transferResource.getResourceName() + "\"")
-                .header(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate")
-                .header(HttpHeaders.PRAGMA, "no-cache")
-                .header(HttpHeaders.EXPIRES, "0")
-                .entity(transferResource.getResource().getByteArray())
+                .header("Cache-Control", "no-cache, no-store, must-revalidate")
+                .header("Pragma", "no-cache")
+                .header("Expires", "0")
+                .entity(transferResource.getResource())
                 .build();
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/resources/META-INF/cxf/applications-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/resources/META-INF/cxf/applications-server-v1-cxf.xml
deleted file mode 100644
index 79bdb489c4..0000000000
--- a/components/org.wso2.carbon.identity.api.server.application.management/org.wso2.carbon.identity.api.server.application.management.v1/src/main/resources/META-INF/cxf/applications-server-v1-cxf.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-    <bean class="org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationMetadataService"/>
-    <bean class="org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationSharingService"/>
-    <bean class="org.wso2.carbon.identity.api.server.application.management.v1.impl.ApplicationsApiServiceImpl"/>
-
-    <bean id="applicationManagementServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="applicationManagementService" ref="applicationManagementServiceFactoryBean"/>
-    </bean>
-    <bean id="oauthAdminServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="oauthAdminService" ref="oauthAdminServiceFactoryBean"/>
-    </bean>
-    <bean id="stsAdminServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="stsAdminService" ref="stsAdminServiceFactoryBean"/>
-    </bean>
-    <bean id="samlSsoConfigServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="samlssoConfigService" ref="samlSsoConfigServiceFactoryBean"/>
-    </bean>
-    <bean id="templateManagerServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="templateManager" ref="templateManagerServiceFactoryBean"/>
-    </bean>
-    <bean id="corsMgtServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="corsManagementService" ref="corsMgtServiceFactoryBean"/>
-    </bean>
-    <bean id="realmServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="realmService" ref="realmServiceFactoryBean"/>
-    </bean>
-    <bean id="authorizedAPIManagementServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="authorizedAPIManagementService" ref="authorizedAPIManagerServiceFactoryBean"/>
-    </bean>
-    <bean id="apiResourceManagerHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="apiResourceManager" ref="apiResourceManagerServiceFactoryBean"/>
-    </bean>
-    <bean id="orgApplicationManagerHolderBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.ApplicationManagementServiceHolder">
-        <property name="orgApplicationManager" ref="orgApplicationManagerServiceFactoryBean"/>
-    </bean>
-
-    <bean id="applicationManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.ApplicationManagementOSGiServiceFactory"/>
-    <bean id="oauthAdminServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.OAuthAdminOSGiServiceFactory"/>
-    <bean id="stsAdminServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.STSAdminOSGiServiceFactory"/>
-    <bean id="samlSsoConfigServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.SAMLSSOConfigOSGiServiceFactory"/>
-    <bean id="templateManagerServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.TemplateManagementOSGiServiceFactory"/>
-    <bean id="corsMgtServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.CORSMgtOGSiServiceFactory"/>
-    <bean id="realmServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.RealmServiceOSGIServiceFactory">
-    </bean>
-    <bean id="authorizedAPIManagerServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.AuthorizedAPIMgtOSGiServiceFactory" />
-    <bean id="apiResourceManagerServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.APIResourceMgtOSGiServiceFactory"/>
-    <bean id="orgApplicationManagerServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.application.management.common.factory.OrgApplicationManagerOSGiServiceFactory"/>
-</beans>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
index 473ef3f24c..539ecb6735 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -29,11 +29,6 @@
     <artifactId>org.wso2.carbon.identity.api.server.organization.selfservice.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.organization.management.core</groupId>
             <artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/SelfServiceMgtServiceHolder.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/SelfServiceMgtServiceHolder.java
index 2b39c6d66c..1a1a494d26 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/SelfServiceMgtServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/SelfServiceMgtServiceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.organization.selfservice.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
 import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
 import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
@@ -28,33 +29,38 @@
  */
 public class SelfServiceMgtServiceHolder {
 
-    private static IdentityGovernanceService identityGovernanceService;
+    private SelfServiceMgtServiceHolder() {
 
-    private static ApplicationManagementService applicationManagementService;
+    }
 
-    private static APIResourceManager apiResourceManager;
+    private static class IdentityGovernanceServiceHolder {
+        static final IdentityGovernanceService SERVICE = (IdentityGovernanceService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(IdentityGovernanceService.class, null);
+    }
 
-    private static AuthorizedAPIManagementService authorizedAPIManagementService;
+    private static class ApplicationManagementServiceHolder {
+        static final ApplicationManagementService SERVICE = (ApplicationManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(ApplicationManagementService.class, null);
+    }
 
-    /**
-     * Get Application Management OSGI service.
-     *
-     * @return Application management service..
-     */
-    public static ApplicationManagementService getApplicationManagementService() {
+    private static class APIResourceManagerServiceHolder {
+        static final APIResourceManager SERVICE = (APIResourceManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
+    }
 
-        return applicationManagementService;
+    private static class AuthorizedAPIManagementServiceHolder {
+        static final AuthorizedAPIManagementService SERVICE = (AuthorizedAPIManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(AuthorizedAPIManagementService.class, null);
     }
 
     /**
-     * Set Application Management OSGI service.
+     * Get Application Management OSGI service.
      *
-     * @param applicationManagementService Application management service.
+     * @return Application management service.
      */
-    public static void setApplicationManagementService(
-            ApplicationManagementService applicationManagementService) {
+    public static ApplicationManagementService getApplicationManagementService() {
 
-        SelfServiceMgtServiceHolder.applicationManagementService = applicationManagementService;
+        return ApplicationManagementServiceHolder.SERVICE;
     }
 
     /**
@@ -64,17 +70,7 @@ public static void setApplicationManagementService(
      */
     public static IdentityGovernanceService getIdentityGovernanceService() {
 
-        return identityGovernanceService;
-    }
-
-    /**
-     * Set Identity Governance OSGI service.
-     *
-     * @param identityGovernanceService Identity Governance service.
-     */
-    public static void setIdentityGovernanceService(IdentityGovernanceService identityGovernanceService) {
-
-        SelfServiceMgtServiceHolder.identityGovernanceService = identityGovernanceService;
+        return IdentityGovernanceServiceHolder.SERVICE;
     }
 
     /**
@@ -84,17 +80,7 @@ public static void setIdentityGovernanceService(IdentityGovernanceService identi
      */
     public static APIResourceManager getAPIResourceManager() {
 
-        return apiResourceManager;
-    }
-
-    /**
-     * Set APIResourceManager.
-     *
-     * @param apiResourceManager APIResourceManager.
-     */
-    public static void setAPIResourceManager(APIResourceManager apiResourceManager) {
-
-        SelfServiceMgtServiceHolder.apiResourceManager = apiResourceManager;
+        return APIResourceManagerServiceHolder.SERVICE;
     }
 
     /**
@@ -104,17 +90,6 @@ public static void setAPIResourceManager(APIResourceManager apiResourceManager)
      */
     public static AuthorizedAPIManagementService getAuthorizedAPIManagementService() {
 
-        return authorizedAPIManagementService;
-    }
-
-    /**
-     * Set AuthorizedAPIManagementService.
-     *
-     * @param authorizedAPIManagementService AuthorizedAPIManagementService.
-     */
-    public static void setAuthorizedAPIManagementService(AuthorizedAPIManagementService
-                                                                 authorizedAPIManagementService) {
-
-        SelfServiceMgtServiceHolder.authorizedAPIManagementService = authorizedAPIManagementService;
+        return AuthorizedAPIManagementServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/APIResourceManagementOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/APIResourceManagementOSGiServiceFactory.java
deleted file mode 100644
index 2c0121748b..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/APIResourceManagementOSGiServiceFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.selfservice.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
-
-/**
- * Factory class for APIResourceManagementOSGiService.
- */
-public class APIResourceManagementOSGiServiceFactory extends AbstractFactoryBean<APIResourceManager> {
-
-    private APIResourceManager apiResourceManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected APIResourceManager createInstance() throws Exception {
-
-        if (this.apiResourceManager == null) {
-            apiResourceManager = (APIResourceManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
-            if (apiResourceManager == null) {
-                throw new Exception("Unable to retrieve APIResourceManager service.");
-            }
-        }
-        return this.apiResourceManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/ApplicationManagementOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/ApplicationManagementOSGiServiceFactory.java
deleted file mode 100644
index 65ab441d78..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/ApplicationManagementOSGiServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.wso2.carbon.identity.api.server.organization.selfservice.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the ApplicationManagementService type of object inside the container.
- */
-public class ApplicationManagementOSGiServiceFactory extends AbstractFactoryBean<ApplicationManagementService> {
-
-    private ApplicationManagementService applicationManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected ApplicationManagementService createInstance() throws Exception {
-
-        if (this.applicationManagementService == null) {
-            ApplicationManagementService applicationManagementService =
-                    (ApplicationManagementService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(ApplicationManagementService.class, null);
-
-            if (applicationManagementService == null) {
-                throw new Exception("Unable to retrieve ApplicationManagementService service.");
-            }
-            this.applicationManagementService = applicationManagementService;
-        }
-        return this.applicationManagementService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/AuthorizedAPIManagementOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/AuthorizedAPIManagementOSGiServiceFactory.java
deleted file mode 100644
index 4c85261dae..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/AuthorizedAPIManagementOSGiServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.selfservice.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the AuthorizedAPIManagementService type of object inside the container.
- */
-public class AuthorizedAPIManagementOSGiServiceFactory extends AbstractFactoryBean<AuthorizedAPIManagementService> {
-
-    private AuthorizedAPIManagementService authorizedAPIManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected AuthorizedAPIManagementService createInstance() throws Exception {
-
-        if (this.authorizedAPIManagementService == null) {
-            authorizedAPIManagementService = (AuthorizedAPIManagementService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(AuthorizedAPIManagementService.class, null);
-            if (authorizedAPIManagementService == null) {
-                throw new Exception("Unable to retrieve AuthorizedAPIManagement service.");
-            }
-        }
-        return this.authorizedAPIManagementService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/GovernanceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/GovernanceOSGIServiceFactory.java
deleted file mode 100644
index 4a16cd695c..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.common/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/common/factory/GovernanceOSGIServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.organization.selfservice.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.governance.IdentityGovernanceService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the IdentityGovernanceService type of object inside the container.
- */
-public class GovernanceOSGIServiceFactory extends AbstractFactoryBean<IdentityGovernanceService> {
-
-    private IdentityGovernanceService identityGovernanceService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected IdentityGovernanceService createInstance() throws Exception {
-
-        if (this.identityGovernanceService == null) {
-            IdentityGovernanceService identityGovernanceService = (IdentityGovernanceService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(IdentityGovernanceService.class, null);
-
-            if (identityGovernanceService == null) {
-                throw new Exception("Unable to retrieve IdentityGovernanceService service.");
-            }
-            this.identityGovernanceService = identityGovernanceService;
-        }
-        return this.identityGovernanceService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
index fcbe8c1315..4dca5bb1ea 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -41,11 +41,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/SelfServiceApi.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/SelfServiceApi.java
index 688907d96f..db7c465d74 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/SelfServiceApi.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/SelfServiceApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -18,8 +18,7 @@
 
 package org.wso2.carbon.identity.api.server.organization.selfservice.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.api.server.organization.selfservice.v1.factories.SelfServiceApiServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyPatchReq;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.Error;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyRes;
@@ -36,8 +35,12 @@
 
 public class SelfServiceApi  {
 
-    @Autowired
-    private SelfServiceApiService delegate;
+    private final SelfServiceApiService delegate;
+
+    public SelfServiceApi() {
+
+        this.delegate = SelfServiceApiServiceFactory.getSelfServiceApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/factories/SelfServiceApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/factories/SelfServiceApiServiceFactory.java
index c79fcb17de..76c8aa8c4b 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/factories/SelfServiceApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/factories/SelfServiceApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.SelfServiceApiService;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.impl.SelfServiceApiServiceImpl;
 
+/**
+ * Factory class for SelfServiceApiService.
+ */
 public class SelfServiceApiServiceFactory {
 
-   private final static SelfServiceApiService service = new SelfServiceApiServiceImpl();
+   private final static SelfServiceApiService SERVICE = new SelfServiceApiServiceImpl();
 
+   /**
+    * Get SelfServiceApiService.
+    *
+    * @return SelfServiceApiService.
+    */
    public static SelfServiceApiService getSelfServiceApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtService.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtService.java
index 6c45141604..f3ae1e1424 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtService.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtService.java
@@ -24,9 +24,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
 import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
@@ -34,7 +31,7 @@
 import org.wso2.carbon.identity.api.resource.mgt.constant.APIResourceManagementConstants;
 import org.wso2.carbon.identity.api.server.application.management.v1.ApplicationModel;
 import org.wso2.carbon.identity.api.server.application.management.v1.core.ServerApplicationManagementService;
-import org.wso2.carbon.identity.api.server.organization.selfservice.common.SelfServiceMgtServiceHolder;
+import org.wso2.carbon.identity.api.server.application.management.v1.factories.ServerApplicationManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.exceptions.SelfServiceMgtEndpointException;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.Error;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyPatchReq;
@@ -42,6 +39,7 @@
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyRes;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.util.SelfServiceMgtConstants;
 import org.wso2.carbon.identity.api.server.userstore.v1.core.ServerUserStoreService;
+import org.wso2.carbon.identity.api.server.userstore.v1.factories.ServerUserStoreServiceFactory;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.UserStoreReq;
 import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
 import org.wso2.carbon.identity.application.common.model.APIResource;
@@ -69,20 +67,27 @@
 import javax.ws.rs.core.Response;
 
 /**
- * Call internal osgi services to perform self service management related operations.
+ * Call internal osgi services to perform self-service management related operations.
  */
 public class SelfServiceMgtService {
 
-    private static final Log LOG = LogFactory.getLog(SelfServiceMgtService.class);
+    private final IdentityGovernanceService identityGovernanceService;
+    private final ApplicationManagementService applicationManagementService;
+    private final APIResourceManager apiResourceManager;
+    private final AuthorizedAPIManagementService authorizedAPIManagementService;
 
-    @Autowired
-    private ServerApplicationManagementService applicationManagementService;
+    private static final Log LOG = LogFactory.getLog(SelfServiceMgtService.class);
 
-    @Autowired
-    private ResourceLoader resourceLoader;
+    public SelfServiceMgtService(IdentityGovernanceService identityGovernanceService,
+                                 ApplicationManagementService applicationManagementService,
+                                 APIResourceManager apiResourceManager,
+                                 AuthorizedAPIManagementService authorizedAPIManagementService) {
 
-    @Autowired
-    private ServerUserStoreService serverUserStoreService;
+        this.identityGovernanceService = identityGovernanceService;
+        this.applicationManagementService = applicationManagementService;
+        this.apiResourceManager = apiResourceManager;
+        this.authorizedAPIManagementService = authorizedAPIManagementService;
+    }
 
     /**
      * Get organization governance configs.
@@ -92,7 +97,6 @@ public class SelfServiceMgtService {
     public List<PropertyRes> getOrganizationGovernanceConfigs() {
 
         try {
-            IdentityGovernanceService identityGovernanceService = getIdentityGovernanceService();
             String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
             ConnectorConfig connectorConfig = identityGovernanceService.getConnectorWithConfigs(tenantDomain,
                     SelfServiceMgtConstants.SELF_SERVICE_GOVERNANCE_CONNECTOR);
@@ -120,13 +124,12 @@ public void updateOrganizationGovernanceConfigs(PropertyPatchReq governanceConne
                 configurationDetails.put(propertyReqDTO.getName(), propertyReqDTO.getValue());
             }
             Map<String, String> copiedConfigurationDetails = new HashMap<>(configurationDetails);
-            IdentityGovernanceService identityGovernanceService = getIdentityGovernanceService();
             String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
             identityGovernanceService.updateConfiguration(tenantDomain, configurationDetails);
             if (enablePostListener) {
                 doPostConfigurationUpdate(copiedConfigurationDetails);
             }
-        } catch (IdentityGovernanceException e) {
+        } catch (Exception e) {
             LOG.error(SelfServiceMgtConstants.ErrorMessage.ERROR_UPDATING_SELF_SERVICE_CONFIG.getDescription(), e);
             throw new SelfServiceMgtEndpointException(Response.Status.INTERNAL_SERVER_ERROR,
                     getError(SelfServiceMgtConstants.ErrorMessage.ERROR_UPDATING_SELF_SERVICE_CONFIG.getCode(),
@@ -205,15 +208,15 @@ private void removeLiteUserStore() {
         String userStoreName = getConfigProperty(SelfServiceMgtConstants.LITE_USER_USER_STORE_NAME);
         String domainId = new String(Base64.getEncoder().encode(userStoreName.getBytes(StandardCharsets.UTF_8)),
                 StandardCharsets.UTF_8);
-        serverUserStoreService.deleteUserStore(domainId);
+        getServerUserStoreService().deleteUserStore(domainId);
         updateLiteUserStoreConnectorConfigs(false);
     }
 
     private void onboardLiteUserStore() {
 
         try {
-            Resource resource = resourceLoader.getResource(SelfServiceMgtConstants.CREATE_LITE_USER_STORE_REQUEST_JSON);
-            InputStream inputStream = resource.getInputStream();
+            InputStream inputStream = loadResourceFromClasspath(SelfServiceMgtConstants
+                    .CREATE_LITE_USER_STORE_REQUEST_JSON);
             ObjectMapper objectMapper = new ObjectMapper();
             JsonNode rootNode = objectMapper.readTree(inputStream);
             // Update Lite user store configs.
@@ -221,7 +224,7 @@ private void onboardLiteUserStore() {
             // Convert updated JSON to string and use it in the request body
             String requestBody = objectMapper.writeValueAsString(rootNode);
             UserStoreReq userStoreReq = objectMapper.readValue(requestBody, UserStoreReq.class);
-            serverUserStoreService.addUserStore(userStoreReq);
+            getServerUserStoreService().addUserStore(userStoreReq);
             updateLiteUserStoreConnectorConfigs(true);
         } catch (IOException e) {
             LOG.error(SelfServiceMgtConstants.ErrorMessage.ERROR_ONBOARDING_LITE_USER_STORE.getDescription(), e);
@@ -235,13 +238,12 @@ private void onboardLiteUserStore() {
     private void updateLiteUserStoreConnectorConfigs(boolean enableLiteUser) {
 
         try {
-            Resource resource;
+            InputStream inputStream;
             if (enableLiteUser) {
-                resource = resourceLoader.getResource(SelfServiceMgtConstants.ENABLE_LITE_USER_REQUEST_JSON);
+                inputStream = loadResourceFromClasspath(SelfServiceMgtConstants.ENABLE_LITE_USER_REQUEST_JSON);
             } else {
-                resource = resourceLoader.getResource(SelfServiceMgtConstants.DISABLE_LITE_USER_REQUEST_JSON);
+                inputStream = loadResourceFromClasspath(SelfServiceMgtConstants.DISABLE_LITE_USER_REQUEST_JSON);
             }
-            InputStream inputStream = resource.getInputStream();
             ObjectMapper objectMapper = new ObjectMapper();
             JsonNode rootNode = objectMapper.readTree(inputStream);
             // Convert updated JSON to string and use it in the request body
@@ -270,9 +272,8 @@ private void createSystemApplication() {
             }
 
             // Load the request JSON template from a resource.
-            Resource resource = resourceLoader.getResource(
-                    SelfServiceMgtConstants.CREATE_SELF_SERVICE_APP_REQUEST_JSON);
-            InputStream inputStream = resource.getInputStream();
+            InputStream inputStream = loadResourceFromClasspath(SelfServiceMgtConstants
+                    .CREATE_SELF_SERVICE_APP_REQUEST_JSON);
             ObjectMapper objectMapper = new ObjectMapper();
             JsonNode rootNode = objectMapper.readTree(inputStream);
 
@@ -284,7 +285,7 @@ private void createSystemApplication() {
             ApplicationModel model = objectMapper.readValue(requestBody, ApplicationModel.class);
 
             // Create the application using the Application Management Service.
-            applicationManagementService.createApplication(model, null);
+            getServerApplicationManagementService().createApplication(model, null);
 
             // If legacy authorization runtime is enabled, skip subscribing to APIs.
             if (isLegacyAuthzRuntime()) {
@@ -292,7 +293,7 @@ private void createSystemApplication() {
             }
 
             // Subscribe to APIs required for Organization Management Self Service.
-            ApplicationBasicInfo sSApplicationBasicInfo = getApplicationManagementService()
+            ApplicationBasicInfo sSApplicationBasicInfo = applicationManagementService
                     .getApplicationBasicInfoByName(appName, tenantDomain);
 
             if (sSApplicationBasicInfo == null) {
@@ -314,9 +315,9 @@ private void createSystemApplication() {
             }
 
             // Share the self-service app with all the child organizations.
-            ServiceProvider serviceProvider = getApplicationManagementService()
-                    .getServiceProvider(sSApplicationBasicInfo.getApplicationId());
-            getApplicationManagementService().updateApplication(serviceProvider, tenantDomain, userName);
+            ServiceProvider serviceProvider = applicationManagementService.getServiceProvider(sSApplicationBasicInfo
+                    .getApplicationId());
+            applicationManagementService.updateApplication(serviceProvider, tenantDomain, userName);
 
         } catch (IOException | IdentityApplicationManagementException e) {
             LOG.error(SelfServiceMgtConstants.ErrorMessage.ERROR_CREATING_SYSTEM_APP.getDescription(), e);
@@ -336,7 +337,7 @@ private void deleteSystemApplication() {
         try {
             // Check if the self-service app exists, if yes, then delete it.
             if (isSSAppExists(tenantDomain, userName, appName)) {
-                getApplicationManagementService().deleteApplication(appName, tenantDomain, userName);
+                applicationManagementService.deleteApplication(appName, tenantDomain, userName);
             }
         } catch (IdentityApplicationManagementException e) {
             LOG.error(SelfServiceMgtConstants.ErrorMessage.ERROR_DELETING_SYSTEM_APP.getDescription(), e);
@@ -351,7 +352,7 @@ private boolean isSSAppExists(String tenantDomain, String userName, String appNa
             throws IdentityApplicationManagementException {
 
         // Get the basic info of the self-service app using the Application Management Service.
-        ApplicationBasicInfo[] applicationBasicInfos = getApplicationManagementService()
+        ApplicationBasicInfo[] applicationBasicInfos = applicationManagementService
                 .getApplicationBasicInfo(tenantDomain, userName, appName);
         // Check if there is exactly one self-service app with the given name.
         return applicationBasicInfos.length == 1;
@@ -436,7 +437,6 @@ private List<PropertyRes> buildConnectorResDTO(ConnectorConfig connectorConfig)
 
     private String getGovernanceConfigValue(String preferenceProperty) throws IdentityGovernanceException {
 
-        IdentityGovernanceService identityGovernanceService = getIdentityGovernanceService();
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         return identityGovernanceService.getConfiguration(new String[]{preferenceProperty}, tenantDomain)[0].getValue();
     }
@@ -447,26 +447,6 @@ private String getConfigProperty(String propertyName) {
                 .getProperty(propertyName);
     }
 
-    private IdentityGovernanceService getIdentityGovernanceService() {
-
-        return SelfServiceMgtServiceHolder.getIdentityGovernanceService();
-    }
-
-    private ApplicationManagementService getApplicationManagementService() {
-
-        return SelfServiceMgtServiceHolder.getApplicationManagementService();
-    }
-
-    private APIResourceManager getAPIResourcesManager() {
-
-        return SelfServiceMgtServiceHolder.getAPIResourceManager();
-    }
-
-    private AuthorizedAPIManagementService getAuthorizedAPIManagementService() {
-
-        return SelfServiceMgtServiceHolder.getAuthorizedAPIManagementService();
-    }
-
     private Error getError(String errorCode, String errorMessage, String errorDescription) {
 
         Error error = new Error();
@@ -508,7 +488,7 @@ private void authorizeAPItoSelfServiceApp(String aPIIResourceIdentifier, List<St
 
         String aPIFilter = "identifier eq " + aPIIResourceIdentifier;
         try {
-            List<APIResource> apiResources = getAPIResourcesManager().getAPIResources(null, null, 1,
+            List<APIResource> apiResources = apiResourceManager.getAPIResources(null, null, 1,
                     aPIFilter, APIResourceManagementConstants.ASC,
                     tenantDomain).getAPIResources();
             if (apiResources != null && !apiResources.isEmpty()) {
@@ -516,7 +496,7 @@ private void authorizeAPItoSelfServiceApp(String aPIIResourceIdentifier, List<St
                 APIResource apiResource = apiResources.get(0);
 
                 String policyId = APIResourceManagementConstants.RBAC_AUTHORIZATION;
-                List<Scope> scopes = getAPIResourcesManager().getAPIScopesById(apiResource.getId(), tenantDomain);
+                List<Scope> scopes = apiResourceManager.getAPIScopesById(apiResource.getId(), tenantDomain);
 
                 List<Scope> authorizedScopes = new ArrayList<>();
                 for (Scope scope : scopes) {
@@ -531,7 +511,7 @@ private void authorizeAPItoSelfServiceApp(String aPIIResourceIdentifier, List<St
                         .scopes(authorizedScopes)
                         .policyId(policyId)
                         .build();
-                getAuthorizedAPIManagementService().addAuthorizedAPI(sSApplicationId,
+                authorizedAPIManagementService.addAuthorizedAPI(sSApplicationId,
                         authorizedAPI, tenantDomain);
             }
 
@@ -540,8 +520,52 @@ private void authorizeAPItoSelfServiceApp(String aPIIResourceIdentifier, List<St
         }
     }
 
+    /**
+     * Load resource from the classpath.
+     *
+     * @param resourcePath Resource path.
+     * @return InputStream of the resource.
+     * @throws IOException If an error occurred while loading the resource.
+     */
+    private InputStream loadResourceFromClasspath(String resourcePath) throws IOException {
+        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(resourcePath);
+        if (inputStream == null) {
+            throw new IOException("Resource not found: " + resourcePath);
+        }
+
+        return inputStream;
+    }
+
     public static boolean isLegacyAuthzRuntime() {
 
         return CarbonConstants.ENABLE_LEGACY_AUTHZ_RUNTIME;
     }
+
+    /**
+     * Get ServerApplicationManagementService instance.
+     *
+     * @return ServerApplicationManagementService.
+     */
+    private static ServerApplicationManagementService getServerApplicationManagementService() {
+
+        try {
+            return ServerApplicationManagementServiceFactory.getServerApplicationManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating ServerApplicationManagementService.", e);
+        }
+    }
+
+    /**
+     * Get ServerUserStoreService instance.
+     *
+     * @return ServerUserStoreService.
+     */
+    private static ServerUserStoreService getServerUserStoreService() {
+
+        try {
+            return ServerUserStoreServiceFactory.getServerUserStoreService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating ServerUserStoreService.", e);
+        }
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/factories/SelfServiceMgtServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/factories/SelfServiceMgtServiceFactory.java
new file mode 100644
index 0000000000..23b6b28004
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/factories/SelfServiceMgtServiceFactory.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.selfservice.v1.factories;
+
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
+import org.wso2.carbon.identity.api.server.organization.selfservice.common.SelfServiceMgtServiceHolder;
+import org.wso2.carbon.identity.api.server.organization.selfservice.v1.core.SelfServiceMgtService;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
+import org.wso2.carbon.identity.governance.IdentityGovernanceService;
+
+/**
+ * Factory class for SelfServiceMgtService.
+ */
+public class SelfServiceMgtServiceFactory {
+
+    private SelfServiceMgtServiceFactory() {
+
+    }
+
+    private static class ServiceHolder {
+
+        private static final SelfServiceMgtService SERVICE = createServiceInstance();
+    }
+
+    /**
+     * Get SelfServiceMgtService instance.
+     *
+     * @return SelfServiceMgtService.
+     */
+    public static SelfServiceMgtService getSelfServiceMgtService() {
+
+        return ServiceHolder.SERVICE;
+    }
+
+    private static SelfServiceMgtService createServiceInstance() {
+
+        IdentityGovernanceService identityGovernanceService = getIdentityGovernanceService();
+        ApplicationManagementService applicationManagementService = getApplicationManagementService();
+        APIResourceManager apiResourceManager = getAPIResourceManager();
+        AuthorizedAPIManagementService authorizedAPIManagementService = getAuthorizedAPIManagementService();
+
+        return new SelfServiceMgtService(identityGovernanceService, applicationManagementService, apiResourceManager,
+                authorizedAPIManagementService);
+    }
+
+    private static IdentityGovernanceService getIdentityGovernanceService() {
+
+        IdentityGovernanceService service = SelfServiceMgtServiceHolder.getIdentityGovernanceService();
+        if (service == null) {
+            throw new IllegalStateException("IdentityGovernanceService is not available from OSGi context.");
+        }
+        return service;
+    }
+
+    private static ApplicationManagementService getApplicationManagementService() {
+
+        ApplicationManagementService service = SelfServiceMgtServiceHolder.getApplicationManagementService();
+        if (service == null) {
+            throw new IllegalStateException("ApplicationManagementService is not available from OSGi context.");
+        }
+        return service;
+    }
+
+    private static APIResourceManager getAPIResourceManager() {
+
+        APIResourceManager service = SelfServiceMgtServiceHolder.getAPIResourceManager();
+        if (service == null) {
+            throw new IllegalStateException("APIResourceManager is not available from OSGi context.");
+        }
+        return service;
+    }
+
+    private static AuthorizedAPIManagementService getAuthorizedAPIManagementService() {
+
+        AuthorizedAPIManagementService service = SelfServiceMgtServiceHolder.getAuthorizedAPIManagementService();
+        if (service == null) {
+            throw new IllegalStateException("AuthorizedAPIManagementService is not available from OSGi context.");
+        }
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/impl/SelfServiceApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/impl/SelfServiceApiServiceImpl.java
index efe9948040..c2ce56a823 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/impl/SelfServiceApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/impl/SelfServiceApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.api.server.organization.selfservice.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.SelfServiceApiService;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.core.SelfServiceMgtService;
+import org.wso2.carbon.identity.api.server.organization.selfservice.v1.factories.SelfServiceMgtServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyPatchReq;
 
 import javax.ws.rs.core.Response;
@@ -30,8 +30,15 @@
  */
 public class SelfServiceApiServiceImpl implements SelfServiceApiService {
 
-    @Autowired
-    private SelfServiceMgtService selfServiceMgtService;
+    private final SelfServiceMgtService selfServiceMgtService;
+
+    public SelfServiceApiServiceImpl() {
+        try {
+            this.selfServiceMgtService = SelfServiceMgtServiceFactory.getSelfServiceMgtService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("SelfServiceMgtService is not available from OSGi context.", e);
+        }
+    }
 
     @Override
     public Response organizationPreferenceGet() {
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/util/SelfServiceMgtConstants.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/util/SelfServiceMgtConstants.java
index 7d646471bc..d5a0d80336 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/util/SelfServiceMgtConstants.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/util/SelfServiceMgtConstants.java
@@ -66,10 +66,10 @@ private SelfServiceMgtConstants () {
     public static final String PROPERTY_VALUE = "value";
 
     // Resource path constants.
-    public static final String CREATE_LITE_USER_STORE_REQUEST_JSON = "classpath:lite-userstore-request.json";
-    public static final String ENABLE_LITE_USER_REQUEST_JSON = "classpath:enable-lite-user.json";
-    public static final String DISABLE_LITE_USER_REQUEST_JSON = "classpath:disable-lite-user.json";
-    public static final String CREATE_SELF_SERVICE_APP_REQUEST_JSON = "classpath:create-app-request.json";
+    public static final String CREATE_LITE_USER_STORE_REQUEST_JSON = "lite-userstore-request.json";
+    public static final String ENABLE_LITE_USER_REQUEST_JSON = "enable-lite-user.json";
+    public static final String DISABLE_LITE_USER_REQUEST_JSON = "disable-lite-user.json";
+    public static final String CREATE_SELF_SERVICE_APP_REQUEST_JSON = "create-app-request.json";
 
     /**
      * Enums for error messages.
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/resources/META-INF/cxf/self-service-mgt-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/resources/META-INF/cxf/self-service-mgt-v1-cxf.xml
deleted file mode 100644
index aa132a9bee..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/main/resources/META-INF/cxf/self-service-mgt-v1-cxf.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
-  ~
-  ~ WSO2 LLC. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.api.server.organization.selfservice.v1.impl.SelfServiceApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.organization.selfservice.v1.core.SelfServiceMgtService"/>
-
-    <bean id="GovernanceConnectorServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.selfservice.common.factory.GovernanceOSGIServiceFactory"/>
-    <bean id="ApplicationManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.selfservice.common.factory.ApplicationManagementOSGiServiceFactory"/>
-    <bean id="APIResourceManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.selfservice.common.factory.APIResourceManagementOSGiServiceFactory"/>
-    <bean id="AuthorizedAPIManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.selfservice.common.factory.AuthorizedAPIManagementOSGiServiceFactory"/>
-
-    <bean id="SelfServiceMgtServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.organization.selfservice.common.SelfServiceMgtServiceHolder">
-        <property name="IdentityGovernanceService" ref="GovernanceConnectorServiceFactoryBean"/>
-        <property name="ApplicationManagementService" ref="ApplicationManagementServiceFactoryBean"/>
-        <property name="APIResourceManager" ref="APIResourceManagementServiceFactoryBean"/>
-        <property name="AuthorizedAPIManagementService" ref="AuthorizedAPIManagementServiceFactoryBean"/>
-    </bean>
-</beans>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/test/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtServiceTest.java b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/test/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtServiceTest.java
index 952b549417..8586c19519 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/test/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtServiceTest.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.selfservice/org.wso2.carbon.identity.api.server.organization.selfservice.v1/src/test/java/org/wso2/carbon/identity/api/server/organization/selfservice/v1/core/SelfServiceMgtServiceTest.java
@@ -18,17 +18,20 @@
 
 package org.wso2.carbon.identity.api.server.organization.selfservice.v1.core;
 
-import org.mockito.Mock;
 import org.mockito.MockedStatic;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.wso2.carbon.base.CarbonBaseConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
 import org.wso2.carbon.identity.api.server.organization.selfservice.common.SelfServiceMgtServiceHolder;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyPatchReq;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyReq;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.model.PropertyRes;
 import org.wso2.carbon.identity.api.server.organization.selfservice.v1.util.SelfServiceMgtConstants;
 import org.wso2.carbon.identity.application.common.model.Property;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.application.mgt.AuthorizedAPIManagementService;
 import org.wso2.carbon.identity.governance.IdentityGovernanceException;
 import org.wso2.carbon.identity.governance.IdentityGovernanceService;
 import org.wso2.carbon.identity.governance.bean.ConnectorConfig;
@@ -57,15 +60,32 @@ public class SelfServiceMgtServiceTest {
     private static final String TENANT_DOMAIN = "abc.com";
     private static final int TENANT_ID = 1;
 
-    private SelfServiceMgtService selfServiceMgtService = new SelfServiceMgtService();
-
-    @Mock
     private IdentityGovernanceService identityGovernanceService;
 
+    private SelfServiceMgtService selfServiceMgtService;
+
+    @BeforeMethod
+    public void setUp() {
+
+        identityGovernanceService = mock(IdentityGovernanceService.class);
+        ApplicationManagementService applicationManagementService = mock(ApplicationManagementService.class);
+        APIResourceManager apiResourceManager = mock(APIResourceManager.class);
+        AuthorizedAPIManagementService authorizedAPIManagementService = mock(AuthorizedAPIManagementService.class);
+
+        // Create SelfServiceMgtService with mock dependencies
+        selfServiceMgtService = new SelfServiceMgtService(
+                identityGovernanceService,
+                applicationManagementService,
+                apiResourceManager,
+                authorizedAPIManagementService
+        );
+
+        mockCarbonContext();
+    }
+
     @Test
     public void testGetOrganizationGovernanceConfigs() throws IdentityGovernanceException {
 
-        mockCarbonContext();
         ConnectorConfig mockConnectorConfig = new ConnectorConfig();
         mockConnectorConfig.setName(SelfServiceMgtConstants.SELF_SERVICE_GOVERNANCE_CONNECTOR);
 
@@ -83,14 +103,13 @@ public void testGetOrganizationGovernanceConfigs() throws IdentityGovernanceExce
 
         // Add properties to ConnectorConfig
         mockConnectorConfig.setProperties(new Property[]{property1, property2});
-        identityGovernanceService = mock(IdentityGovernanceService.class);
 
         when(identityGovernanceService.getConnectorWithConfigs(TENANT_DOMAIN,
                 SelfServiceMgtConstants.SELF_SERVICE_GOVERNANCE_CONNECTOR))
                 .thenReturn(mockConnectorConfig);
 
         List<PropertyRes> result;
-        try (MockedStatic mocked = mockStatic(SelfServiceMgtServiceHolder.class)) {
+        try (MockedStatic<SelfServiceMgtServiceHolder> mocked = mockStatic(SelfServiceMgtServiceHolder.class)) {
             mocked.when(SelfServiceMgtServiceHolder::getIdentityGovernanceService)
                     .thenReturn(identityGovernanceService);
             result = selfServiceMgtService.getOrganizationGovernanceConfigs();
@@ -112,7 +131,6 @@ public void testGetOrganizationGovernanceConfigs() throws IdentityGovernanceExce
     @Test
     public void testUpdateOrganizationGovernanceConfigs() throws IdentityGovernanceException {
 
-        mockCarbonContext();
         PropertyPatchReq mockGovernanceConnector = mock(PropertyPatchReq.class);
         List<PropertyReq> propertyReqs = new ArrayList<>();
 
@@ -131,12 +149,10 @@ public void testUpdateOrganizationGovernanceConfigs() throws IdentityGovernanceE
         Map<String, String> configurationDetails = new HashMap<>();
         configurationDetails.put(property1.getName(), property1.getValue());
 
-        identityGovernanceService = mock(IdentityGovernanceService.class);
-
         when(identityGovernanceService.getConfiguration(any(String[].class), anyString()))
                 .thenReturn(new Property[]{property2});
 
-        try (MockedStatic mocked = mockStatic(SelfServiceMgtServiceHolder.class)) {
+        try (MockedStatic<SelfServiceMgtServiceHolder> mocked = mockStatic(SelfServiceMgtServiceHolder.class)) {
             mocked.when(SelfServiceMgtServiceHolder::getIdentityGovernanceService)
                     .thenReturn(identityGovernanceService);
             selfServiceMgtService.updateOrganizationGovernanceConfigs(mockGovernanceConnector, false);
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
index a7981cbbd2..6d26112485 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
   ~ http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
@@ -33,11 +35,6 @@
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.claim.metadata.mgt</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/UserStoreConfigServiceHolder.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/UserStoreConfigServiceHolder.java
index 791fa11051..ccabcaaa87 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/UserStoreConfigServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/UserStoreConfigServiceHolder.java
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.userstore.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementService;
 import org.wso2.carbon.identity.user.store.configuration.UserStoreConfigService;
 import org.wso2.carbon.user.core.service.RealmService;
@@ -25,45 +28,53 @@
  */
 public class UserStoreConfigServiceHolder {
 
-    private static UserStoreConfigServiceHolder instance = new UserStoreConfigServiceHolder();
-    private UserStoreConfigService userStoreConfigService;
-    private RealmService realmService;
-    private ClaimMetadataManagementService claimMetadataManagementService;
-
     private UserStoreConfigServiceHolder() {}
 
-    public static UserStoreConfigServiceHolder getInstance() {
-
-        return instance;
-    }
-
-    public UserStoreConfigService getUserStoreConfigService() {
+    private static class UserStoreServiceHolder {
 
-        return UserStoreConfigServiceHolder.getInstance().userStoreConfigService;
+        static final UserStoreConfigService SERVICE = (UserStoreConfigService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UserStoreConfigService.class, null);
     }
 
-    public void setUserStoreConfigService(UserStoreConfigService userStoreConfigService) {
+    private static class RealmServiceHolder {
 
-        UserStoreConfigServiceHolder.getInstance().userStoreConfigService = userStoreConfigService;
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(RealmService.class, null);
     }
 
-    public RealmService getRealmService() {
+    private static class ClaimMetadataManagementServiceHolder {
 
-        return UserStoreConfigServiceHolder.getInstance().realmService;
+        static final ClaimMetadataManagementService SERVICE = (ClaimMetadataManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(ClaimMetadataManagementService.class, null);
     }
 
-    public void setRealmService(RealmService realmService) {
+    /**
+     * Get the UserStoreConfigService OSGi service.
+     *
+     * @return UserStoreConfigService
+     */
+    public static UserStoreConfigService getUserStoreConfigService() {
 
-        UserStoreConfigServiceHolder.getInstance().realmService = realmService;
+        return UserStoreServiceHolder.SERVICE;
     }
 
-    public ClaimMetadataManagementService getClaimMetadataManagementService() {
+    /**
+     * Get the RealmService OSGi service.
+     *
+     * @return RealmService
+     */
+    public static RealmService getRealmService() {
 
-        return UserStoreConfigServiceHolder.getInstance().claimMetadataManagementService;
+        return RealmServiceHolder.SERVICE;
     }
 
-    public void setClaimMetadataManagementService(ClaimMetadataManagementService claimMetadataManagementService) {
+    /**
+     * Get the ClaimMetadataManagementService OSGi service.
+     *
+     * @return ClaimMetadataManagementService
+     */
+    public static ClaimMetadataManagementService getClaimMetadataManagementService() {
 
-        UserStoreConfigServiceHolder.getInstance().claimMetadataManagementService = claimMetadataManagementService;
+        return ClaimMetadataManagementServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/ClaimMetadataManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/ClaimMetadataManagementServiceFactory.java
deleted file mode 100644
index 1e4f9fe402..0000000000
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/ClaimMetadataManagementServiceFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.server.userstore.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the ClaimMetadataManagementService type of object inside the container.
- */
-public class ClaimMetadataManagementServiceFactory extends AbstractFactoryBean<ClaimMetadataManagementService> {
-
-    private ClaimMetadataManagementService claimMetadataManagementService;
-
-    @Override
-    public Class<ClaimMetadataManagementService> getObjectType() {
-
-        return ClaimMetadataManagementService.class;
-    }
-
-    @Override
-    protected ClaimMetadataManagementService createInstance() throws Exception {
-
-        if (this.claimMetadataManagementService != null) {
-            return this.claimMetadataManagementService;
-        }
-
-        ClaimMetadataManagementService claimMetadataManagementService = (ClaimMetadataManagementService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(ClaimMetadataManagementService.class, null);
-        if (claimMetadataManagementService != null) {
-            this.claimMetadataManagementService = claimMetadataManagementService;
-            return this.claimMetadataManagementService;
-        }
-        throw new Exception("Unable to retrieve Claim Metadata Management Service.");
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/RealmServiceFactory.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/RealmServiceFactory.java
deleted file mode 100644
index 66f7163235..0000000000
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/RealmServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wso2.carbon.identity.api.server.userstore.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService type of object inside the container.
- */
-public class RealmServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<RealmService> getObjectType() {
-
-        return RealmService.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService = (RealmService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve UserStoreConfig Service.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/UserStoreConfigServiceFactory.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/UserStoreConfigServiceFactory.java
deleted file mode 100644
index fa15c0e653..0000000000
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.common/src/main/java/org/wso2/carbon/identity/api/server/userstore/common/factory/UserStoreConfigServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wso2.carbon.identity.api.server.userstore.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.user.store.configuration.UserStoreConfigService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the UserStoreConfigService type of object inside the container.
- */
-public class UserStoreConfigServiceFactory extends AbstractFactoryBean<UserStoreConfigService> {
-
-    private UserStoreConfigService userStoreConfigService;
-
-    @Override
-    public Class<UserStoreConfigService> getObjectType() {
-
-        return UserStoreConfigService.class;
-    }
-
-    @Override
-    protected UserStoreConfigService createInstance() throws Exception {
-
-        if (this.userStoreConfigService == null) {
-            UserStoreConfigService userStoreConfigService = (UserStoreConfigService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(UserStoreConfigService.class, null);
-            if (userStoreConfigService != null) {
-                this.userStoreConfigService = userStoreConfigService;
-            } else {
-                throw new Exception("Unable to retrieve UserStoreConfig Service.");
-            }
-        }
-        return this.userStoreConfigService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
index 213efda5e4..faf58aea4a 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
   ~ http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
@@ -106,11 +108,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/UserstoresApi.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/UserstoresApi.java
index 68eb16aaf5..101c13ce86 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/UserstoresApi.java
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/UserstoresApi.java
@@ -1,27 +1,29 @@
 /*
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.userstore.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.api.server.userstore.v1.factories.UserstoresApiServiceFactory;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.AvailableUserStoreClassesRes;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.ClaimAttributeMapping;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.ConnectionEstablishedResponse;
@@ -36,7 +38,6 @@
 import org.wso2.carbon.identity.api.server.userstore.v1.model.UserStoreListResponse;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.UserStoreReq;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.UserStoreResponse;
-import org.wso2.carbon.identity.api.server.userstore.v1.UserstoresApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -50,8 +51,12 @@
 
 public class UserstoresApi  {
 
-    @Autowired
-    private UserstoresApiService delegate;
+    private final UserstoresApiService delegate;
+
+    public UserstoresApi() {
+
+        this.delegate = UserstoresApiServiceFactory.getUserstoresApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/factories/UserstoresApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/factories/UserstoresApiServiceFactory.java
index a1384bc13b..2567072dd2 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/factories/UserstoresApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/gen/java/org/wso2/carbon/identity/api/server/userstore/v1/factories/UserstoresApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.userstore.v1.factories;
 
 import org.wso2.carbon.identity.api.server.userstore.v1.UserstoresApiService;
 import org.wso2.carbon.identity.api.server.userstore.v1.impl.UserstoresApiServiceImpl;
 
+/**
+ * Factory class for UserstoresApiService.
+ */
 public class UserstoresApiServiceFactory {
 
-   private final static UserstoresApiService service = new UserstoresApiServiceImpl();
+   private final static UserstoresApiService SERVICE = new UserstoresApiServiceImpl();
 
+   /**
+    * Get UserstoresApiService.
+    *
+    * @return UserstoresApiService
+    */
    public static UserstoresApiService getUserstoresApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java
index acd024baf5..d3b617d015 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/core/ServerUserStoreService.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.userstore.v1.core;
@@ -34,7 +36,6 @@
 import org.wso2.carbon.identity.api.server.common.Util;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
-import org.wso2.carbon.identity.api.server.userstore.common.UserStoreConfigServiceHolder;
 import org.wso2.carbon.identity.api.server.userstore.common.UserStoreConstants;
 import org.wso2.carbon.identity.api.server.userstore.v1.core.functions.userstore.AttributeMappingsToApiModel;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.AddUserStorePropertiesRes;
@@ -121,6 +122,12 @@
  */
 public class ServerUserStoreService {
 
+    private final UserStoreConfigService userStoreConfigService;
+
+    private final RealmService realmService;
+
+    private final ClaimMetadataManagementService claimMetadataManagementService;
+
     private static final Log LOG = LogFactory.getLog(ServerUserStoreService.class);
 
     private static final String DUMMY_MESSAGE_ID = "DUMMY-MESSAGE-ID";
@@ -139,6 +146,14 @@ private static boolean isAvailableUserStoreTypes(List<AvailableUserStoreClassesR
         return false;
     }
 
+    public ServerUserStoreService(UserStoreConfigService userStoreConfigService, RealmService realmService,
+                                  ClaimMetadataManagementService claimMetadataManagementService) {
+
+        this.userStoreConfigService = userStoreConfigService;
+        this.realmService = realmService;
+        this.claimMetadataManagementService = claimMetadataManagementService;
+    }
+
     /**
      * Add a userStore {@link UserStoreReq}.
      *
@@ -163,8 +178,6 @@ public UserStoreResponse addUserStore(UserStoreReq userStoreReq) {
                 validateClaimMappings(tenantDomain, localClaimList);
             }
 
-            UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                    .getUserStoreConfigService();
             UserStoreDTO userStoreDTO = createUserStoreDTO(userStoreReq);
             userStoreConfigService.addUserStore(userStoreDTO);
 
@@ -188,8 +201,6 @@ public UserStoreResponse addUserStore(UserStoreReq userStoreReq) {
     public void deleteUserStore(String userstoreDomainId) {
 
         try {
-            UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance().
-                    getUserStoreConfigService();
             userStoreConfigService.deleteUserStore(base64URLDecodeId(userstoreDomainId));
         } catch (IdentityUserStoreClientException e) {
             if (LOG.isDebugEnabled()) {
@@ -211,8 +222,6 @@ public void deleteUserStore(String userstoreDomainId) {
      */
     public UserStoreResponse editUserStore(String domainId, UserStoreReq userStoreReq) {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance().
-                getUserStoreConfigService();
         /*
         domainName and typeName are not allowed to edit. iF domain name wanted to update then use
         userStoreConfigService.updateUserStoreByDomainName(base64URLDecodeId(domainId),
@@ -354,8 +363,6 @@ public String updateUserStoreFromFile(String userstoreDomainID, InputStream file
      */
     public List<AvailableUserStoreClassesRes> getAvailableUserStoreTypes() {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance().
-                getUserStoreConfigService();
         Set<String> classNames;
         try {
             classNames = userStoreConfigService.getAvailableUserStoreClasses();
@@ -401,8 +408,6 @@ public List<UserStoreListResponse> getUserStoreList(Integer limit, Integer offse
 
         handleNotImplementedBehaviour(limit, offset, filter, sort);
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                .getUserStoreConfigService();
         try {
             UserStoreDTO[] userStoreDTOS = userStoreConfigService.getUserStores();
             return buildUserStoreListResponse(userStoreDTOS, requiredAttributes);
@@ -421,7 +426,6 @@ public List<UserStoreListResponse> getUserStoreList(Integer limit, Integer offse
      */
     public UserStoreConfigurationsRes getPrimaryUserStore() {
 
-        RealmService realmService = UserStoreConfigServiceHolder.getInstance().getRealmService();
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         RealmConfiguration realmConfiguration;
         try {
@@ -481,8 +485,6 @@ public UserStoreConfigurationsRes getPrimaryUserStore() {
      */
     public UserStoreConfigurationsRes getUserStoreByDomainId(String domainId) {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                .getUserStoreConfigService();
         List<AddUserStorePropertiesRes> propertiesTobeAdd = new ArrayList<>();
         try {
             UserStoreDTO userStoreDTO = userStoreConfigService.getUserStore(base64URLDecodeId(domainId));
@@ -534,8 +536,6 @@ public UserStoreConfigurationsRes getUserStoreByDomainId(String domainId) {
 
     public MetaUserStoreType getUserStoreManagerProperties(String typeId) {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                .getUserStoreConfigService();
         Set<String> classNames;
         try {
             classNames = userStoreConfigService.getAvailableUserStoreClasses();
@@ -561,8 +561,6 @@ public MetaUserStoreType getUserStoreManagerProperties(String typeId) {
      */
     public ConnectionEstablishedResponse testRDBMSConnection(RDBMSConnectionReq rdBMSConnectionReq) {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                .getUserStoreConfigService();
         ConnectionEstablishedResponse connectionEstablishedResponse = new ConnectionEstablishedResponse();
         boolean isConnectionEstablished;
         connectionEstablishedResponse.setConnection(false);
@@ -666,8 +664,6 @@ private boolean isUserStoreExists(String userStoreDomain) throws UserStoreExcept
      */
     private UserStoreResponse performPatchReplace(UserStoreDTO userStoreDTO) {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                .getUserStoreConfigService();
         try {
             userStoreConfigService.updateUserStore(userStoreDTO, false);
             return buildResponseForPatchReplace(userStoreDTO, userStoreDTO.getProperties());
@@ -687,8 +683,6 @@ private UserStoreResponse performPatchReplace(UserStoreDTO userStoreDTO) {
      */
     private List<ClaimAttributeMapping> getClaimAttributeMappings(String tenantDomain, String userstoreDomainName) {
 
-        ClaimMetadataManagementService claimMetadataManagementService = UserStoreConfigServiceHolder.getInstance()
-                .getClaimMetadataManagementService();
         List<ClaimAttributeMapping> claimAttributeMappingList = new ArrayList<>();
         try {
             List<LocalClaim> localClaimList = claimMetadataManagementService.getLocalClaims(tenantDomain);
@@ -709,8 +703,6 @@ private List<ClaimAttributeMapping> getClaimAttributeMappings(String tenantDomai
 
     private UserStoreDTO buildUserStoreForPatch(String domainId, List<PatchDocument> patchDocuments) {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                .getUserStoreConfigService();
         UserStoreDTO userStoreDTO;
         try {
             userStoreDTO = userStoreConfigService.getUserStore(base64URLDecodeId(domainId));
@@ -801,8 +793,6 @@ private List<AddUserStorePropertiesRes> buildUserStorePropertiesRes(UserStoreReq
      */
     private void updateClaimMappings(String userstoreDomain, String tenantDomain, List<LocalClaim> localClaimList) {
 
-        ClaimMetadataManagementService claimMetadataManagementService = UserStoreConfigServiceHolder.getInstance()
-                .getClaimMetadataManagementService();
         try {
             claimMetadataManagementService.validateClaimAttributeMapping(localClaimList, tenantDomain);
             claimMetadataManagementService.updateLocalClaimMappings(localClaimList, tenantDomain, userstoreDomain);
@@ -820,8 +810,6 @@ private void updateClaimMappings(String userstoreDomain, String tenantDomain, Li
      */
     private void validateClaimMappings(String tenantDomain, List<LocalClaim> localClaimList) {
 
-        ClaimMetadataManagementService claimMetadataManagementService = UserStoreConfigServiceHolder.getInstance()
-                .getClaimMetadataManagementService();
         try {
             claimMetadataManagementService.validateClaimAttributeMapping(localClaimList, tenantDomain);
         } catch (ClaimMetadataException e) {
@@ -1457,8 +1445,6 @@ public UserStoreAttributeMappingResponse getUserStoreAttributeMappings(String ty
                     ERROR_CODE_INVALID_INPUT);
         }
         try {
-            UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance()
-                    .getUserStoreConfigService();
             classNames = userStoreConfigService.getAvailableUserStoreClasses();
             if (CollectionUtils.isEmpty(classNames) || !classNames.contains(userStoreName)) {
                 throw handleException(Response.Status.NOT_FOUND, UserStoreConstants.ErrorMessage.
@@ -1494,8 +1480,6 @@ public UserStoreAttributeMappingResponse getUserStoreAttributeMappings(String ty
     private List<UserStoreAttribute> getAttributeMappings(String userStoreName,
                                                           boolean includeIdentityClaimMappings) {
 
-        UserStoreConfigService userStoreConfigService = UserStoreConfigServiceHolder.getInstance().
-                getUserStoreConfigService();
         try {
             UserStoreAttributeMappings userStoreAttributeMappings = userStoreConfigService.
                     getUserStoreAttributeMappings();
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/factories/ServerUserStoreServiceFactory.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/factories/ServerUserStoreServiceFactory.java
new file mode 100644
index 0000000000..204a4a5b99
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/factories/ServerUserStoreServiceFactory.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.userstore.v1.factories;
+
+import org.wso2.carbon.identity.api.server.userstore.common.UserStoreConfigServiceHolder;
+import org.wso2.carbon.identity.api.server.userstore.v1.core.ServerUserStoreService;
+import org.wso2.carbon.identity.claim.metadata.mgt.ClaimMetadataManagementService;
+import org.wso2.carbon.identity.user.store.configuration.UserStoreConfigService;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for ServerUserStoreService.
+ */
+public class ServerUserStoreServiceFactory {
+
+    private ServerUserStoreServiceFactory() {
+
+    }
+
+    private static class ServerUserStoreServiceHolder {
+
+        private static final ServerUserStoreService SERVICE = createServiceInstance();
+    }
+
+    private static ServerUserStoreService createServiceInstance() {
+
+        UserStoreConfigService userStoreConfigService = getUserStoreConfigService();
+        RealmService realmService = getRealmService();
+        ClaimMetadataManagementService claimMetadataManagementService = getClaimMetadataManagementService();
+
+        return new ServerUserStoreService(userStoreConfigService, realmService, claimMetadataManagementService);
+    }
+
+    /**
+     * Get ServerUserStoreService.
+     *
+     * @return ServerUserStoreService
+     */
+    public static ServerUserStoreService getServerUserStoreService() {
+
+        return ServerUserStoreServiceHolder.SERVICE;
+    }
+
+    private static UserStoreConfigService getUserStoreConfigService() {
+
+        UserStoreConfigService service = UserStoreConfigServiceHolder.getUserStoreConfigService();
+        if (service == null) {
+            throw new IllegalStateException("UserStoreConfigService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static RealmService getRealmService() {
+
+        RealmService service = UserStoreConfigServiceHolder.getRealmService();
+        if (service == null) {
+            throw new IllegalStateException("RealmService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static ClaimMetadataManagementService getClaimMetadataManagementService() {
+
+        ClaimMetadataManagementService service = UserStoreConfigServiceHolder.getClaimMetadataManagementService();
+        if (service == null) {
+            throw new IllegalStateException("ClaimMetadataManagementService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/impl/UserstoresApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/impl/UserstoresApiServiceImpl.java
index 6489b0615c..8b4b39a81e 100644
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/impl/UserstoresApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/java/org/wso2/carbon/identity/api/server/userstore/v1/impl/UserstoresApiServiceImpl.java
@@ -1,28 +1,30 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
  * You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.userstore.v1.impl;
 
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
+import org.apache.http.HttpHeaders;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 import org.wso2.carbon.identity.api.server.common.FileContent;
 import org.wso2.carbon.identity.api.server.userstore.v1.UserstoresApiService;
 import org.wso2.carbon.identity.api.server.userstore.v1.core.ServerUserStoreService;
+import org.wso2.carbon.identity.api.server.userstore.v1.factories.ServerUserStoreServiceFactory;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.ClaimAttributeMapping;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.PatchDocument;
 import org.wso2.carbon.identity.api.server.userstore.v1.model.RDBMSConnectionReq;
@@ -44,8 +46,15 @@
  */
 public class UserstoresApiServiceImpl implements UserstoresApiService {
 
-    @Autowired
-    private ServerUserStoreService serverUserStoreService;
+    private final ServerUserStoreService serverUserStoreService;
+
+    public UserstoresApiServiceImpl() {
+        try {
+            this.serverUserStoreService = ServerUserStoreServiceFactory.getServerUserStoreService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating ServerUserStoreService.", e);
+        }
+    }
 
     @Override
     public Response addUserStore(UserStoreReq userStoreReq) {
@@ -68,7 +77,7 @@ public Response exportUserStoreToFile(String userstoreDomainId, String accept) {
 
         return Response.ok()
                 .type(fileContent.getFileType())
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\""
+                .header("Content-Disposition", "attachment; filename=\""
                         + fileContent.getFileName() + "\"")
                 .header(HttpHeaders.CACHE_CONTROL, "no-cache, no-store, must-revalidate")
                 .header(HttpHeaders.PRAGMA, "no-cache")
@@ -77,8 +86,6 @@ public Response exportUserStoreToFile(String userstoreDomainId, String accept) {
                 .build();
     }
 
-
-
     @Override
     public Response getAvailableUserStoreTypes() {
 
diff --git a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/resources/META-INF/cxf/user-store-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/resources/META-INF/cxf/user-store-v1-cxf.xml
deleted file mode 100644
index 88f288935a..0000000000
--- a/components/org.wso2.carbon.identity.api.server.userstore/org.wso2.carbon.identity.api.server.userstore.v1/src/main/resources/META-INF/cxf/user-store-v1-cxf.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<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">
-    <bean class="org.wso2.carbon.identity.api.server.userstore.v1.impl.UserstoresApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.userstore.v1.core.ServerUserStoreService"/>
-    <bean id="userStoreConfigServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.userstore.common.UserStoreConfigServiceHolder">
-        <property name="userStoreConfigService" ref="userStoreConfigServiceFactoryBean"/>
-        <property name="realmService" ref="RealmServiceFactoryBean"/>
-        <property name="claimMetadataManagementService" ref="ClaimMetadataManagementServiceBean"/>
-    </bean>
-    <bean id="userStoreConfigServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.userstore.common.factory.UserStoreConfigServiceFactory"/>
-    <bean id="RealmServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.userstore.common.factory.RealmServiceFactory"/>
-    <bean id="ClaimMetadataManagementServiceBean"
-          class="org.wso2.carbon.identity.api.server.userstore.common.factory.ClaimMetadataManagementServiceFactory"/>
-</beans>