diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/JDBCSAMLSSOServiceProviderDAOImpl.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/JDBCSAMLSSOServiceProviderDAOImpl.java
index 75fe04279900..dee674c184cf 100644
--- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/JDBCSAMLSSOServiceProviderDAOImpl.java
+++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/JDBCSAMLSSOServiceProviderDAOImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * 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
@@ -87,12 +87,14 @@
 import static org.wso2.carbon.identity.core.dao.SAMLSSOServiceProviderConstants.SAML2TableColumns.SP_ID;
 
 import static java.time.ZoneOffset.UTC;
+/**
+ * Implementation of the SAMLSSOServiceProviderDAO interface for JDBC-based persistence.
+ */
 
 public class JDBCSAMLSSOServiceProviderDAOImpl implements SAMLSSOServiceProviderDAO {
 
     private static final Calendar CALENDAR = Calendar.getInstance(TimeZone.getTimeZone(UTC));
-    private static final Log log = LogFactory.getLog(JDBCSAMLSSOServiceProviderDAOImpl.class);
-    private int tenantId;
+    private static final Log LOG = LogFactory.getLog(JDBCSAMLSSOServiceProviderDAOImpl.class);
     private static final String CERTIFICATE_PROPERTY_NAME = "CERTIFICATE";
     private static final String QUERY_TO_GET_APPLICATION_CERTIFICATE_ID = "SELECT " +
             "META.VALUE FROM SP_INBOUND_AUTH INBOUND, SP_APP SP, SP_METADATA META WHERE SP.ID = INBOUND.APP_ID AND " +
@@ -107,24 +109,24 @@ public JDBCSAMLSSOServiceProviderDAOImpl() {
 
     @Override
     public boolean addServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, int tenantId) throws IdentityException {
-        this.tenantId = tenantId;
+
         validateServiceProvider(serviceProviderDO);
         try {
-            if (processIsServiceProviderExists(serviceProviderDO.getIssuer())) {
+            if (processIsServiceProviderExists(serviceProviderDO.getIssuer(),tenantId)) {
                 debugLog(serviceProviderInfo(serviceProviderDO) + " already exists.");
                 return false;
             }
             NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
             namedJdbcTemplate.withTransaction(template -> {
-                processAddServiceProvider(serviceProviderDO);
-                processAddSPProperties(serviceProviderDO);
+                processAddServiceProvider(serviceProviderDO, tenantId);
+                processAddSPProperties(serviceProviderDO, tenantId);
                 return null;
             });
             debugLog(serviceProviderInfo(serviceProviderDO) + " is added successfully.");
             return true;
         } catch (TransactionException | DataAccessException e) {
             String msg = "Error while adding " + serviceProviderInfo(serviceProviderDO);
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw new IdentityException(msg, e);
         }
     }
@@ -133,20 +135,19 @@ public boolean addServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, in
     public boolean updateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, String currentIssuer, int tenantId)
             throws IdentityException {
 
-        this.tenantId = tenantId;
         validateServiceProvider(serviceProviderDO);
         String newIssuer = serviceProviderDO.getIssuer();
         boolean isIssuerUpdated = !StringUtils.equals(currentIssuer, newIssuer);
 
         try {
-            if (isIssuerUpdated && processIsServiceProviderExists(newIssuer)) {
+            if (isIssuerUpdated && processIsServiceProviderExists(newIssuer, tenantId)) {
                 debugLog(serviceProviderInfo(serviceProviderDO) + " already exists.");
                 return false;
             }
-            int serviceProviderId = processGetServiceProviderId(currentIssuer);
+            int serviceProviderId = processGetServiceProviderId(currentIssuer, tenantId);
             NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
             namedJdbcTemplate.withTransaction(template -> {
-                processUpdateServiceProvider(serviceProviderDO, serviceProviderId);
+                processUpdateServiceProvider(serviceProviderDO, serviceProviderId, tenantId);
                 processUpdateSPProperties(serviceProviderDO, serviceProviderId);
                 return null;
             });
@@ -154,7 +155,7 @@ public boolean updateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO,
             return true;
         } catch (TransactionException | DataAccessException e) {
             String msg = "Error while updating " + serviceProviderInfo(serviceProviderDO);
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw new IdentityException(msg, e);
         }
     }
@@ -162,12 +163,11 @@ public boolean updateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO,
     @Override
     public SAMLSSOServiceProviderDO[] getServiceProviders(int tenantId) throws IdentityException {
 
-        this.tenantId = tenantId;
         List<SAMLSSOServiceProviderDO> serviceProvidersList;
         try {
-            serviceProvidersList = processGetServiceProviders();
+            serviceProvidersList = processGetServiceProviders(tenantId);
         } catch (DataAccessException e) {
-            log.error("Error reading Service Providers", e);
+            LOG.error("Error reading Service Providers", e);
             throw new IdentityException("Error reading Service Providers", e);
         }
         return serviceProvidersList.toArray(new SAMLSSOServiceProviderDO[0]);
@@ -176,20 +176,19 @@ public SAMLSSOServiceProviderDO[] getServiceProviders(int tenantId) throws Ident
     @Override
     public boolean removeServiceProvider(String issuer, int tenantId) throws IdentityException {
 
-        this.tenantId = tenantId;
         if (issuer == null || StringUtils.isEmpty(issuer.trim())) {
             throw new IllegalArgumentException("Trying to delete issuer \'" + issuer + "\'");
         }
         try {
-            if (!processIsServiceProviderExists(issuer)) {
+            if (!processIsServiceProviderExists(issuer, tenantId)) {
                 debugLog("Service Provider with issuer " + issuer + " does not exist.");
                 return false;
             }
-            processDeleteServiceProvider(issuer);
+            processDeleteServiceProvider(issuer, tenantId);
             return true;
         } catch (DataAccessException e) {
             String msg = "Error removing the service provider with name: " + issuer;
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw new IdentityException(msg, e);
         }
     }
@@ -197,12 +196,11 @@ public boolean removeServiceProvider(String issuer, int tenantId) throws Identit
     @Override
     public SAMLSSOServiceProviderDO getServiceProvider(String issuer, int tenantId) throws IdentityException {
 
-        this.tenantId = tenantId;
         SAMLSSOServiceProviderDO serviceProviderDO = null;
 
         try {
             if (isServiceProviderExists(issuer, tenantId)) {
-                serviceProviderDO = processGetServiceProvider(issuer);
+                serviceProviderDO = processGetServiceProvider(issuer, tenantId);
             }
         } catch (DataAccessException e) {
             throw IdentityException.error(String.format(
@@ -233,12 +231,12 @@ public SAMLSSOServiceProviderDO getServiceProvider(String issuer, int tenantId)
     @Override
     public boolean isServiceProviderExists(String issuer, int tenantId) throws IdentityException {
 
-        this.tenantId = tenantId;
+
         try {
-            return processIsServiceProviderExists(issuer);
+            return processIsServiceProviderExists(issuer, tenantId);
         } catch (DataAccessException e) {
             String msg = "Error while checking existence of Service Provider with issuer: " + issuer;
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw new IdentityException(msg, e);
         }
     }
@@ -247,7 +245,7 @@ public boolean isServiceProviderExists(String issuer, int tenantId) throws Ident
     public SAMLSSOServiceProviderDO uploadServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, int tenantId)
             throws IdentityException {
 
-        this.tenantId = tenantId;
+
         validateServiceProvider(serviceProviderDO);
         if (serviceProviderDO.getDefaultAssertionConsumerUrl() == null) {
             throw new IdentityException("No default assertion consumer URL provided for service provider :" +
@@ -255,33 +253,33 @@ public SAMLSSOServiceProviderDO uploadServiceProvider(SAMLSSOServiceProviderDO s
         }
 
         try {
-            if (processIsServiceProviderExists(serviceProviderDO.getIssuer())) {
+            if (processIsServiceProviderExists(serviceProviderDO.getIssuer(), tenantId)) {
                 debugLog(serviceProviderInfo(serviceProviderDO) + " already exists.");
                 throw new IdentityException(serviceProviderInfo(serviceProviderDO) + " already exists.");
             }
             NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
             namedJdbcTemplate.withTransaction(template -> {
-                processAddServiceProvider(serviceProviderDO);
-                processAddSPProperties(serviceProviderDO);
+                processAddServiceProvider(serviceProviderDO, tenantId);
+                processAddSPProperties(serviceProviderDO, tenantId);
                 return null;
             });
             debugLog(serviceProviderInfo(serviceProviderDO) + " is added successfully.");
             return serviceProviderDO;
         } catch (TransactionException | DataAccessException e) {
             String msg = "Error while adding " + serviceProviderInfo(serviceProviderDO);
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw new IdentityException(msg, e);
         }
     }
 
     private void debugLog(String message) {
 
-        if (log.isDebugEnabled()) {
-            log.debug(message);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug(message);
         }
     }
 
-    private boolean processIsServiceProviderExists(String issuer) throws DataAccessException {
+    private boolean processIsServiceProviderExists(String issuer, int tenantId) throws DataAccessException {
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
         Integer serviceProviderId =
@@ -392,7 +390,7 @@ private void addProperties(int serviceProviderId, SAMLSSOServiceProviderDO servi
     }
 
     private void setUpdateServiceProviderParameters(NamedPreparedStatement statement,
-                                              SAMLSSOServiceProviderDO serviceProviderDO) throws SQLException {
+                                              SAMLSSOServiceProviderDO serviceProviderDO, int tenantId) throws SQLException {
 
         statement.setInt(TENANT_ID, tenantId);
         statement.setString(ISSUER, serviceProviderDO.getIssuer());
@@ -428,7 +426,7 @@ private void setUpdateServiceProviderParameters(NamedPreparedStatement statement
     }
 
     private void setServiceProviderParameters(NamedPreparedStatement statement,
-                                              SAMLSSOServiceProviderDO serviceProviderDO) throws SQLException {
+                                              SAMLSSOServiceProviderDO serviceProviderDO, int tenantId) throws SQLException {
         Timestamp currentTime = new Timestamp(new Date().getTime());
         statement.setInt(TENANT_ID, tenantId);
         statement.setString(ISSUER, serviceProviderDO.getIssuer());
@@ -465,7 +463,7 @@ private void setServiceProviderParameters(NamedPreparedStatement statement,
         statement.setTimeStamp(UPDATED_AT, currentTime, CALENDAR);
     }
 
-    private int processGetServiceProviderId(String issuer) throws DataAccessException {
+    private int processGetServiceProviderId(String issuer, int tenantId) throws DataAccessException {
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
         Integer serviceProviderId =
@@ -480,18 +478,18 @@ private int processGetServiceProviderId(String issuer) throws DataAccessExceptio
         return serviceProviderId.intValue();
     }
 
-    private void processAddServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO) throws DataAccessException {
+    private void processAddServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO,int tenantId) throws DataAccessException {
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
         namedJdbcTemplate.executeInsert(SAMLSSOServiceProviderConstants.SQLQueries.ADD_SAML2_SSO_CONFIG,
-                namedPreparedStatement -> setServiceProviderParameters(namedPreparedStatement, serviceProviderDO),
+                namedPreparedStatement -> setServiceProviderParameters(namedPreparedStatement, serviceProviderDO, tenantId),
                 serviceProviderDO, false);
     }
 
-    private void processAddSPProperties(SAMLSSOServiceProviderDO serviceProviderDO) throws DataAccessException {
+    private void processAddSPProperties(SAMLSSOServiceProviderDO serviceProviderDO, int tenantId) throws DataAccessException {
 
         List<ServiceProviderProperty> properties = serviceProviderDO.getMultiValuedProperties();
-        int serviceProviderId = processGetServiceProviderId(serviceProviderDO.getIssuer());
+        int serviceProviderId = processGetServiceProviderId(serviceProviderDO.getIssuer(), tenantId);
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
 
@@ -506,14 +504,14 @@ private void processAddSPProperties(SAMLSSOServiceProviderDO serviceProviderDO)
                 }), serviceProviderDO);
     }
 
-    private void processUpdateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, int serviceProviderId)
+    private void processUpdateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, int serviceProviderId, int tenantId)
             throws DataAccessException {
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
         namedJdbcTemplate.executeUpdate(SAMLSSOServiceProviderConstants.SQLQueries.UPDATE_SAML2_SSO_CONFIG,
                 namedPreparedStatement -> {
                     namedPreparedStatement.setInt(ID, serviceProviderId);
-                    setUpdateServiceProviderParameters(namedPreparedStatement, serviceProviderDO);
+                    setUpdateServiceProviderParameters(namedPreparedStatement, serviceProviderDO, tenantId);
                 });
     }
 
@@ -537,7 +535,7 @@ private void processUpdateSPProperties(SAMLSSOServiceProviderDO serviceProviderD
                 }), serviceProviderDO);
     }
 
-    private SAMLSSOServiceProviderDO processGetServiceProvider(String issuer) throws DataAccessException {
+    private SAMLSSOServiceProviderDO processGetServiceProvider(String issuer, int tenantId) throws DataAccessException {
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
         SAMLSSOServiceProviderDO serviceProviderDO = namedJdbcTemplate.fetchSingleRecord(
@@ -548,12 +546,12 @@ private SAMLSSOServiceProviderDO processGetServiceProvider(String issuer) throws
                 });
 
         if (serviceProviderDO != null) {
-            addProperties(processGetServiceProviderId(issuer), serviceProviderDO);
+            addProperties(processGetServiceProviderId(issuer, tenantId), serviceProviderDO);
         }
         return serviceProviderDO;
     }
 
-    private List<SAMLSSOServiceProviderDO> processGetServiceProviders() throws DataAccessException {
+    private List<SAMLSSOServiceProviderDO> processGetServiceProviders(int tenantId) throws DataAccessException {
 
         List<SAMLSSOServiceProviderDO> serviceProvidersList;
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
@@ -563,12 +561,12 @@ private List<SAMLSSOServiceProviderDO> processGetServiceProviders() throws DataA
                         namedPreparedStatement -> namedPreparedStatement.setInt(TENANT_ID, tenantId));
 
         for (SAMLSSOServiceProviderDO serviceProviderDO : serviceProvidersList) {
-            addProperties(processGetServiceProviderId(serviceProviderDO.getIssuer()), serviceProviderDO);
+            addProperties(processGetServiceProviderId(serviceProviderDO.getIssuer(), tenantId), serviceProviderDO);
         }
         return serviceProvidersList;
     }
 
-    private void processDeleteServiceProvider(String issuer) throws DataAccessException {
+    private void processDeleteServiceProvider(String issuer, int tenantId) throws DataAccessException {
 
         NamedJdbcTemplate namedJdbcTemplate = JdbcUtils.getNewNamedJdbcTemplate();
 
@@ -637,4 +635,4 @@ private int getApplicationCertificateId(String issuer, int tenantId) throws Data
         return certificateId != null ? certificateId : -1;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/RegistrySAMLSSOServiceProviderDAOImpl.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/RegistrySAMLSSOServiceProviderDAOImpl.java
index efb0c824da4f..280fbd990054 100644
--- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/RegistrySAMLSSOServiceProviderDAOImpl.java
+++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/RegistrySAMLSSOServiceProviderDAOImpl.java
@@ -63,7 +63,7 @@ public class RegistrySAMLSSOServiceProviderDAOImpl extends AbstractDAO<SAMLSSOSe
             "META.`VALUE` FROM SP_INBOUND_AUTH INBOUND, SP_APP SP, SP_METADATA META WHERE SP.ID = INBOUND.APP_ID AND " +
             "SP.ID = META.SP_ID AND META.NAME = ? AND INBOUND.INBOUND_AUTH_KEY = ? AND META.TENANT_ID = ?";
 
-    private static Log log = LogFactory.getLog(SAMLSSOServiceProviderDAO.class);
+    private static Log LOG = LogFactory.getLog(RegistrySAMLSSOServiceProviderDAOImpl.class);
 
     public RegistrySAMLSSOServiceProviderDAOImpl() {
 
@@ -274,13 +274,13 @@ public boolean addServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, in
         boolean isErrorOccurred = false;
         try {
             if (registry.resourceExists(path)) {
-                if (log.isDebugEnabled()) {
+                if (LOG.isDebugEnabled()) {
                     if (StringUtils.isNotBlank(serviceProviderDO.getIssuerQualifier())) {
-                        log.debug("SAML2 Service Provider already exists with the same issuer name "
+                        LOG.debug("SAML2 Service Provider already exists with the same issuer name "
                                 + getIssuerWithoutQualifier(serviceProviderDO.getIssuer()) + " and qualifier name "
                                 + serviceProviderDO.getIssuerQualifier());
                     } else {
-                        log.debug("SAML2 Service Provider already exists with the same issuer name "
+                        LOG.debug("SAML2 Service Provider already exists with the same issuer name "
                                 + serviceProviderDO.getIssuer());
                     }
                 }
@@ -292,13 +292,13 @@ public boolean addServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, in
                 registry.beginTransaction();
             }
             registry.put(path, resource);
-            if (log.isDebugEnabled()) {
+            if (LOG.isDebugEnabled()) {
                 if (StringUtils.isNotBlank(serviceProviderDO.getIssuerQualifier())) {
-                    log.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " with issuer "
+                    LOG.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " with issuer "
                             + getIssuerWithoutQualifier(serviceProviderDO.getIssuer()) + " and qualifier " +
                             serviceProviderDO.getIssuerQualifier() + " is added successfully.");
                 } else {
-                    log.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " is added successfully.");
+                    LOG.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " is added successfully.");
                 }
             }
             return true;
@@ -312,7 +312,7 @@ public boolean addServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO, in
             } else {
                 msg = "Error while adding SAML2 Service Provider for issuer: " + serviceProviderDO.getIssuer();
             }
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw IdentityException.error(msg, e);
         } finally {
             commitOrRollbackTransaction(isErrorOccurred);
@@ -508,13 +508,13 @@ public boolean updateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO,
         try {
             // Check if the updated issuer value already exists.
             if (isIssuerUpdated && registry.resourceExists(newPath)) {
-                if (log.isDebugEnabled()) {
+                if (LOG.isDebugEnabled()) {
                     if (StringUtils.isNotBlank(serviceProviderDO.getIssuerQualifier())) {
-                        log.debug("SAML2 Service Provider already exists with the same issuer name "
+                        LOG.debug("SAML2 Service Provider already exists with the same issuer name "
                                 + getIssuerWithoutQualifier(serviceProviderDO.getIssuer()) + " and qualifier name "
                                 + serviceProviderDO.getIssuerQualifier());
                     } else {
-                        log.debug("SAML2 Service Provider already exists with the same issuer name "
+                        LOG.debug("SAML2 Service Provider already exists with the same issuer name "
                                 + serviceProviderDO.getIssuer());
                     }
                 }
@@ -533,13 +533,13 @@ public boolean updateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO,
             // If the issuer is updated, new resource will be created.
             // If the issuer is not updated, existing resource will be updated.
             registry.put(newPath, resource);
-            if (log.isDebugEnabled()) {
+            if (LOG.isDebugEnabled()) {
                 if (StringUtils.isNotBlank(serviceProviderDO.getIssuerQualifier())) {
-                    log.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " with issuer "
+                    LOG.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " with issuer "
                             + getIssuerWithoutQualifier(serviceProviderDO.getIssuer()) + " and qualifier " +
                             serviceProviderDO.getIssuerQualifier() + " is updated successfully.");
                 } else {
-                    log.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " is updated successfully.");
+                    LOG.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " is updated successfully.");
                 }
             }
             return true;
@@ -553,7 +553,7 @@ public boolean updateServiceProvider(SAMLSSOServiceProviderDO serviceProviderDO,
             } else {
                 msg = "Error while updating SAML2 Service Provider for issuer: " + serviceProviderDO.getIssuer();
             }
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw new IdentityException(msg, e);
         } finally {
             commitOrRollbackTransaction(isErrorOccurred);
@@ -576,7 +576,7 @@ public SAMLSSOServiceProviderDO[] getServiceProviders(int tenantId) throws Ident
                 }
             }
         } catch (RegistryException e) {
-            log.error("Error reading Service Providers from Registry", e);
+            LOG.error("Error reading Service Providers from Registry", e);
             throw IdentityException.error("Error reading Service Providers from Registry", e);
         }
         return serviceProvidersList.toArray(new SAMLSSOServiceProviderDO[serviceProvidersList.size()]);
@@ -599,8 +599,8 @@ public boolean removeServiceProvider(String issuer, int tenantId) throws Identit
         boolean isErrorOccurred = false;
         try {
             if (!registry.resourceExists(path)) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Registry resource does not exist for the path: " + path);
+                if (LOG.isDebugEnabled()) {
+                    LOG.debug("Registry resource does not exist for the path: " + path);
                 }
                 return false;
             }
@@ -615,7 +615,7 @@ public boolean removeServiceProvider(String issuer, int tenantId) throws Identit
         } catch (RegistryException e) {
             isErrorOccurred = true;
             String msg = "Error removing the service provider from the registry with name: " + issuer;
-            log.error(msg, e);
+            LOG.error(msg, e);
             throw IdentityException.error(msg, e);
         } finally {
             commitOrRollbackTransaction(isErrorOccurred);
@@ -778,13 +778,13 @@ public SAMLSSOServiceProviderDO uploadServiceProvider(SAMLSSOServiceProviderDO s
         boolean isErrorOccurred = false;
         try {
             if (registry.resourceExists(path)) {
-                if (log.isDebugEnabled()) {
+                if (LOG.isDebugEnabled()) {
                     if (StringUtils.isNotBlank(serviceProviderDO.getIssuerQualifier())) {
-                        log.debug("SAML2 Service Provider already exists with the same issuer name "
+                        LOG.debug("SAML2 Service Provider already exists with the same issuer name "
                                 + getIssuerWithoutQualifier(serviceProviderDO.getIssuer()) + " and qualifier name "
                                 + serviceProviderDO.getIssuerQualifier());
                     } else {
-                        log.debug("SAML2 Service Provider already exists with the same issuer name "
+                        LOG.debug("SAML2 Service Provider already exists with the same issuer name "
                                 + serviceProviderDO.getIssuer());
                     }
                 }
@@ -797,13 +797,13 @@ public SAMLSSOServiceProviderDO uploadServiceProvider(SAMLSSOServiceProviderDO s
 
             Resource resource = createResource(serviceProviderDO, registry);
             registry.put(path, resource);
-            if (log.isDebugEnabled()) {
+            if (LOG.isDebugEnabled()) {
                 if (StringUtils.isNotBlank(serviceProviderDO.getIssuerQualifier())) {
-                    log.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " with issuer "
+                    LOG.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " with issuer "
                             + getIssuerWithoutQualifier(serviceProviderDO.getIssuer()) + " and qualifier " +
                             serviceProviderDO.getIssuerQualifier() + " is added successfully.");
                 } else {
-                    log.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " is added successfully.");
+                    LOG.debug("SAML2 Service Provider " + serviceProviderDO.getIssuer() + " is added successfully.");
                 }
             }
             return serviceProviderDO;
diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactory.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactory.java
index 98005528149e..a5fac128cafb 100644
--- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactory.java
+++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactory.java
@@ -1,3 +1,21 @@
+/*
+ * 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.core.dao;
 
 import org.apache.commons.lang.StringUtils;
@@ -7,6 +25,9 @@
 
 import static org.wso2.carbon.identity.core.dao.SAMLSSOServiceProviderConstants.SAML_STORAGE_CONFIG;
 
+/**
+ * Factory class to create instances of SAMLSSOServiceProviderDAO based on the configured storage type.
+ */
 public class SAMLSSOPersistenceManagerFactory {
 
     private static final Log LOG = LogFactory.getLog(SAMLSSOPersistenceManagerFactory.class);
@@ -14,7 +35,8 @@ public class SAMLSSOPersistenceManagerFactory {
     private static final String HYBRID = "hybrid";
     private static final String REGISTRY = "registry";
 
-    public SAMLSSOServiceProviderDAO buildSSOServiceProviderManager(){
+    public SAMLSSOServiceProviderDAO buildSSOServiceProviderManager() {
+
         SAMLSSOServiceProviderDAO samlSSOServiceProviderDAO = new JDBCSAMLSSOServiceProviderDAOImpl();
         if (StringUtils.isNotBlank(SAML_STORAGE_TYPE)) {
             switch (SAML_STORAGE_TYPE) {
@@ -23,7 +45,7 @@ public SAMLSSOServiceProviderDAO buildSSOServiceProviderManager(){
                     break;
                 case REGISTRY:
                     samlSSOServiceProviderDAO = new RegistrySAMLSSOServiceProviderDAOImpl();
-                    LOG.info("Registry based SAML storage initialized.");
+                    LOG.warn("Registry based SAML storage initialized.");
                     break;
             }
         }
diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/persistence/IdentityPersistenceManager.java b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/persistence/IdentityPersistenceManager.java
index 7d5a810e908e..7d63ee0cb48a 100644
--- a/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/persistence/IdentityPersistenceManager.java
+++ b/components/identity-core/org.wso2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/persistence/IdentityPersistenceManager.java
@@ -22,6 +22,7 @@
 import org.wso2.carbon.identity.core.dao.OpenIDAdminDAO;
 import org.wso2.carbon.identity.core.dao.OpenIDUserDAO;
 import org.wso2.carbon.identity.core.dao.ParameterDAO;
+import org.wso2.carbon.identity.core.dao.SAMLSSOPersistenceManagerFactory;
 import org.wso2.carbon.identity.core.dao.SAMLSSOServiceProviderDAO;
 import org.wso2.carbon.identity.core.dao.RegistrySAMLSSOServiceProviderDAOImpl;
 import org.wso2.carbon.identity.core.dao.XMPPSettingsDAO;
@@ -238,7 +239,8 @@ public void removeOpenIDSignUp(Registry registry, UserRealm realm, String openID
     public boolean addServiceProvider(Registry registry, SAMLSSOServiceProviderDO serviceProviderDO)
             throws IdentityException {
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        SAMLSSOServiceProviderDAO serviceProviderDAO = new RegistrySAMLSSOServiceProviderDAOImpl();
+        SAMLSSOPersistenceManagerFactory samlSSOPersistenceManagerFactory = new SAMLSSOPersistenceManagerFactory();
+        SAMLSSOServiceProviderDAO serviceProviderDAO = samlSSOPersistenceManagerFactory.buildSSOServiceProviderManager();
         return serviceProviderDAO.addServiceProvider(serviceProviderDO, tenantId);
     }
     /**
@@ -250,7 +252,8 @@ public boolean addServiceProvider(Registry registry, SAMLSSOServiceProviderDO se
      */
     public SAMLSSOServiceProviderDO uploadServiceProvider(Registry registry, SAMLSSOServiceProviderDO samlssoServiceProviderDO) throws IdentityException {
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        SAMLSSOServiceProviderDAO serviceProviderDAO = new RegistrySAMLSSOServiceProviderDAOImpl();
+        SAMLSSOPersistenceManagerFactory samlSSOPersistenceManagerFactory = new SAMLSSOPersistenceManagerFactory();
+        SAMLSSOServiceProviderDAO serviceProviderDAO = samlSSOPersistenceManagerFactory.buildSSOServiceProviderManager();
         return serviceProviderDAO.uploadServiceProvider(samlssoServiceProviderDO, tenantId);
     }
 
@@ -263,26 +266,30 @@ public SAMLSSOServiceProviderDO uploadServiceProvider(Registry registry, SAMLSSO
     public SAMLSSOServiceProviderDO[] getServiceProviders(Registry registry)
             throws IdentityException {
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        SAMLSSOServiceProviderDAO serviceProviderDOA = new RegistrySAMLSSOServiceProviderDAOImpl();
-        return serviceProviderDOA.getServiceProviders(tenantId);
+        SAMLSSOPersistenceManagerFactory samlSSOPersistenceManagerFactory = new SAMLSSOPersistenceManagerFactory();
+        SAMLSSOServiceProviderDAO serviceProviderDAO = samlSSOPersistenceManagerFactory.buildSSOServiceProviderManager();
+        return serviceProviderDAO.getServiceProviders(tenantId);
     }
 
     public boolean removeServiceProvider(Registry registry, String issuer) throws IdentityException {
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        SAMLSSOServiceProviderDAO serviceProviderDAO = new RegistrySAMLSSOServiceProviderDAOImpl();
+        SAMLSSOPersistenceManagerFactory samlSSOPersistenceManagerFactory = new SAMLSSOPersistenceManagerFactory();
+        SAMLSSOServiceProviderDAO serviceProviderDAO = samlSSOPersistenceManagerFactory.buildSSOServiceProviderManager();
         return serviceProviderDAO.removeServiceProvider(issuer, tenantId);
     }
 
     public SAMLSSOServiceProviderDO getServiceProvider(Registry registry, String issuer)
             throws IdentityException {
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        SAMLSSOServiceProviderDAO serviceProviderDAO = new RegistrySAMLSSOServiceProviderDAOImpl();
+        SAMLSSOPersistenceManagerFactory samlSSOPersistenceManagerFactory = new SAMLSSOPersistenceManagerFactory();
+        SAMLSSOServiceProviderDAO serviceProviderDAO = samlSSOPersistenceManagerFactory.buildSSOServiceProviderManager();
         return serviceProviderDAO.getServiceProvider(issuer, tenantId);
     }
 
     public boolean isServiceProviderExists(Registry registry, String issuer) throws IdentityException {
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        SAMLSSOServiceProviderDAO serviceProviderDAO = new RegistrySAMLSSOServiceProviderDAOImpl();
+        SAMLSSOPersistenceManagerFactory samlSSOPersistenceManagerFactory = new SAMLSSOPersistenceManagerFactory();
+        SAMLSSOServiceProviderDAO serviceProviderDAO = samlSSOPersistenceManagerFactory.buildSSOServiceProviderManager();
         return serviceProviderDAO.isServiceProviderExists(issuer, tenantId);
     }
 
diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/SAMLSSOServiceProviderManagerTest.java b/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/SAMLSSOServiceProviderManagerTest.java
index 48595911480c..3742404abfe0 100644
--- a/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/SAMLSSOServiceProviderManagerTest.java
+++ b/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/SAMLSSOServiceProviderManagerTest.java
@@ -283,7 +283,6 @@ public void testUploadServiceProvider() throws Exception {
 
         SAMLSSOServiceProviderDO serviceProviderFromStorage =
                 samlSSOServiceProviderManager.getServiceProvider(getIssuerWithQualifier(ISSUER1), TENANT_ID);
-
         assertEquals(serviceProviderFromStorage, sampleServiceProvider1);
     }
 
diff --git a/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactoryTest.java b/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactoryTest.java
index 846ebcf47c70..6c5cf65654fb 100644
--- a/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactoryTest.java
+++ b/components/identity-core/org.wso2.carbon.identity.core/src/test/java/org/wso2/carbon/identity/core/dao/SAMLSSOPersistenceManagerFactoryTest.java
@@ -1,3 +1,21 @@
+/*
+ * 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.core.dao;
 
 import org.testng.annotations.AfterMethod;
diff --git a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json
index 199e02614d84..03bd28992be9 100644
--- a/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json
+++ b/features/identity-core/org.wso2.carbon.identity.core.server.feature/resources/org.wso2.carbon.identity.core.server.feature.default.json
@@ -11,6 +11,7 @@
   "identity_data_source.skip_db_schema_creation": false,
   "identity_data_source.skip_claim_metadata_persistence": true,
   "data_storage_type.notification_templates": "database",
+  "data_storage_type.saml": "database",
   "database.identity_db.pool_options.maxActive": "50",
   "database.identity_db.pool_options.maxWait": "60000",
   "database.identity_db.pool_options.testOnBorrow": "true",