diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/api/explore/MCRAPIExplore.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/api/explore/MCRAPIExplore.java
index 97c561be..fe432163 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/api/explore/MCRAPIExplore.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/api/explore/MCRAPIExplore.java
@@ -36,7 +36,7 @@
 import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.datamodel.common.MCRXMLMetadataManager;
 import org.mycore.frontend.jersey.MCRCacheControl;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition;
 import jakarta.servlet.ServletContext;
@@ -91,7 +91,7 @@ public Response exploreObjects(@QueryParam("start") String start, @QueryParam("r
         //}
         MCRAPIExploreResponse response = new MCRAPIExploreResponse();
 
-        SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+        SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
         SolrQuery q = new SolrQuery("*:*");
         MCRConfiguration2.getString("MCR.API.Explore.FilterQuery").ifPresent(fq -> {
             q.addFilterQuery(fq);
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRIndexBrowserController.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRIndexBrowserController.java
index f5d33f28..e96472de 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRIndexBrowserController.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRIndexBrowserController.java
@@ -22,7 +22,7 @@
 import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.common.config.MCRConfigurationException;
 import org.mycore.jspdocportal.common.search.MCRSearchResultDataBean;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.ws.rs.GET;
@@ -65,7 +65,7 @@ public Response defaultRes(@PathParam("modus") String modus,
             q.setRows(0);
             q.setStart(0);
 
-            SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+            SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
 
             firstSelector.clear();
             try {
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRResolvingController.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRResolvingController.java
index 17146767..2f8ed2b5 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRResolvingController.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRResolvingController.java
@@ -63,7 +63,7 @@
 import org.mycore.datamodel.niofs.MCRPath;
 import org.mycore.frontend.MCRFrontendUtil;
 import org.mycore.services.i18n.MCRTranslation;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 import org.mycore.solr.MCRSolrUtils;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -113,7 +113,7 @@ public Response doGet(@PathParam("path") String uri, @Context HttpServletRequest
         if ("gnd".equals(key)) {
             //"gnd_uri": "http://d-nb.info/gnd/14075444X"
             try {
-                SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+                SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
                 SolrQuery solrQuery = new SolrQuery();
                 solrQuery.setQuery("gnd_uri:" + MCRSolrUtils.escapeSearchValue("http://d-nb.info/gnd/" + value.trim()));
                 solrQuery.setFields("id");
@@ -148,7 +148,7 @@ public Response doGet(@PathParam("path") String uri, @Context HttpServletRequest
                     value = value.replaceFirst("_", "/");
                 }
 
-                SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+                SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
                 SolrQuery solrQuery = new SolrQuery(key + ":" + ClientUtils.escapeQueryChars(value));
                 solrQuery.setRows(1);
                 QueryResponse solrQueryResponse = solrClient.query(solrQuery);
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRViewerController.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRViewerController.java
index 030685d0..267f4167 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRViewerController.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/controller/MCRViewerController.java
@@ -17,7 +17,7 @@
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrDocumentList;
 import org.glassfish.jersey.server.mvc.Viewable;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.ws.rs.DefaultValue;
@@ -66,7 +66,7 @@ public Response doGetWithFile(@PathParam("field") String field, @PathParam("iden
 
         Viewable v = new Viewable("/mcrviewer", model);
 
-        SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+        SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
         String value = identifier;
         if ("recordIdentifier".equals(field) && !value.contains("/")) {
             value = value.replaceFirst("_", "/");
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPGlobalResolverServlet.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPGlobalResolverServlet.java
index 18dcad81..72edcce9 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPGlobalResolverServlet.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPGlobalResolverServlet.java
@@ -47,7 +47,7 @@
 import org.mycore.frontend.MCRFrontendUtil;
 import org.mycore.jspdocportal.common.controller.MCRResolvingController;
 import org.mycore.services.i18n.MCRTranslation;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 import org.mycore.solr.MCRSolrUtils;
 
 import jakarta.servlet.ServletException;
@@ -111,7 +111,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         if ("gnd".equals(key)) {
             //"gnd_uri": "http://d-nb.info/gnd/14075444X"
             try {
-                SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+                SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
                 SolrQuery solrQuery = new SolrQuery();
                 solrQuery.setQuery("gnd_uri:" + MCRSolrUtils.escapeSearchValue("http://d-nb.info/gnd/" + value.trim()));
                 solrQuery.setFields("id");
@@ -141,7 +141,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
                     value = value.replaceFirst("_", "/");
                 }
 
-                SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+                SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
                 SolrQuery solrQuery = new SolrQuery(key + ":" + ClientUtils.escapeQueryChars(value));
                 solrQuery.setRows(1);
                 QueryResponse solrQueryResponse = solrClient.query(solrQuery);
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPIDResolverServlet.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPIDResolverServlet.java
index 0ae3f725..560451e2 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPIDResolverServlet.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/legacy/MCRJSPIDResolverServlet.java
@@ -53,7 +53,7 @@
 import org.mycore.datamodel.niofs.MCRPath;
 import org.mycore.frontend.MCRFrontendUtil;
 import org.mycore.jspdocportal.common.controller.MCRResolvingController;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServlet;
@@ -122,7 +122,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             getServletContext().getRequestDispatcher("/nav?path=~mycore-error&messageKey=IdNotGiven").forward(request,
                 response);
         } else {
-            SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+            SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
             SolrQuery query = new SolrQuery();
             query.setQuery(queryString);
 
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/search/MCRSearchResultDataBean.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/search/MCRSearchResultDataBean.java
index 594a57ea..7565dab4 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/search/MCRSearchResultDataBean.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/search/MCRSearchResultDataBean.java
@@ -48,7 +48,7 @@
 import org.jdom2.Document;
 import org.mycore.access.MCRAccessManager;
 import org.mycore.common.config.MCRConfiguration2;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import jakarta.servlet.http.HttpServletRequest;
 
@@ -122,7 +122,7 @@ public static MCRSearchResultDataBean retrieveSearchresultFromSession(HttpServle
 
     public void doSearch() {
         solrQueryResponse = null;
-        SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+        SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
 
         if (rows >= 0) {
             solrQuery.setRows(rows);
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRClassificationBrowserTag.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRClassificationBrowserTag.java
index a2fbd939..b158f7e1 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRClassificationBrowserTag.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRClassificationBrowserTag.java
@@ -49,7 +49,7 @@
 import org.mycore.datamodel.classifications2.MCRCategoryID;
 import org.mycore.frontend.MCRFrontendUtil;
 import org.mycore.services.i18n.MCRTranslation;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -90,7 +90,7 @@ public class MCRClassificationBrowserTag extends SimpleTagSupport {
                 new CacheLoader<String, Integer>() {
                     @Override
                   public Integer load(String key) throws Exception {
-                        SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+                        SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
                         SolrQuery query = new SolrQuery(key);
                         query.setRows(0);
                         try {
diff --git a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRRetrieveObjectTag.java b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRRetrieveObjectTag.java
index 5de28038..1ed54718 100644
--- a/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRRetrieveObjectTag.java
+++ b/jspdocportal-common-module/src/main/java/org/mycore/jspdocportal/common/taglibs/MCRRetrieveObjectTag.java
@@ -42,7 +42,7 @@
 import org.mycore.datamodel.metadata.MCRObjectID;
 import org.mycore.jspdocportal.common.MCRHibernateTransactionWrapper;
 import org.mycore.jspdocportal.common.bpmn.MCRBPMNUtils;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -151,7 +151,7 @@ public void doTag() throws JspException, IOException {
             PageContext pageContext = (PageContext) getJspContext();
             if(StringUtils.isNotBlank(query)) {
                 try {
-                    SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+                    SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
                     SolrQuery solrQuery = new SolrQuery();
                     solrQuery.setQuery(query);
                     solrQuery.setFields("id");
diff --git a/jspdocportal-diskcache/src/main/java/org/mycore/jspdocportal/diskcache/MCRTemporaryObjectIDNormalizer.java b/jspdocportal-diskcache/src/main/java/org/mycore/jspdocportal/diskcache/MCRTemporaryObjectIDNormalizer.java
index ef76c7ec..8d57e9be 100644
--- a/jspdocportal-diskcache/src/main/java/org/mycore/jspdocportal/diskcache/MCRTemporaryObjectIDNormalizer.java
+++ b/jspdocportal-diskcache/src/main/java/org/mycore/jspdocportal/diskcache/MCRTemporaryObjectIDNormalizer.java
@@ -31,7 +31,7 @@
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.mycore.common.config.MCRConfiguration2;
 import org.mycore.datamodel.metadata.MCRObjectID;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import jakarta.ws.rs.BadRequestException;
 import jakarta.ws.rs.NotFoundException;
@@ -78,7 +78,7 @@ public static MCRObjectID retrieveMCRDerIDfromSOLR(MCRObjectID mcrObjId, String
                 params.set("sort", "derivateOrder asc");
                 QueryResponse solrResponse = null;
                 try {
-                    solrResponse = MCRSolrClientFactory.getMainSolrClient().query(params);
+                    solrResponse = MCRSolrCoreManager.getMainSolrClient().query(params);
                 } catch (Exception e) {
                     LOGGER.error("Error retrieving derivate id from SOLR", e);
                 }
@@ -117,7 +117,7 @@ public static MCRObjectID retrieveMCRObjIDfromSOLR(String mcrid) {
                 params.set("q", key + ":" + ClientUtils.escapeQueryChars(value));
                 QueryResponse solrResponse = null;
                 try {
-                    solrResponse = MCRSolrClientFactory.getMainSolrClient().query(params);
+                    solrResponse = MCRSolrCoreManager.getMainSolrClient().query(params);
                 } catch (Exception e) {
                     LOGGER.error("Error retrieving object id from SOLR", e);
                 }
diff --git a/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/controller/MCRPDFDownloadController.java b/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/controller/MCRPDFDownloadController.java
index b951cf6c..24f3c214 100644
--- a/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/controller/MCRPDFDownloadController.java
+++ b/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/controller/MCRPDFDownloadController.java
@@ -53,7 +53,7 @@
 import org.mycore.jspdocportal.ir.depotapi.HashedDirectoryStructure;
 import org.mycore.jspdocportal.ir.pdfdownload.PDFGenerator;
 import org.mycore.jspdocportal.ir.pdfdownload.PDFGeneratorService;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpServletRequest;
@@ -94,7 +94,7 @@ public Response delete(@Context HttpServletRequest request, @Context ServletCont
             String recordIdentifier = path.endsWith(".pdf") ? path.substring(0, path.lastIndexOf("/")) : path;
             recordIdentifier = recordIdentifier.replace("/", "_");
 
-            SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+            SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
             SolrQuery query = new SolrQuery();
             query.setQuery("recordIdentifier:" + recordIdentifier.replaceFirst("_", "/"));
 
@@ -140,7 +140,7 @@ public Response get(@Context HttpServletRequest request, @Context ServletContext
         String recordIdentifier = path.endsWith(".pdf") ? path.substring(0, path.lastIndexOf("/")) : path;
         recordIdentifier = recordIdentifier.replace("/", "_");
 
-        SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+        SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
         SolrQuery query = new SolrQuery();
         query.setQuery("recordIdentifier:" + recordIdentifier.replaceFirst("_", "/"));
 
diff --git a/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/oai/MCRSetStatePublishedStableCronjob.java b/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/oai/MCRSetStatePublishedStableCronjob.java
index 7d222939..79a52c06 100644
--- a/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/oai/MCRSetStatePublishedStableCronjob.java
+++ b/jspdocportal-ir-module/src/main/java/org/mycore/jspdocportal/ir/oai/MCRSetStatePublishedStableCronjob.java
@@ -16,7 +16,7 @@
 import org.mycore.datamodel.metadata.MCRObject;
 import org.mycore.datamodel.metadata.MCRObjectID;
 import org.mycore.mcr.cronjob.MCRCronjob;
-import org.mycore.solr.MCRSolrClientFactory;
+import org.mycore.solr.MCRSolrCoreManager;
 import org.mycore.util.concurrent.MCRFixedUserCallable;
 
 /**
@@ -51,7 +51,7 @@ public void runJob() {
         try {
             new MCRFixedUserCallable<Boolean>(() -> {
                 if (MCRConfiguration2.getString("MCR.Solr.ServerURL").isPresent()) {
-                    final SolrClient solrClient = MCRSolrClientFactory.getMainSolrClient();
+                    final SolrClient solrClient = MCRSolrCoreManager.getMainSolrClient();
                     final ModifiableSolrParams params = new ModifiableSolrParams();
 
                     params.set("start", 0);