diff --git a/docs/manual/docs/user-guide/associating-resources/doi.md b/docs/manual/docs/user-guide/associating-resources/doi.md
index 314348316884..859835326603 100644
--- a/docs/manual/docs/user-guide/associating-resources/doi.md
+++ b/docs/manual/docs/user-guide/associating-resources/doi.md
@@ -7,9 +7,21 @@ The catalogue support DOI creation using:
 -   [DataCite API](https://support.datacite.org/docs/mds-api-guide).
 -   EU publication office API <https://ra.publications.europa.eu/servlet/ws/doidata?api=medra.org>
 
-Configure the API access point in the `admin console --> settings`:
+Configure the DOI API access point to publish the metadata in the `Admin console --> Settings --> Doi servers`:
 
-![](img/doi-admin-console.png)
+![](img/doi-create-server.png)
+
+Providing the following information:
+
+- `Name`: A descriptive name for the server.
+- `Description`: (Optional) A verbose description of the server.
+- `DataCite API endpoint`: The API url, usually https://mds.datacite.org or https://mds.test.datacite.org for testing.
+- `DataCite username` / `DataCite password`: Credentials required to publish the DOI resources.
+- `Landing page URL template`: The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}. The landing page URL MUST contains the UUID of the record.
+- `Final DOI URL prefix`: (Optional) Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.
+- `DOI pattern`: Default is `{{uuid}}` but the DOI structure can be customized with database id and/or record group eg. `example-{{groupOwner}}-{{id}}`.
+- `DataCite prefix`: Usually looks like `10.xxxx`. You will be allowed to register DOI names only under the prefixes that have been assigned to you.
+- `Publication groups`: (Optional) Select the groups which metadata should be published to the DOI server. If no groups are selected, the server will be provided to publish the metadata that has no other DOI servers related to the metadata owner group.
 
 A record can be downloaded using the DataCite format from the API using: <http://localhost:8080/geonetwork/srv/api/records/da165110-88fd-11da-a88f-000d939bc5d8/formatters/datacite?output=xml>
 
diff --git a/docs/manual/docs/user-guide/associating-resources/img/doi-create-server.png b/docs/manual/docs/user-guide/associating-resources/img/doi-create-server.png
new file mode 100644
index 000000000000..efccf6030657
Binary files /dev/null and b/docs/manual/docs/user-guide/associating-resources/img/doi-create-server.png differ
diff --git a/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java b/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java
index 87871c21d72c..3c8204ea6c80 100644
--- a/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java
+++ b/doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java
@@ -1,5 +1,5 @@
 //=============================================================================
-//===	Copyright (C) 2001-2010 Food and Agriculture Organization of the
+//===	Copyright (C) 2001-2024 Food and Agriculture Organization of the
 //===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
 //===	and United Nations Environment Programme (UNEP)
 //===
@@ -32,8 +32,8 @@
 import org.fao.geonet.domain.*;
 import org.fao.geonet.kernel.AccessManager;
 import org.fao.geonet.kernel.ApplicableSchematron;
-import org.fao.geonet.kernel.DataManager;
 import org.fao.geonet.kernel.SchematronValidator;
+import org.fao.geonet.kernel.datamanager.base.BaseMetadataManager;
 import org.fao.geonet.kernel.datamanager.base.BaseMetadataSchemaUtils;
 import org.fao.geonet.kernel.datamanager.base.BaseMetadataUtils;
 import org.fao.geonet.kernel.schema.MetadataSchema;
@@ -41,12 +41,10 @@
 import org.fao.geonet.kernel.search.IndexingMode;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.fao.geonet.repository.SchematronRepository;
-import org.fao.geonet.utils.Log;
 import org.fao.geonet.utils.Xml;
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.Namespace;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -60,11 +58,9 @@
 
 /**
  * Class to register/unregister DOIs using the Datacite Metadata Store (MDS) API.
+ * <p>
+ * See <a href="https://support.datacite.org/docs/mds-api-guide">...</a>
  *
- * See https://support.datacite.org/docs/mds-api-guide
- *
- * @author Jose García
- * @author Francois Prunayre
  */
 public class DoiManager {
     private static final String DOI_ADD_XSL_PROCESS = "process/doi-add.xsl";
@@ -75,112 +71,52 @@ public class DoiManager {
     public static final String DOI_DEFAULT_URL = "https://doi.org/";
     public static final String DOI_DEFAULT_PATTERN = "{{uuid}}";
 
-    private IDoiClient client;
-    private String doiPrefix;
-    private String doiPattern;
-    private String landingPageTemplate;
-    private boolean initialised = false;
-    private boolean isMedra = false;
-
-    DataManager dm;
-    SettingManager sm;
-    BaseMetadataSchemaUtils schemaUtils;
-
-    @Autowired
-    BaseMetadataUtils metadataUtils;
-
-    @Autowired
-    SchematronValidator validator;
-
-    @Autowired
-    DoiBuilder doiBuilder;
+    private final SettingManager sm;
+    private final BaseMetadataSchemaUtils schemaUtils;
+    private final BaseMetadataManager metadataManager;
+    private final BaseMetadataUtils metadataUtils;
+    private final SchematronValidator validator;
+    private final DoiBuilder doiBuilder;
+    private final SchematronRepository schematronRepository;
+
+
+    public DoiManager(final SettingManager sm, final BaseMetadataSchemaUtils schemaUtils,
+                      final BaseMetadataManager metadataManager, final BaseMetadataUtils metadataUtils,
+                      final SchematronValidator validator, final DoiBuilder doiBuilder,
+                      final SchematronRepository schematronRepository) {
+        this.sm = sm;
+        this.schemaUtils = schemaUtils;
+        this.metadataManager = metadataManager;
+        this.metadataUtils = metadataUtils;
+        this.validator = validator;
+        this.doiBuilder = doiBuilder;
+        this.schematronRepository = schematronRepository;
 
-    @Autowired
-    SchematronRepository schematronRepository;
-
-
-    public DoiManager() {
-        sm = ApplicationContextHolder.get().getBean(SettingManager.class);
-        dm = ApplicationContextHolder.get().getBean(DataManager.class);
-        schemaUtils = ApplicationContextHolder.get().getBean(BaseMetadataSchemaUtils.class);
-
-        loadConfig();
     }
 
-    public boolean isInitialised() {
-        return initialised;
+    private IDoiClient createDoiClient(DoiServer doiServer) {
+        boolean isMedra = isMedraServer(doiServer);
+        return isMedra ?
+            new DoiMedraClient(doiServer.getUrl(), doiServer.getUsername(), doiServer.getPassword(), doiServer.getPublicUrl()) :
+            new DoiDataciteClient(doiServer.getUrl(), doiServer.getUsername(), doiServer.getPassword(), doiServer.getPublicUrl());
     }
 
-    /**
-     * Check parameters and build the client.
-     *
-     */
-    public void loadConfig() {
-        initialised = false;
-        if (sm != null) {
-
-            String serverUrl = sm.getValue(DoiSettings.SETTING_PUBLICATION_DOI_DOIURL);
-            String doiPublicUrl = StringUtils.defaultIfEmpty(
-                    sm.getValue(DoiSettings.SETTING_PUBLICATION_DOI_DOIPUBLICURL),
-                    DOI_DEFAULT_URL);
-            String username = sm.getValue(DoiSettings.SETTING_PUBLICATION_DOI_DOIUSERNAME);
-            String password = sm.getValue(DoiSettings.SETTING_PUBLICATION_DOI_DOIPASSWORD);
-
-            doiPrefix = sm.getValue(DoiSettings.SETTING_PUBLICATION_DOI_DOIKEY);
-            doiPattern = StringUtils.defaultIfEmpty(
-                sm.getValue(DoiSettings.SETTING_PUBLICATION_DOI_DOIPATTERN),
-                DOI_DEFAULT_PATTERN
-            );
-
-            landingPageTemplate = sm.getValue(DoiSettings.SETTING_PUBLICATION_DOI_LANDING_PAGE_TEMPLATE);
-
-            final boolean emptyUrl = StringUtils.isEmpty(serverUrl);
-            final boolean emptyUsername = StringUtils.isEmpty(username);
-            final boolean emptyPassword = StringUtils.isEmpty(password);
-            final boolean emptyPrefix = StringUtils.isEmpty(doiPrefix);
-            if (emptyUrl ||
-                emptyUsername ||
-                emptyPassword ||
-                emptyPrefix) {
-                StringBuilder report = new StringBuilder("DOI configuration is not complete. Check in System Configuration to fill the DOI configuration.");
-                if (emptyUrl) {
-                    report.append("\n* URL MUST be set");
-                }
-                if (emptyUsername) {
-                    report.append("\n* Username MUST be set");
-                }
-                if (emptyPassword) {
-                    report.append("\n* Password MUST be set");
-                }
-                if (emptyPrefix) {
-                    report.append("\n* Prefix MUST be set");
-                }
-                Log.warning(DoiSettings.LOGGER_NAME,
-                    report.toString());
-            } else {
-                Log.debug(DoiSettings.LOGGER_NAME,
-                    "DOI configuration looks perfect.");
-                isMedra = serverUrl.contains(MEDRA_SEARCH_KEY);
-                this.client =
-                    isMedra ?
-                    new DoiMedraClient(serverUrl, username, password, doiPublicUrl) :
-                    new DoiDataciteClient(serverUrl, username, password, doiPublicUrl);
-                initialised = true;
-            }
-        }
-    }
+    public String checkDoiUrl(DoiServer doiServer, AbstractMetadata metadata) throws DoiClientException {
+        checkInitialised(doiServer);
+        checkCanHandleMetadata(doiServer, metadata);
 
-    public String checkDoiUrl(AbstractMetadata metadata) {
-        return doiBuilder.create(doiPattern, doiPrefix, metadata);
+        return doiBuilder.create(doiServer.getPattern(), doiServer.getPrefix(), metadata);
     }
 
-    public Map<String, Boolean> check(ServiceContext serviceContext, AbstractMetadata metadata, Element dataciteMetadata) throws Exception {
+    public Map<String, Boolean> check(ServiceContext serviceContext, DoiServer doiServer, AbstractMetadata metadata, Element dataciteMetadata) throws Exception {
         Map<String, Boolean> conditions = new HashMap<>();
-        checkInitialised();
+        checkInitialised(doiServer);
+        checkCanHandleMetadata(doiServer, metadata);
         conditions.put(DoiConditions.API_CONFIGURED, true);
 
-        String doi =  doiBuilder.create(doiPattern, doiPrefix, metadata);
-        checkPreConditions(metadata, doi);
+        IDoiClient doiClient = createDoiClient(doiServer);
+        String doi = doiBuilder.create(doiServer.getPattern(), doiServer.getPrefix(), metadata);
+        checkPreConditions(doiClient, metadata, doi);
         conditions.put(DoiConditions.RECORD_IS_PUBLIC, true);
         conditions.put(DoiConditions.STANDARD_SUPPORT, true);
 
@@ -188,26 +124,26 @@ public Map<String, Boolean> check(ServiceContext serviceContext, AbstractMetadat
         // ** Convert to DataCite format
         Element dataciteFormatMetadata =
             dataciteMetadata == null ?
-            convertXmlToDataCiteFormat(metadata.getDataInfo().getSchemaId(),
-                metadata.getXmlData(false), doi) : dataciteMetadata;
-        checkPreConditionsOnDataCite(metadata, doi, dataciteFormatMetadata, serviceContext.getLanguage());
+                convertXmlToDataCiteFormat(doiServer, metadata.getDataInfo().getSchemaId(),
+                    metadata.getXmlData(false), doi) : dataciteMetadata;
+        checkPreConditionsOnDataCite(doiClient, metadata, doi, dataciteFormatMetadata, serviceContext.getLanguage());
         conditions.put(DoiConditions.DATACITE_FORMAT_IS_VALID, true);
         return conditions;
     }
 
-    public Map<String, String> register(ServiceContext context, AbstractMetadata metadata) throws Exception {
+    public Map<String, String> register(ServiceContext context, DoiServer doiServer, AbstractMetadata metadata) throws Exception {
         Map<String, String> doiInfo = new HashMap<>(3);
         // The new DOI for this record
-        String doi =  doiBuilder.create(doiPattern, doiPrefix, metadata);
+        String doi = doiBuilder.create(doiServer.getPattern(), doiServer.getPrefix(), metadata);
         doiInfo.put("doi", doi);
 
         // The record in datacite format
         Element dataciteFormatMetadata =
-                convertXmlToDataCiteFormat(metadata.getDataInfo().getSchemaId(),
-                    metadata.getXmlData(false), doi);
+            convertXmlToDataCiteFormat(doiServer, metadata.getDataInfo().getSchemaId(),
+                metadata.getXmlData(false), doi);
 
         try {
-            check(context, metadata, dataciteFormatMetadata);
+            check(context, doiServer, metadata, dataciteFormatMetadata);
         } catch (ResourceAlreadyExistException ignore) {
             // Update DOI
             doiInfo.put("update", "true");
@@ -215,7 +151,8 @@ public Map<String, String> register(ServiceContext context, AbstractMetadata met
             throw e;
         }
 
-        createDoi(context, metadata, doiInfo, dataciteFormatMetadata);
+        IDoiClient doiClient = createDoiClient(doiServer);
+        createDoi(context, doiClient, doiServer, metadata, doiInfo, dataciteFormatMetadata);
         checkDoiCreation(metadata, doiInfo);
 
         return doiInfo;
@@ -230,7 +167,7 @@ public Map<String, String> register(ServiceContext context, AbstractMetadata met
      * @throws IOException
      * @throws JDOMException
      */
-    private void checkPreConditions(AbstractMetadata metadata, String doi) throws DoiClientException, IOException, JDOMException, ResourceAlreadyExistException {
+    private void checkPreConditions(IDoiClient doiClient, AbstractMetadata metadata, String doi) throws DoiClientException, IOException, JDOMException, ResourceAlreadyExistException {
         // Record MUST be public
         AccessManager am = ApplicationContextHolder.get().getBean(AccessManager.class);
         boolean visibleToAll = false;
@@ -239,11 +176,11 @@ private void checkPreConditions(AbstractMetadata metadata, String doi) throws Do
         } catch (Exception e) {
             throw new DoiClientException(String.format(
                 "Failed to check if record '%s' is visible to all for DOI creation." +
-                   " Error is %s.",
+                    " Error is %s.",
                 metadata.getUuid(), e.getMessage()))
                 .withMessageKey("exception.doi.failedVisibilityCheck")
                 .withDescriptionKey("exception.doi.failedVisibilityCheck.description",
-                    new String[]{ metadata.getUuid(), e.getMessage() });
+                    new String[]{metadata.getUuid(), e.getMessage()});
         }
 
         if (!visibleToAll) {
@@ -251,7 +188,7 @@ private void checkPreConditions(AbstractMetadata metadata, String doi) throws Do
                 "Record '%s' is not public and we cannot request a DOI for such a record. Publish this record first.",
                 metadata.getUuid()))
                 .withMessageKey("exception.doi.recordNotPublic")
-                .withDescriptionKey("exception.doi.recordNotPublic.description", new String[]{ metadata.getUuid() });
+                .withDescriptionKey("exception.doi.recordNotPublic.description", new String[]{metadata.getUuid()});
         }
 
         // Record MUST not contains a DOI
@@ -259,7 +196,7 @@ private void checkPreConditions(AbstractMetadata metadata, String doi) throws Do
             String currentDoi = metadataUtils.getDoi(metadata.getUuid());
             if (StringUtils.isNotEmpty(currentDoi)) {
                 // Current doi does not match the one going to be inserted. This is odd
-                String newDoi = client.createPublicUrl(doi);
+                String newDoi = doiClient.createPublicUrl(doi);
                 if (!currentDoi.equals(newDoi)) {
                     throw new DoiClientException(String.format(
                         "Record '%s' already contains a DOI <a href='%s'>%s</a> which is not equal " +
@@ -269,7 +206,7 @@ private void checkPreConditions(AbstractMetadata metadata, String doi) throws Do
                             "an existing DOI.",
                         metadata.getUuid(), currentDoi, currentDoi, newDoi))
                         .withMessageKey("exception.doi.resourcesContainsDoiNotEqual")
-                        .withDescriptionKey("exception.doi.resourcesContainsDoiNotEqual.description", new String[]{ metadata.getUuid(), currentDoi, currentDoi, newDoi });
+                        .withDescriptionKey("exception.doi.resourcesContainsDoiNotEqual.description", new String[]{metadata.getUuid(), currentDoi, currentDoi, newDoi});
                 }
 
                 throw new ResourceAlreadyExistException(String.format(
@@ -279,7 +216,7 @@ private void checkPreConditions(AbstractMetadata metadata, String doi) throws Do
                     metadata.getUuid(), currentDoi, currentDoi))
                     .withMessageKey("exception.doi.resourceContainsDoi")
                     .withDescriptionKey("exception.doi.resourceContainsDoi.description",
-                        new String[]{ metadata.getUuid(), currentDoi, currentDoi });
+                        new String[]{metadata.getUuid(), currentDoi, currentDoi});
             }
         } catch (ResourceNotFoundException e) {
             final MetadataSchema schema = schemaUtils.getSchema(metadata.getDataInfo().getSchemaId());
@@ -299,24 +236,23 @@ private void checkPreConditions(AbstractMetadata metadata, String doi) throws Do
                 schema.getName()))
                 .withMessageKey("exception.doi.missingSavedquery")
                 .withDescriptionKey("exception.doi.missingSavedquery.description",
-                    new String[]{ metadata.getUuid(), schema.getName(),
-                    SavedQuery.DOI_GET, e.getMessage(),
-                    schema.getName() });
+                    new String[]{metadata.getUuid(), schema.getName(),
+                        SavedQuery.DOI_GET, e.getMessage(),
+                        schema.getName()});
         }
     }
 
 
     /**
      * Check conditions on DataCite side.
+     *
      * @param metadata
      * @param doi
      * @param dataciteMetadata
      * @param language
      */
-    private void checkPreConditionsOnDataCite(AbstractMetadata metadata, String doi, Element dataciteMetadata, String language) throws DoiClientException, ResourceAlreadyExistException {
+    private void checkPreConditionsOnDataCite(IDoiClient doiClient, AbstractMetadata metadata, String doi, Element dataciteMetadata, String language) throws DoiClientException, ResourceAlreadyExistException {
         // * DataCite API is up an running ?
-
-
         try {
             List<MetadataValidation> validations = new ArrayList<>();
             List<ApplicableSchematron> applicableSchematron = Lists.newArrayList();
@@ -341,7 +277,7 @@ private void checkPreConditionsOnDataCite(AbstractMetadata metadata, String doi,
             StringBuilder message = new StringBuilder();
             if (!failures.isEmpty()) {
                 message.append("<ul>");
-                failures.forEach(f -> message.append("<li>").append(((Element)f).getTextNormalize()).append("</li>"));
+                failures.forEach(f -> message.append("<li>").append(((Element) f).getTextNormalize()).append("</li>"));
                 message.append("</ul>");
 
                 throw new DoiClientException(String.format(
@@ -349,9 +285,9 @@ private void checkPreConditionsOnDataCite(AbstractMetadata metadata, String doi,
                     metadata.getUuid(), failures.size(), message))
                     .withMessageKey("exception.doi.recordNotConformantMissingInfo")
                     .withDescriptionKey("exception.doi.recordNotConformantMissingInfo.description",
-                        new String[]{ metadata.getUuid(), String.valueOf(failures.size()), message.toString() });
+                        new String[]{metadata.getUuid(), String.valueOf(failures.size()), message.toString()});
             }
-        } catch (IOException|JDOMException e) {
+        } catch (IOException | JDOMException e) {
             throw new DoiClientException(String.format(
                 "Record '%s' is not conform with DataCite validation rules for mandatory fields. Error is: %s. " +
                     "Required fields in DataCite are: identifier, creators, titles, publisher, publicationYear, resourceType. " +
@@ -360,7 +296,7 @@ private void checkPreConditionsOnDataCite(AbstractMetadata metadata, String doi,
                 metadata.getUuid(), e.getMessage(), sm.getNodeURL(), metadata.getUuid()))
                 .withMessageKey("exception.doi.recordNotConformantMissingMandatory")
                 .withDescriptionKey("exception.doi.recordNotConformantMissingMandatory.description",
-                    new String[]{ metadata.getUuid(), e.getMessage(), sm.getNodeURL(), metadata.getUuid() });
+                    new String[]{metadata.getUuid(), e.getMessage(), sm.getNodeURL(), metadata.getUuid()});
         }
 
         // XSD validation
@@ -375,24 +311,24 @@ private void checkPreConditionsOnDataCite(AbstractMetadata metadata, String doi,
                 metadata.getUuid(), e.getMessage(), sm.getNodeURL(), metadata.getUuid()))
                 .withMessageKey("exception.doi.recordInvalid")
                 .withDescriptionKey("exception.doi.recordInvalid.description",
-                    new String[]{ metadata.getUuid(), e.getMessage(), sm.getNodeURL(), metadata.getUuid() });
+                    new String[]{metadata.getUuid(), e.getMessage(), sm.getNodeURL(), metadata.getUuid()});
         }
 
         // * MDS / DOI does not exist already
         // curl -i --user username:password https://mds.test.datacite.org/doi/10.5072/GN
         // Return 404
-        final String doiResponse = client.retrieveDoi(doi);
+        final String doiResponse = doiClient.retrieveDoi(doi);
         if (doiResponse != null) {
             throw new ResourceAlreadyExistException(String.format(
                 "Record '%s' looks to be already published on DataCite with DOI <a href='%s'>'%s'</a>. DOI on Datacite point to: <a href='%s'>%s</a>. " +
                     "If the DOI is not correct, remove it from the record and ask for a new one.",
                 metadata.getUuid(),
-                client.createUrl("doi") + "/" + doi,
+                doiClient.createUrl("doi") + "/" + doi,
                 doi, doi, doiResponse))
                 .withMessageKey("exception.doi.resourceAlreadyPublished")
-                .withDescriptionKey("exception.doi.resourceAlreadyPublished.description", new String[]{  metadata.getUuid(),
-                    client.createUrl("doi") + "/" + doi,
-                    doi, doi, doiResponse });
+                .withDescriptionKey("exception.doi.resourceAlreadyPublished.description", new String[]{metadata.getUuid(),
+                    doiClient.createUrl("doi") + "/" + doi,
+                    doi, doi, doiResponse});
 
         }
         // TODO: Could be relevant at some point to return states (draft/findable)
@@ -404,10 +340,12 @@ private void checkPreConditionsOnDataCite(AbstractMetadata metadata, String doi,
 
     /**
      * Use the DataCite API to register the new DOI.
+     *
      * @param context
      * @param metadata
      */
-    private void createDoi(ServiceContext context, AbstractMetadata metadata, Map<String, String> doiInfo, Element dataciteMetadata) throws Exception {
+    private void createDoi(ServiceContext context, IDoiClient doiClient, DoiServer doiServer,
+                           AbstractMetadata metadata, Map<String, String> doiInfo, Element dataciteMetadata) throws Exception {
         // * Now, let's create the DOI
         // picking a DOI name,
 
@@ -418,29 +356,30 @@ private void createDoi(ServiceContext context, AbstractMetadata metadata, Map<St
         // ** POST metadata
         // 201 Created: operation successful for Datacite,
         // 200 Ok: operation successful for Medra,
-        client.createDoiMetadata(doiInfo.get("doi"), Xml.getString(dataciteMetadata));
+        doiClient.createDoiMetadata(doiInfo.get("doi"), Xml.getString(dataciteMetadata));
 
         // Register the URL for Datacite
-        String landingPage = landingPageTemplate.replace(
-                        "{{uuid}}", metadata.getUuid());
+        String landingPage = doiServer.getLandingPageTemplate().replace(
+            DOI_DEFAULT_PATTERN, metadata.getUuid());
         doiInfo.put("doiLandingPage", landingPage);
         doiInfo.put("doiUrl",
-            client.createPublicUrl(doiInfo.get("doi")));
-        client.createDoi(doiInfo.get("doi"), landingPage);
+            doiClient.createPublicUrl(doiInfo.get("doi")));
+        doiClient.createDoi(doiInfo.get("doi"), landingPage);
 
 
         // Add the DOI in the record
-        Element recordWithDoi = setDOIValue(doiInfo.get("doi"), metadata.getDataInfo().getSchemaId(), metadata.getXmlData(false));
+        Element recordWithDoi = setDOIValue(doiClient, doiInfo.get("doi"), metadata.getDataInfo().getSchemaId(), metadata.getXmlData(false));
         // Update the published copy
         //--- needed to detach md from the document
 
-        dm.updateMetadata(context, metadata.getId() + "", recordWithDoi, false, true,
+        metadataManager.updateMetadata(context, metadata.getId() + "", recordWithDoi, false, true,
             context.getLanguage(), new ISODate().toString(), true, IndexingMode.full);
     }
 
 
     /**
-     * Check that the DOI is properly created.
+     * TODO: Check that the DOI is properly created.
+     *
      * @param metadata
      * @param doi
      */
@@ -451,11 +390,13 @@ private void checkDoiCreation(AbstractMetadata metadata, Map<String, String> doi
     }
 
 
-    public void unregisterDoi(AbstractMetadata metadata, ServiceContext context) throws DoiClientException, ResourceNotFoundException {
-        checkInitialised();
+    public void unregisterDoi(DoiServer doiServer, AbstractMetadata metadata, ServiceContext context) throws DoiClientException, ResourceNotFoundException {
+        checkInitialised(doiServer);
+        checkCanHandleMetadata(doiServer, metadata);
 
-        final String doi = doiBuilder.create(doiPattern, doiPrefix, metadata);
-        final String doiResponse = client.retrieveDoi(doi);
+        IDoiClient doiClient = createDoiClient(doiServer);
+        final String doi = doiBuilder.create(doiServer.getPattern(), doiServer.getPrefix(), metadata);
+        final String doiResponse = doiClient.retrieveDoi(doi);
         if (doiResponse == null) {
             throw new ResourceNotFoundException(String.format(
                 "Record '%s' is not available on DataCite. DOI '%s' does not exist.",
@@ -467,12 +408,12 @@ public void unregisterDoi(AbstractMetadata metadata, ServiceContext context) thr
             Element md = metadata.getXmlData(false);
             String doiUrl = metadataUtils.getDoi(metadata.getUuid());
 
-            client.deleteDoiMetadata(doi);
-            client.deleteDoi(doi);
+            doiClient.deleteDoiMetadata(doi);
+            doiClient.deleteDoi(doi);
 
             Element recordWithoutDoi = removeDOIValue(doiUrl, metadata.getDataInfo().getSchemaId(), md);
 
-            dm.updateMetadata(context, metadata.getId() + "", recordWithoutDoi, false, true,
+            metadataManager.updateMetadata(context, metadata.getId() + "", recordWithoutDoi, false, true,
                 context.getLanguage(), new ISODate().toString(), true, IndexingMode.full);
         } catch (Exception ex) {
             throw new DoiClientException(ex.getMessage());
@@ -481,17 +422,16 @@ public void unregisterDoi(AbstractMetadata metadata, ServiceContext context) thr
 
     /**
      * Sets the DOI URL value in the metadata record using the process DOI_ADD_XSL_PROCESS.
-     *
      */
-    public Element setDOIValue(String doi, String schema, Element md) throws Exception {
-        Path styleSheet = dm.getSchemaDir(schema).resolve(DOI_ADD_XSL_PROCESS);
+    public Element setDOIValue(IDoiClient doiClient, String doi, String schema, Element md) throws Exception {
+        Path styleSheet = schemaUtils.getSchemaDir(schema).resolve(DOI_ADD_XSL_PROCESS);
         boolean exists = Files.exists(styleSheet);
         if (!exists) {
             throw new DoiClientException(String.format("To create a DOI, the schema has to defined how to insert a DOI in the record. The schema_plugins/%s/process/%s was not found. Create the XSL transformation.",
                 schema, DOI_ADD_XSL_PROCESS));
         }
 
-        String doiPublicUrl = client.createPublicUrl("");
+        String doiPublicUrl = doiClient.createPublicUrl("");
 
         Map<String, Object> params = new HashMap<>(1);
         params.put("doi", doi);
@@ -501,10 +441,9 @@ public Element setDOIValue(String doi, String schema, Element md) throws Excepti
 
     /**
      * Sets the DOI URL value in the metadata record using the process DOI_ADD_XSL_PROCESS.
-     *
      */
     public Element removeDOIValue(String doi, String schema, Element md) throws Exception {
-        Path styleSheet = dm.getSchemaDir(schema).resolve(DOI_REMOVE_XSL_PROCESS);
+        Path styleSheet = schemaUtils.getSchemaDir(schema).resolve(DOI_REMOVE_XSL_PROCESS);
         boolean exists = Files.exists(styleSheet);
         if (!exists) {
             throw new DoiClientException(String.format("To remove a DOI, the schema has to defined how to remove a DOI in the record. The schema_plugins/%s/process/%s was not found. Create the XSL transformation.",
@@ -523,24 +462,57 @@ public Element removeDOIValue(String doi, String schema, Element md) throws Exce
      * @return The record converted into the DataCite format.
      * @throws Exception if there is no conversion available.
      */
-    private Element convertXmlToDataCiteFormat(String schema, Element md, String doi) throws Exception {
-        final Path styleSheet = dm.getSchemaDir(schema).resolve(
-            isMedra ? DATACITE_MEDRA_XSL_CONVERSION_FILE : DATACITE_XSL_CONVERSION_FILE);
+    private Element convertXmlToDataCiteFormat(DoiServer doiServer, String schema, Element md, String doi) throws Exception {
+        final Path styleSheet = schemaUtils.getSchemaDir(schema).resolve(
+            isMedraServer(doiServer) ? DATACITE_MEDRA_XSL_CONVERSION_FILE : DATACITE_XSL_CONVERSION_FILE);
         final boolean exists = Files.exists(styleSheet);
         if (!exists) {
             throw new DoiClientException(String.format("To create a DOI, the record needs to be converted to the DataCite format (https://schema.datacite.org/). You need to create a formatter for this in schema_plugins/%s/%s. If the standard is a profile of ISO19139, you can simply point to the ISO19139 formatter.",
                 schema, DATACITE_XSL_CONVERSION_FILE));
         }
 
-        Map<String,Object> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         params.put(DOI_ID_PARAMETER, doi);
         return Xml.transform(md, styleSheet, params);
     }
 
-    private void checkInitialised() throws DoiClientException {
-        if (!initialised) {
-            throw new DoiClientException("DOI configuration is not complete. Check System Configuration and set the DOI configuration.");
+    private void checkInitialised(DoiServer doiServer) throws DoiClientException {
+        final boolean emptyUrl = StringUtils.isEmpty(doiServer.getUrl());
+        final boolean emptyUsername = StringUtils.isEmpty(doiServer.getUsername());
+        final boolean emptyPassword = StringUtils.isEmpty(doiServer.getPassword());
+        final boolean emptyPrefix = StringUtils.isEmpty(doiServer.getPrefix());
+
+        if (emptyUrl ||
+            emptyUsername ||
+            emptyPassword ||
+            emptyPrefix) {
+            throw new DoiClientException("DOI server configuration is not complete. Check DOI server and complete the configuration.");
         }
     }
 
+    /**
+     * Checks if the DOI server can handle the metadata:
+     *  - The DOI server is not publishing metadata for certain metadata group(s) or
+     *  - it publishes metadata from the metadata group owner.
+     *
+     * @param doiServer     The DOI server.
+     * @param metadata      The metadata to process.
+     * @throws DoiClientException
+     */
+    private void checkCanHandleMetadata(DoiServer doiServer, AbstractMetadata metadata) throws DoiClientException {
+        if (!doiServer.getPublicationGroups().isEmpty()) {
+            Integer groupOwner = metadata.getSourceInfo().getGroupOwner();
+
+            if (doiServer.getPublicationGroups().stream().noneMatch(g -> g.getId() == groupOwner)) {
+                throw new DoiClientException(
+                    String.format("DOI server '%s' can not handle the metadata with UUID '%s'.",
+                        doiServer.getName(), metadata.getUuid()));
+            }
+        }
+
+    }
+
+    private boolean isMedraServer(DoiServer doiServer) {
+        return doiServer.getUrl().contains(MEDRA_SEARCH_KEY);
+    }
 }
diff --git a/domain/src/main/java/org/fao/geonet/domain/DoiServer.java b/domain/src/main/java/org/fao/geonet/domain/DoiServer.java
new file mode 100644
index 000000000000..90c93c31c6d4
--- /dev/null
+++ b/domain/src/main/java/org/fao/geonet/domain/DoiServer.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package org.fao.geonet.domain;
+
+import org.fao.geonet.entitylistener.DoiServerEntityListenerManager;
+import org.hibernate.annotations.Type;
+
+import javax.persistence.*;
+import java.util.HashSet;
+import java.util.Set;
+
+@Entity
+@Table(name = "Doiservers")
+@Cacheable
+@Access(AccessType.PROPERTY)
+@EntityListeners(DoiServerEntityListenerManager.class)
+@SequenceGenerator(name = DoiServer.ID_SEQ_NAME, initialValue = 100, allocationSize = 1)
+public class DoiServer extends GeonetEntity {
+    static final String ID_SEQ_NAME = "doiserver_id_seq";
+
+    private int id;
+    private String name;
+    private String description;
+    private String url;
+    private String username;
+    private String password;
+    private String landingPageTemplate;
+    private String publicUrl;
+    private String pattern = "{{uuid}}";
+    private String prefix;
+    private Set<Group> publicationGroups = new HashSet<>();
+
+    /**
+     * Get the id of the DOI server. <p> This is autogenerated and when a new DOI server is created
+     * the DOI server will be assigned a new value. </p>
+     *
+     * @return the id of the DOI server.
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = ID_SEQ_NAME)
+    @Column(nullable = false)
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Set the id of the DOI server. <p> If you want to update an existing DOI server then you should
+     * set this id to the DOI server you want to update and set the other values to the desired
+     * values. </p>
+     *
+     * @param id the id of the group.
+     * @return this DOI server object
+     */
+    public DoiServer setId(int id) {
+        this.id = id;
+        return this;
+    }
+
+    /**
+     * Get the basic/default name of the DOI server. This is non-translated and can be used to look
+     * up the DOI server like an id can. <p> This is a required property. <p> There is a max length
+     * to the name allowed. See the annotation for the length value. </p>
+     *
+     * @return DOI server name
+     */
+    @Column(nullable = false, length = 32)
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set the basic/default name of the DOI server. This is non-translated and can be used to look
+     * up the DOI server like an id can. <p> This is a required property. <p> There is a max length
+     * to the name allowed. See the annotation on {@link #getName()} for the length value. </p>
+     */
+    public DoiServer setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    /**
+     * Get a description of the DOI server.
+     *
+     * @return the description.
+     */
+    @Column(length = 255)
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Set the DOI server description.
+     *
+     * @param description the description.
+     * @return this DOI server object.
+     */
+    public DoiServer setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+
+    /**
+     * Get the API URL for the DOI server.
+     *
+     * @return the DOI server API URL.
+     */
+    @Column(nullable = false, length = 255)
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * Set the REST API configuration URL for the DOI server.
+     *
+     * @param url the server URL.
+     * @return this DOI server object.
+     */
+    public DoiServer setUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    /**
+     * Get the username to use for connecting to the DOI server.
+     *
+     * @return the username.
+     */
+    @Column(length = 128)
+    public String getUsername() {
+        return username;
+    }
+
+    public DoiServer setUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    /**
+     * Get the password to use for connecting to the DOI server.
+     *
+     * @return the password.
+     */
+    @Column(length = 128)
+    @Type(type="encryptedString")
+    public String getPassword() {
+        return password;
+    }
+
+    public DoiServer setPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    /**
+     * Set the DOI landing page URL template.
+     *
+     * @param landingPageTemplate the landing page URL template.
+     * @return this DOI server object.
+     */
+    public DoiServer setLandingPageTemplate(String landingPageTemplate) {
+        this.landingPageTemplate = landingPageTemplate;
+        return this;
+    }
+
+    /**
+     * Get the DOI landing page URL template.
+     *
+     * @return the landing page URL template.
+     */
+    @Column(nullable = false, length = 255)
+    public String getLandingPageTemplate() {
+        return landingPageTemplate;
+    }
+
+    /**
+     * Set the DOI URL prefix.
+     *
+     * @param publicUrl the URL prefix.
+     * @return this DOI server object.
+     */
+    public DoiServer setPublicUrl(String publicUrl) {
+        this.publicUrl = publicUrl;
+        return this;
+    }
+
+    /**
+     * Get the DOI URL prefix.
+     *
+     * @return the URL prefix.
+     */
+    @Column(nullable = false, length = 255)
+    public String getPublicUrl() {
+        return publicUrl;
+    }
+
+    /**
+     * Set the DOI identifier pattern.
+     *
+     * @param pattern the identifier pattern.
+     * @return this DOI server object.
+     */
+    public DoiServer setPattern(String pattern) {
+        this.pattern = pattern;
+        return this;
+    }
+
+    /**
+     * Get the DOI identifier pattern.
+     *
+     * @return the identifier pattern.
+     */
+    @Column(nullable = false, length = 255)
+    public String getPattern() {
+        return pattern;
+    }
+
+
+    /**
+     * Set the DOI prefix.
+     *
+     * @param prefix    the DOI prefix.
+     * @return          this DOI server object.
+     */
+    public DoiServer setPrefix(String prefix) {
+        this.prefix = prefix;
+        return this;
+    }
+
+    /**
+     * Get the DOI prefix.
+     *
+     * @return the DOI prefix.
+     */
+    @Column(nullable = false, length = 15)
+    public String getPrefix() {
+        return prefix;
+    }
+
+    /**
+     * Sets the groups which metadata should be published to the DOI server.
+     *
+     * @param publicationGroups     Publication groups.
+     * @return
+     */
+    public void setPublicationGroups(Set<Group> publicationGroups) {
+        this.publicationGroups = publicationGroups;
+    }
+
+    /**
+     * Get the groups which metadata is published to the DOI server.
+     *
+     * @return  Publication groups.
+     */
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
+    @JoinTable(
+        name = "doiservers_group",
+        joinColumns = @JoinColumn(name = "doiserver_id"),
+        inverseJoinColumns = @JoinColumn(name = "group_id"))
+    public Set<Group> getPublicationGroups() {
+        return publicationGroups;
+    }
+}
diff --git a/domain/src/main/java/org/fao/geonet/entitylistener/DoiServerEntityListenerManager.java b/domain/src/main/java/org/fao/geonet/entitylistener/DoiServerEntityListenerManager.java
new file mode 100644
index 000000000000..8d4af1bdf927
--- /dev/null
+++ b/domain/src/main/java/org/fao/geonet/entitylistener/DoiServerEntityListenerManager.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package org.fao.geonet.entitylistener;
+
+import org.fao.geonet.domain.DoiServer;
+
+import javax.persistence.*;
+
+public class DoiServerEntityListenerManager   extends AbstractEntityListenerManager<DoiServer> {
+    @PrePersist
+    public void prePresist(final DoiServer entity) {
+        handleEvent(PersistentEventType.PrePersist, entity);
+    }
+
+    @PreRemove
+    public void preRemove(final DoiServer entity) {
+        handleEvent(PersistentEventType.PreRemove, entity);
+    }
+
+    @PostPersist
+    public void postPersist(final DoiServer entity) {
+        handleEvent(PersistentEventType.PostPersist, entity);
+    }
+
+    @PostRemove
+    public void postRemove(final DoiServer entity) {
+        handleEvent(PersistentEventType.PostRemove, entity);
+    }
+
+    @PreUpdate
+    public void preUpdate(final DoiServer entity) {
+        handleEvent(PersistentEventType.PreUpdate, entity);
+    }
+
+    @PostUpdate
+    public void postUpdate(final DoiServer entity) {
+        handleEvent(PersistentEventType.PostUpdate, entity);
+    }
+
+    @PostLoad
+    public void postLoad(final DoiServer entity) {
+        handleEvent(PersistentEventType.PostLoad, entity);
+    }
+}
diff --git a/domain/src/main/java/org/fao/geonet/repository/DoiServerRepository.java b/domain/src/main/java/org/fao/geonet/repository/DoiServerRepository.java
new file mode 100644
index 000000000000..25ca32429ce0
--- /dev/null
+++ b/domain/src/main/java/org/fao/geonet/repository/DoiServerRepository.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package org.fao.geonet.repository;
+
+import org.fao.geonet.domain.DoiServer;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.Optional;
+
+public interface DoiServerRepository extends
+    GeonetRepository<DoiServer, Integer>,
+    JpaSpecificationExecutor<DoiServer> {
+
+    Optional<DoiServer> findOneById(int id);
+}
diff --git a/services/src/main/java/org/fao/geonet/api/doiservers/DoiServersApi.java b/services/src/main/java/org/fao/geonet/api/doiservers/DoiServersApi.java
new file mode 100644
index 000000000000..47555a32491d
--- /dev/null
+++ b/services/src/main/java/org/fao/geonet/api/doiservers/DoiServersApi.java
@@ -0,0 +1,330 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package org.fao.geonet.api.doiservers;
+
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.fao.geonet.api.ApiParams;
+import org.fao.geonet.api.doiservers.model.AnonymousDoiServer;
+import org.fao.geonet.api.doiservers.model.DoiServerDto;
+import org.fao.geonet.api.exception.ResourceNotFoundException;
+import org.fao.geonet.domain.AbstractMetadata;
+import org.fao.geonet.domain.DoiServer;
+import org.fao.geonet.kernel.datamanager.IMetadataUtils;
+import org.fao.geonet.repository.DoiServerRepository;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@RequestMapping(value = {
+    "/{portal}/api/doiservers"
+})
+@Tag(name = "doiservers",
+    description = "DOI servers related operations")
+@RestController("doiservers")
+public class DoiServersApi {
+    private static final String API_PARAM_DOISERVER_IDENTIFIER = "DOI server identifier";
+
+    private static final String API_PARAM_DOISERVER_DETAILS = "DOI server details";
+
+    public static final String MSG_DOISERVER_WITH_ID_NOT_FOUND = "DOI server with id '%s' not found.";
+
+
+    private final DoiServerRepository doiServerRepository;
+
+    private final IMetadataUtils metadataUtils;
+
+    DoiServersApi(final DoiServerRepository doiServerRepository, final IMetadataUtils metadataUtils) {
+        this.doiServerRepository = doiServerRepository;
+        this.metadataUtils = metadataUtils;
+
+    }
+
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Get DOI servers"
+    )
+    @GetMapping(
+        produces = {
+            MediaType.APPLICATION_JSON_VALUE
+        })
+    public
+    @ResponseStatus(HttpStatus.OK)
+    @PreAuthorize("hasAuthority('Administrator')")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "List of all DOI servers."),
+        @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_ADMIN)
+    })
+    List<AnonymousDoiServer> getDoiServers() {
+        List<DoiServer> doiServers = doiServerRepository.findAll();
+        List<AnonymousDoiServer> list = new ArrayList<>(doiServers.size());
+        doiServers.stream().forEach(e -> list.add(new AnonymousDoiServer(DoiServerDto.from(e))));
+        return list;
+    }
+
+
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Get DOI servers that can be used with a metadata"
+    )
+    @GetMapping(value = "metadata/{metadataId}",
+        produces = {
+            MediaType.APPLICATION_JSON_VALUE
+        })
+    public
+    @ResponseStatus(HttpStatus.OK)
+    @PreAuthorize("hasAuthority('Administrator')")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "List of all DOI servers where a metadata can be published."),
+        @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_ADMIN)
+    })
+    List<AnonymousDoiServer> getDoiServers(
+        @Parameter(description = "Metadata UUID",
+            required = true,
+            example = "")
+        @PathVariable Integer metadataId) {
+
+        List<DoiServer> doiServers = doiServerRepository.findAll();
+        List<AnonymousDoiServer> list = new ArrayList<>(doiServers.size());
+
+        AbstractMetadata metadata = metadataUtils.findOne(metadataId);
+        Integer groupOwner = metadata.getSourceInfo().getGroupOwner();
+
+        // Find servers related to the metadata groups owner
+        List<DoiServer> doiServersForMetadata = doiServers.stream().filter(
+            s -> s.getPublicationGroups().stream().anyMatch(g -> g.getId() == groupOwner)).collect(Collectors.toList());
+
+        if (doiServersForMetadata.isEmpty()) {
+            // If no servers related to the metadata groups owner,
+            // find the servers that are not related to any metadata group
+            doiServersForMetadata = doiServers.stream()
+                .filter(s -> s.getPublicationGroups().isEmpty())
+                .collect(Collectors.toList());
+        }
+
+        doiServersForMetadata.forEach(s -> {
+            DoiServerDto doiServerDto = DoiServerDto.from(s);
+            list.add(new AnonymousDoiServer(doiServerDto));
+        });
+
+        return list;
+    }
+
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Get a DOI Server"
+    )
+    @GetMapping(value = "/{doiServerId}",
+        produces = {
+            MediaType.APPLICATION_JSON_VALUE
+        })
+    @PreAuthorize("hasAuthority('Administrator')")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "404", description = ApiParams.API_RESPONSE_RESOURCE_NOT_FOUND),
+        @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_EDITOR)
+    })
+    public AnonymousDoiServer getDoiServer(
+        @Parameter(description = API_PARAM_DOISERVER_IDENTIFIER,
+            required = true,
+            example = "")
+        @PathVariable String doiServerId
+    ) throws ResourceNotFoundException {
+        Optional<DoiServer> doiServerOpt = doiServerRepository.findOneById(Integer.parseInt(doiServerId));
+        if (doiServerOpt.isEmpty()) {
+            throw new ResourceNotFoundException(String.format(
+                MSG_DOISERVER_WITH_ID_NOT_FOUND,
+                doiServerId
+            ));
+        } else {
+            return new AnonymousDoiServer(DoiServerDto.from(doiServerOpt.get()));
+        }
+    }
+
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Add a DOI server",
+        description = "Return the id of the newly created DOI server."
+    )
+    @PutMapping(
+        produces = {
+            MediaType.APPLICATION_JSON_VALUE
+        })
+    @PreAuthorize("hasAuthority('Administrator')")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "201", description = "DOI server created."),
+        @ApiResponse(responseCode = "400", description = "Bad parameters."),
+        @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_ADMIN)
+    })
+    @ResponseStatus(HttpStatus.CREATED)
+    public ResponseEntity<Integer> addDoiServer(
+        @Parameter(
+            description = API_PARAM_DOISERVER_DETAILS,
+            required = true
+        )
+        @RequestBody
+        DoiServerDto doiServerDto
+    ) {
+        Optional<DoiServer> existingDoiServerOpt = doiServerRepository.findOneById(doiServerDto.getId());
+        if (existingDoiServerOpt.isPresent()) {
+            throw new IllegalArgumentException(String.format(
+                "DOI server with id '%d' already exists.",
+                doiServerDto.getId()
+            ));
+        } else {
+            doiServerRepository.save(doiServerDto.asDoiServer());
+        }
+        return new ResponseEntity<>(doiServerDto.getId(), HttpStatus.CREATED);
+    }
+
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Update a DOI server"
+    )
+    @PutMapping(
+        value = "/{doiServerId}",
+        produces = {
+            MediaType.APPLICATION_JSON_VALUE
+        })
+    @PreAuthorize("hasAuthority('Administrator')")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "204", description = "DOI server updated."),
+        @ApiResponse(responseCode = "404", description = ApiParams.API_RESPONSE_RESOURCE_NOT_FOUND),
+        @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_ADMIN)
+    })
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void updateDoiServer(
+        @Parameter(description = API_PARAM_DOISERVER_IDENTIFIER,
+            required = true,
+            example = "")
+        @PathVariable Integer doiServerId,
+        @Parameter(description = API_PARAM_DOISERVER_DETAILS,
+            required = true)
+        @RequestBody
+        DoiServerDto doiServerDto
+    ) throws ResourceNotFoundException {
+        Optional<DoiServer> existingMapserverOpt = doiServerRepository.findOneById(doiServerId);
+        if (existingMapserverOpt.isPresent()) {
+            DoiServer doiServer = doiServerDto.asDoiServer();
+
+            doiServerRepository.update(doiServerId, entity -> {
+                entity.setName(doiServer.getName());
+                entity.setDescription(doiServer.getDescription());
+                entity.setUrl(doiServer.getUrl());
+                entity.setPublicUrl(doiServer.getPublicUrl());
+                entity.setLandingPageTemplate(doiServer.getLandingPageTemplate());
+                entity.setPattern(doiServer.getPattern());
+                entity.setPrefix(doiServer.getPrefix());
+                entity.setPublicationGroups(doiServer.getPublicationGroups());
+            });
+        } else {
+            throw new ResourceNotFoundException(String.format(
+                MSG_DOISERVER_WITH_ID_NOT_FOUND,
+                doiServerId
+            ));
+        }
+    }
+
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Remove a DOI server"
+    )
+    @DeleteMapping(
+        value = "/{doiServerId}",
+        produces = {
+            MediaType.APPLICATION_JSON_VALUE
+        })
+    @PreAuthorize("hasAuthority('Administrator')")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "204", description = "DOI server removed."),
+        @ApiResponse(responseCode = "404", description = ApiParams.API_RESPONSE_RESOURCE_NOT_FOUND),
+        @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_ADMIN)
+    })
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void deleteMapserver(
+        @Parameter(description = API_PARAM_DOISERVER_IDENTIFIER,
+            required = true
+        )
+        @PathVariable Integer doiServerId
+    ) throws ResourceNotFoundException {
+        Optional<DoiServer> existingMapserverOpt = doiServerRepository.findOneById(doiServerId);
+        if (existingMapserverOpt.isPresent()) {
+            doiServerRepository.delete(existingMapserverOpt.get());
+        } else {
+            throw new ResourceNotFoundException(String.format(
+                MSG_DOISERVER_WITH_ID_NOT_FOUND,
+                doiServerId
+            ));
+        }
+    }
+
+
+    @io.swagger.v3.oas.annotations.Operation(
+        summary = "Update a DOI server authentication"
+    )
+    @PostMapping(
+        value = "/{doiServerId}/auth",
+        produces = {
+            MediaType.APPLICATION_JSON_VALUE
+        })
+    @PreAuthorize("hasAuthority('Administrator')")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "204", description = "DOI server updated."),
+        @ApiResponse(responseCode = "404", description = ApiParams.API_RESPONSE_RESOURCE_NOT_FOUND),
+        @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_ADMIN)
+    })
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    public void updateMapserverAuth(
+        @Parameter(
+            description = API_PARAM_DOISERVER_IDENTIFIER,
+            required = true,
+            example = "")
+        @PathVariable Integer doiServerId,
+        @Parameter(
+            description = "User name",
+            required = true)
+        @RequestParam
+        String username,
+        @Parameter(
+            description = "Password",
+            required = true)
+        @RequestParam
+        String password
+    ) throws ResourceNotFoundException {
+        Optional<DoiServer> existingMapserverOpt = doiServerRepository.findOneById(doiServerId);
+        if (existingMapserverOpt.isPresent()) {
+            doiServerRepository.update(doiServerId, entity -> {
+                entity.setUsername(username);
+                entity.setPassword(password);
+            });
+        } else {
+            throw new ResourceNotFoundException(String.format(
+                MSG_DOISERVER_WITH_ID_NOT_FOUND,
+                doiServerId
+            ));
+        }
+    }
+}
diff --git a/services/src/main/java/org/fao/geonet/api/doiservers/model/AnonymousDoiServer.java b/services/src/main/java/org/fao/geonet/api/doiservers/model/AnonymousDoiServer.java
new file mode 100644
index 000000000000..2458c8301d86
--- /dev/null
+++ b/services/src/main/java/org/fao/geonet/api/doiservers/model/AnonymousDoiServer.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package org.fao.geonet.api.doiservers.model;
+
+public class AnonymousDoiServer extends DoiServerDto {
+
+    public AnonymousDoiServer(DoiServerDto doiServer) {
+        super();
+        this
+            .setId(doiServer.getId())
+            .setName(doiServer.getName())
+            .setDescription(doiServer.getDescription())
+            .setUrl(doiServer.getUrl())
+            .setLandingPageTemplate(doiServer.getLandingPageTemplate())
+            .setPattern(doiServer.getPattern())
+            .setPublicUrl(doiServer.getPublicUrl())
+            .setPrefix(doiServer.getPrefix())
+            .setPublicationGroups(doiServer.getPublicationGroups());
+    }
+
+    @Override
+    public String getUsername() {
+        return "***";
+    }
+
+    @Override
+    public String getPassword() {
+        return "***";
+    }
+}
diff --git a/services/src/main/java/org/fao/geonet/api/doiservers/model/DoiServerDto.java b/services/src/main/java/org/fao/geonet/api/doiservers/model/DoiServerDto.java
new file mode 100644
index 000000000000..f20514181c17
--- /dev/null
+++ b/services/src/main/java/org/fao/geonet/api/doiservers/model/DoiServerDto.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package org.fao.geonet.api.doiservers.model;
+
+import org.fao.geonet.ApplicationContextHolder;
+import org.fao.geonet.domain.DoiServer;
+import org.fao.geonet.domain.Group;
+import org.fao.geonet.repository.GroupRepository;
+
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class DoiServerDto {
+    private int id;
+    private String name;
+    private String description;
+    private String url;
+    private String username;
+    private String password;
+    private String landingPageTemplate;
+    private String publicUrl;
+    private String pattern = "{{uuid}}";
+    private String prefix;
+    private Set<Integer> publicationGroups = new HashSet<>();
+
+
+    public int getId() {
+        return id;
+    }
+
+    public DoiServerDto setId(int id) {
+        this.id = id;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public DoiServerDto setName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public DoiServerDto setDescription(String description) {
+        this.description = description;
+        return this;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public DoiServerDto setUrl(String url) {
+        this.url = url;
+        return this;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public DoiServerDto setUsername(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public DoiServerDto setPassword(String password) {
+        this.password = password;
+        return this;
+    }
+
+    public String getLandingPageTemplate() {
+        return landingPageTemplate;
+    }
+
+    public DoiServerDto setLandingPageTemplate(String landingPageTemplate) {
+        this.landingPageTemplate = landingPageTemplate;
+        return this;
+    }
+
+    public String getPublicUrl() {
+        return publicUrl;
+    }
+
+    public DoiServerDto setPublicUrl(String publicUrl) {
+        this.publicUrl = publicUrl;
+        return this;
+    }
+
+    public String getPattern() {
+        return pattern;
+    }
+
+    public DoiServerDto setPattern(String pattern) {
+        this.pattern = pattern;
+        return this;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public DoiServerDto setPrefix(String prefix) {
+        this.prefix = prefix;
+        return this;
+    }
+
+    public Set<Integer> getPublicationGroups() {
+        return publicationGroups;
+    }
+
+    public DoiServerDto setPublicationGroups(Set<Integer> publicationGroups) {
+        this.publicationGroups = publicationGroups;
+        return this;
+    }
+
+    public static DoiServerDto from(DoiServer doiServer) {
+        DoiServerDto doiServerDto = new DoiServerDto();
+
+        doiServerDto.setId(doiServer.getId());
+        doiServerDto.setName(doiServer.getName());
+        doiServerDto.setDescription(doiServer.getDescription());
+        doiServerDto.setUrl(doiServer.getUrl());
+        doiServerDto.setUsername(doiServer.getUsername());
+        doiServerDto.setPassword(doiServer.getPassword());
+        doiServerDto.setPattern(doiServer.getPattern());
+        doiServerDto.setLandingPageTemplate(doiServer.getLandingPageTemplate());
+        doiServerDto.setPublicUrl(doiServer.getPublicUrl());
+        doiServerDto.setPrefix(doiServer.getPrefix());
+        doiServerDto.setPublicationGroups(doiServer.getPublicationGroups().stream().map(Group::getId).collect(Collectors.toSet()));
+
+        return doiServerDto;
+    }
+
+    public DoiServer asDoiServer() {
+        DoiServer doiServer = new DoiServer();
+
+        doiServer.setId(getId());
+        doiServer.setName(getName());
+        doiServer.setDescription(getDescription());
+        doiServer.setUrl(getUrl());
+        doiServer.setUsername(getUsername());
+        doiServer.setPassword(getPassword());
+        doiServer.setPattern(getPattern());
+        doiServer.setLandingPageTemplate(getLandingPageTemplate());
+        doiServer.setPublicUrl(getPublicUrl());
+        doiServer.setPrefix(getPrefix());
+
+        GroupRepository groupRepository = ApplicationContextHolder.get().getBean(GroupRepository.class);
+        Set<Group> groups = new HashSet<>();
+        getPublicationGroups().forEach(groupId -> {
+            if (groupId != null) {
+                Optional<Group> g = groupRepository.findById(groupId);
+
+                if (g.isPresent()) {
+                    groups.add(g.get());
+                }
+            }
+        });
+        doiServer.setPublicationGroups(groups);
+
+        return doiServer;
+    }
+}
diff --git a/services/src/main/java/org/fao/geonet/api/records/DoiApi.java b/services/src/main/java/org/fao/geonet/api/records/DoiApi.java
index ce59aa1d8e43..5b6a803cd7fc 100644
--- a/services/src/main/java/org/fao/geonet/api/records/DoiApi.java
+++ b/services/src/main/java/org/fao/geonet/api/records/DoiApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2016 Food and Agriculture Organization of the
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
  * United Nations (FAO-UN), United Nations World Food Programme (WFP)
  * and United Nations Environment Programme (UNEP)
  *
@@ -28,29 +28,28 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jeeves.server.context.ServiceContext;
 import jeeves.services.ReadWriteController;
-import org.fao.geonet.api.API;
 import org.fao.geonet.api.ApiParams;
 import org.fao.geonet.api.ApiUtils;
+import org.fao.geonet.api.exception.ResourceNotFoundException;
 import org.fao.geonet.doi.client.DoiManager;
 import org.fao.geonet.domain.AbstractMetadata;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.fao.geonet.domain.DoiServer;
+import org.fao.geonet.repository.DoiServerRepository;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.util.Map;
+import java.util.Optional;
 
 import static org.fao.geonet.api.ApiParams.API_CLASS_RECORD_OPS;
 import static org.fao.geonet.api.ApiParams.API_CLASS_RECORD_TAG;
 import static org.fao.geonet.api.ApiParams.API_PARAM_RECORD_UUID;
+import static org.fao.geonet.api.doiservers.DoiServersApi.MSG_DOISERVER_WITH_ID_NOT_FOUND;
 
 /**
  * Handle DOI creation.
@@ -60,19 +59,24 @@
 })
 @Tag(name = API_CLASS_RECORD_TAG,
     description = API_CLASS_RECORD_OPS)
-@Controller("doi")
+@RestController("doi")
 @PreAuthorize("hasAuthority('Editor')")
 @ReadWriteController
 public class DoiApi {
 
-    @Autowired
-    private DoiManager doiManager;
+    private final DoiManager doiManager;
+
+    private final DoiServerRepository doiServerRepository;
+
+    DoiApi(final DoiManager doiManager, final DoiServerRepository doiServerRepository) {
+        this.doiManager = doiManager;
+        this.doiServerRepository = doiServerRepository;
+    }
 
     @io.swagger.v3.oas.annotations.Operation(
         summary = "Check that a record can be submitted to DataCite for DOI creation. " +
             "DataCite requires some fields to be populated.")
-    @RequestMapping(value = "/{metadataUuid}/doi/checkPreConditions",
-        method = RequestMethod.GET,
+    @GetMapping(value = "/{metadataUuid}/doi/{doiServerId}/checkPreConditions",
         produces = {
             MediaType.APPLICATION_JSON_VALUE
         }
@@ -86,27 +90,31 @@ public class DoiApi {
         @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_CAN_EDIT)
     })
     public
-    @ResponseBody
     ResponseEntity<Map<String, Boolean>> checkDoiStatus(
         @Parameter(
             description = API_PARAM_RECORD_UUID,
             required = true)
         @PathVariable
             String metadataUuid,
+        @Parameter(
+            description = "DOI server identifier",
+            required = true)
+        @PathVariable
+            Integer doiServerId,
         @Parameter(hidden = true)
             HttpServletRequest request
     ) throws Exception {
         AbstractMetadata metadata = ApiUtils.canEditRecord(metadataUuid, request);
         ServiceContext serviceContext = ApiUtils.createServiceContext(request);
 
-        final Map<String, Boolean> reportStatus = doiManager.check(serviceContext, metadata, null);
+        DoiServer doiServer = retrieveDoiServer(doiServerId);
+        final Map<String, Boolean> reportStatus = doiManager.check(serviceContext, doiServer, metadata, null);
         return new ResponseEntity<>(reportStatus, HttpStatus.OK);
     }
 
     @io.swagger.v3.oas.annotations.Operation(
         summary = "Check the DOI URL created based on current configuration and pattern.")
-    @RequestMapping(value = "/{metadataUuid}/doi/checkDoiUrl",
-        method = RequestMethod.GET,
+    @GetMapping(value = "/{metadataUuid}/doi/{doiServerId}/checkDoiUrl",
         produces = {
             MediaType.TEXT_PLAIN_VALUE
         }
@@ -119,26 +127,30 @@ ResponseEntity<Map<String, Boolean>> checkDoiStatus(
         @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_CAN_EDIT)
     })
     public
-    @ResponseBody
     ResponseEntity<String> checkDoiUrl(
         @Parameter(
             description = API_PARAM_RECORD_UUID,
             required = true)
         @PathVariable
             String metadataUuid,
+        @Parameter(
+            description = "DOI server identifier",
+            required = true)
+        @PathVariable
+            Integer doiServerId,
         @Parameter(hidden = true)
             HttpServletRequest request
     ) throws Exception {
         AbstractMetadata metadata = ApiUtils.canEditRecord(metadataUuid, request);
 
-        return new ResponseEntity<>(doiManager.checkDoiUrl(metadata), HttpStatus.OK);
+        DoiServer doiServer = retrieveDoiServer(doiServerId);
+        return new ResponseEntity<>(doiManager.checkDoiUrl(doiServer, metadata), HttpStatus.OK);
     }
 
 
     @io.swagger.v3.oas.annotations.Operation(
         summary = "Submit a record to the Datacite metadata store in order to create a DOI.")
-    @RequestMapping(value = "/{metadataUuid}/doi",
-        method = RequestMethod.PUT,
+    @PutMapping(value = "/{metadataUuid}/doi/{doiServerId}",
         produces = {
             MediaType.APPLICATION_JSON_VALUE
         }
@@ -151,13 +163,17 @@ ResponseEntity<String> checkDoiUrl(
         @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_CAN_EDIT)
     })
     public
-    @ResponseBody
     ResponseEntity<Map<String, String>> createDoi(
         @Parameter(
             description = API_PARAM_RECORD_UUID,
             required = true)
         @PathVariable
             String metadataUuid,
+        @Parameter(
+            description = "DOI server identifier",
+            required = true)
+        @PathVariable
+            Integer doiServerId,
         @Parameter(hidden = true)
             HttpServletRequest request,
         @Parameter(hidden = true)
@@ -166,7 +182,8 @@ ResponseEntity<Map<String, String>> createDoi(
         AbstractMetadata metadata = ApiUtils.canEditRecord(metadataUuid, request);
         ServiceContext serviceContext = ApiUtils.createServiceContext(request);
 
-        Map<String, String> doiInfo = doiManager.register(serviceContext, metadata);
+        DoiServer doiServer = retrieveDoiServer(doiServerId);
+        Map<String, String> doiInfo = doiManager.register(serviceContext, doiServer, metadata);
         return new ResponseEntity<>(doiInfo, HttpStatus.CREATED);
     }
 
@@ -174,8 +191,7 @@ ResponseEntity<Map<String, String>> createDoi(
 
     @io.swagger.v3.oas.annotations.Operation(
         summary = "Remove a DOI (this is not recommended, DOI are supposed to be persistent once created. This is mainly here for testing).")
-    @RequestMapping(value = "/{metadataUuid}/doi",
-        method = RequestMethod.DELETE,
+    @DeleteMapping(value = "/{metadataUuid}/doi/{doiServerId}",
         produces = {
             MediaType.APPLICATION_JSON_VALUE
         }
@@ -188,8 +204,7 @@ ResponseEntity<Map<String, String>> createDoi(
         @ApiResponse(responseCode = "403", description = ApiParams.API_RESPONSE_NOT_ALLOWED_ONLY_ADMIN)
     })
     public
-    @ResponseBody
-    ResponseEntity unregisterDoi(
+    ResponseEntity<Void> unregisterDoi(
         @Parameter(
             description = API_PARAM_RECORD_UUID,
             required = true)
@@ -197,16 +212,34 @@ ResponseEntity unregisterDoi(
             String metadataUuid,
         @Parameter(hidden = true)
             HttpServletRequest request,
+        @Parameter(
+            description = "DOI server identifier",
+            required = true)
+        @PathVariable
+            Integer doiServerId,
         @Parameter(hidden = true)
             HttpSession session
     ) throws Exception {
         AbstractMetadata metadata = ApiUtils.canEditRecord(metadataUuid, request);
         ServiceContext serviceContext = ApiUtils.createServiceContext(request);
 
-        doiManager.unregisterDoi(metadata, serviceContext);
+        DoiServer doiServer = retrieveDoiServer(doiServerId);
+        doiManager.unregisterDoi(doiServer, metadata, serviceContext);
         return new ResponseEntity<>(HttpStatus.NO_CONTENT);
     }
 
+    private DoiServer retrieveDoiServer(Integer doiServerId) throws ResourceNotFoundException {
+        Optional<DoiServer> doiServerOpt = doiServerRepository.findOneById(doiServerId);
+        if (doiServerOpt.isEmpty()) {
+            throw new ResourceNotFoundException(String.format(
+                MSG_DOISERVER_WITH_ID_NOT_FOUND,
+                doiServerId
+            ));
+        }
+
+        return doiServerOpt.get();
+    }
+
 //    TODO: At some point we may add support for DOI States management
 //    https://support.datacite.org/docs/mds-api-guide#section-doi-states
 }
diff --git a/services/src/main/java/org/fao/geonet/api/site/SiteApi.java b/services/src/main/java/org/fao/geonet/api/site/SiteApi.java
index d39d42f5134d..425257a0671b 100644
--- a/services/src/main/java/org/fao/geonet/api/site/SiteApi.java
+++ b/services/src/main/java/org/fao/geonet/api/site/SiteApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2023 Food and Agriculture Organization of the
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
  * United Nations (FAO-UN), United Nations World Food Programme (WFP)
  * and United Nations Environment Programme (UNEP)
  *
@@ -48,7 +48,6 @@
 import org.fao.geonet.api.site.model.SettingsListResponse;
 import org.fao.geonet.api.tools.i18n.LanguageUtils;
 import org.fao.geonet.constants.Geonet;
-import org.fao.geonet.doi.client.DoiManager;
 import org.fao.geonet.domain.*;
 import org.fao.geonet.exceptions.OperationAbortedEx;
 import org.fao.geonet.index.Status;
@@ -181,8 +180,6 @@ public static void reloadServices(ServiceContext context) throws Exception {
             context.error(e);
             throw new OperationAbortedEx("Parameters saved but cannot set proxy information: " + e.getMessage());
         }
-        DoiManager doiManager = gc.getBean(DoiManager.class);
-        doiManager.loadConfig();
 
         HarvestManager harvestManager = context.getBean(HarvestManager.class);
         harvestManager.rescheduleActiveHarvesters();
diff --git a/web-ui/src/main/resources/catalog/components/doi/DoiDirective.js b/web-ui/src/main/resources/catalog/components/doi/DoiDirective.js
index 14a49dad0481..364218dd450e 100644
--- a/web-ui/src/main/resources/catalog/components/doi/DoiDirective.js
+++ b/web-ui/src/main/resources/catalog/components/doi/DoiDirective.js
@@ -44,10 +44,24 @@
           scope.response = {};
           scope.isUpdate = angular.isDefined(scope.doiUrl);
 
+          scope.doiServers = [];
+          scope.selectedDoiServer = null;
+
+          gnDoiService.getDoiServersForMetadata(scope.uuid).then(function (response) {
+            scope.doiServers = response.data;
+            if (scope.doiServers.length > 0) {
+              scope.selectedDoiServer = scope.doiServers[0].id;
+            }
+          });
+
+          scope.updateDoiServer = function () {
+            scope.response = {};
+          };
+
           scope.check = function () {
             scope.response = {};
             scope.response["check"] = null;
-            return gnDoiService.check(scope.uuid).then(
+            return gnDoiService.check(scope.uuid, scope.selectedDoiServer).then(
               function (r) {
                 scope.response["check"] = r;
                 scope.isUpdate = angular.isDefined(scope.doiUrl);
@@ -60,7 +74,7 @@
           };
 
           scope.create = function () {
-            return gnDoiService.create(scope.uuid).then(
+            return gnDoiService.create(scope.uuid, scope.selectedDoiServer).then(
               function (r) {
                 scope.response["create"] = r;
                 delete scope.response["check"];
diff --git a/web-ui/src/main/resources/catalog/components/doi/DoiService.js b/web-ui/src/main/resources/catalog/components/doi/DoiService.js
index e21427f8c31d..cee4d27b3ff8 100644
--- a/web-ui/src/main/resources/catalog/components/doi/DoiService.js
+++ b/web-ui/src/main/resources/catalog/components/doi/DoiService.js
@@ -33,11 +33,39 @@
     "$http",
     "gnConfig",
     function ($http, gnConfig) {
-      function check(id) {
-        return $http.get("../api/records/" + id + "/doi/checkPreConditions");
+      /**
+       * Returns a promise to validate a metadata to be published on a DOI server.
+       *
+       * @param id
+       * @param doiServerId
+       * @returns {*}
+       */
+      function check(id, doiServerId) {
+        return $http.get(
+          "../api/records/" + id + "/doi/" + doiServerId + "/checkPreConditions"
+        );
       }
-      function create(id) {
-        return $http.put("../api/records/" + id + "/doi");
+
+      /**
+       * Returns a promise to publish a metadata on a DOI server.
+       *
+       * @param id
+       * @param doiServerId
+       * @returns {*}
+       */
+      function create(id, doiServerId) {
+        return $http.put("../api/records/" + id + "/doi/" + doiServerId);
+      }
+
+      /**
+       * Returns a promise to retrieve the list of DOI servers
+       * where a metadata can be published.
+       *
+       * @param metadataId
+       * @returns {*}
+       */
+      function getDoiServersForMetadata(metadataId) {
+        return $http.get("../api/doiservers/metadata/" + metadataId);
       }
 
       function isDoiApplicableForMetadata(md) {
@@ -73,7 +101,8 @@
         check: check,
         create: create,
         isDoiApplicableForMetadata: isDoiApplicableForMetadata,
-        canPublishDoiForResource: canPublishDoiForResource
+        canPublishDoiForResource: canPublishDoiForResource,
+        getDoiServersForMetadata: getDoiServersForMetadata
       };
     }
   ]);
diff --git a/web-ui/src/main/resources/catalog/components/doi/partials/doiwidget.html b/web-ui/src/main/resources/catalog/components/doi/partials/doiwidget.html
index c1a6a8dc3bc3..2edf7718127c 100644
--- a/web-ui/src/main/resources/catalog/components/doi/partials/doiwidget.html
+++ b/web-ui/src/main/resources/catalog/components/doi/partials/doiwidget.html
@@ -5,6 +5,16 @@ <h2 data-translate="" data-ng-hide="xsMode">createDoiForRecord</h2>
   </div>
 
   <div class="btn-group" data-ng-class="{'btn-group-xs': xsMode}" role="group">
+    <select
+      class="form-control"
+      data-ng-change="updateDoiServer()"
+      data-ng-show="doiServers.length > 1"
+      data-ng-model="selectedDoiServer"
+      data-ng-options="s.id as s.name for s in doiServers"
+    >
+      >
+    </select>
+
     <button
       class="btn btn-default"
       data-gn-click-and-spin="check()"
diff --git a/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDistribution.html b/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDistribution.html
index 900d7f035089..7f05a72904c8 100644
--- a/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDistribution.html
+++ b/web-ui/src/main/resources/catalog/components/metadataactions/partials/relatedDistribution.html
@@ -204,7 +204,7 @@ <h3 class="flex-grow">
     </p>
 
     <div
-      data-ng-if="canPublishDoiForResource(md, linkForEdit)"
+      data-ng-if="canPublishDoiForResource(md, linkForEdit, doiServers)"
       data-gn-doi-wizard="md.uuid"
       data-gn-doi-url="r.locUrl"
       data-xs-mode="true"
diff --git a/web-ui/src/main/resources/catalog/js/admin/DoiServerController.js b/web-ui/src/main/resources/catalog/js/admin/DoiServerController.js
new file mode 100644
index 000000000000..54207c3c24fd
--- /dev/null
+++ b/web-ui/src/main/resources/catalog/js/admin/DoiServerController.js
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+(function () {
+  goog.provide("gn_doiserver_controller");
+
+  var module = angular.module("gn_doiserver_controller", []);
+
+  /**
+   * GnDoiServerController provides management interface
+   * for DOI server configuration used for DOI publication.
+   *
+   */
+  module.controller("GnDoiServerController", [
+    "$scope",
+    "$http",
+    "$rootScope",
+    "$translate",
+    function ($scope, $http, $rootScope, $translate) {
+      $scope.doiServers = [];
+      $scope.doiServerSelected = null;
+      $scope.doiServerUpdated = false;
+      $scope.doiServerSearch = "";
+      $scope.isUpdate = null;
+      $scope.selectedPublicationGroups = [];
+      $scope.groupsForPublication = [];
+
+      // Load groups
+      function loadGroups() {
+        $http.get("../api/groups").then(
+          function (response) {
+            $scope.groupsForPublication = response.data;
+
+            var getLabel = function (g) {
+              return g.label[$scope.lang] || g.name;
+            };
+
+            angular.forEach($scope.groupsForPublication, function (u) {
+              u.langlabel = getLabel(u);
+            });
+          },
+          function (response) {
+            // TODO
+          }
+        );
+      }
+
+      loadGroups();
+
+      function loadDoiServers() {
+        $scope.doiServerSelected = null;
+        if ($scope.gnDoiServerEdit) {
+          $scope.gnDoiServerEdit.$setPristine();
+        }
+
+        $http.get("../api/doiservers").then(function (response) {
+          $scope.doiServers = response.data;
+        });
+      }
+
+      $scope.updatingDoiServer = function () {
+        $scope.doiServerUpdated = true;
+      };
+
+      $scope.selectDoiServer = function (v) {
+        if ($scope.gnDoiServerEdit.$dirty) {
+          if (!confirm($translate.instant("formConfirmExit"))) {
+            return;
+          }
+        }
+
+        $scope.isUpdate = true;
+        $scope.doiServerUpdated = false;
+        $scope.doiServerSelected = v;
+        $scope.selectedPublicationGroups = [];
+
+        for (var i = 0; i < v.publicationGroups.length; i++) {
+          var group = _.find($scope.groupsForPublication, { id: v.publicationGroups[i] });
+          if (group !== undefined) {
+            $scope.selectedPublicationGroups.push(group);
+          }
+        }
+
+        $scope.gnDoiServerEdit.$setPristine();
+      };
+
+      $scope.addDoiServer = function () {
+        $scope.isUpdate = false;
+        $scope.selectedPublicationGroups = [];
+        $scope.doiServerSelected = {
+          id: "",
+          name: "",
+          description: "",
+          url: "",
+          username: "",
+          password: "",
+          landingPageTemplate:
+            "http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}",
+          publicUrl: "",
+          pattern: "{{uuid}}",
+          prefix: "",
+          publicationGroups: []
+        };
+      };
+      $scope.saveDoiServer = function () {
+        $scope.doiServerSelected.publicationGroups = _.map(
+          $scope.selectedPublicationGroups,
+          "id"
+        );
+
+        $http
+          .put(
+            "../api/doiservers" +
+              ($scope.isUpdate ? "/" + $scope.doiServerSelected.id : ""),
+            $scope.doiServerSelected
+          )
+          .then(
+            function (response) {
+              loadDoiServers();
+              $rootScope.$broadcast("StatusUpdated", {
+                msg: $translate.instant("doiServerUpdated"),
+                timeout: 2,
+                type: "success"
+              });
+            },
+            function (response) {
+              $rootScope.$broadcast("StatusUpdated", {
+                title: $translate.instant("doiServerUpdateError"),
+                error: response.data,
+                timeout: 0,
+                type: "danger"
+              });
+            }
+          );
+      };
+
+      $scope.resetPassword = null;
+      $scope.resetUsername = null;
+      $scope.resetDoiServerPassword = function () {
+        $scope.resetPassword = null;
+        $scope.resetUsername = null;
+        $("#passwordResetModal").modal();
+      };
+
+      $scope.saveNewPassword = function () {
+        var data = $.param({
+          username: $scope.resetUsername,
+          password: $scope.resetPassword
+        });
+
+        $http
+          .post("../api/doiservers/" + $scope.doiServerSelected.id + "/auth", data, {
+            headers: { "Content-Type": "application/x-www-form-urlencoded" }
+          })
+          .then(
+            function (response) {
+              $scope.resetPassword = null;
+              $("#passwordResetModal").modal("hide");
+            },
+            function (response) {
+              // TODO
+            }
+          );
+      };
+
+      $scope.deleteDoiServerConfig = function () {
+        $("#gn-confirm-remove-doiserver").modal("show");
+      };
+
+      $scope.confirmDeleteDoiServerConfig = function () {
+        $http.delete("../api/doiservers/" + $scope.doiServerSelected.id).then(
+          function (response) {
+            loadDoiServers();
+          },
+          function (response) {
+            $rootScope.$broadcast("StatusUpdated", {
+              title: $translate.instant("doiServerDeleteError"),
+              error: response.data,
+              timeout: 0,
+              type: "danger"
+            });
+          }
+        );
+      };
+      loadDoiServers();
+    }
+  ]);
+})();
diff --git a/web-ui/src/main/resources/catalog/js/admin/SettingsController.js b/web-ui/src/main/resources/catalog/js/admin/SettingsController.js
index c3bafb3ada8e..8f3f31e079fb 100644
--- a/web-ui/src/main/resources/catalog/js/admin/SettingsController.js
+++ b/web-ui/src/main/resources/catalog/js/admin/SettingsController.js
@@ -35,6 +35,7 @@
   goog.require("gn_system_settings_controller");
   goog.require("gn_languages_controller");
   goog.require("gn_static_pages_controller");
+  goog.require("gn_doiserver_controller");
 
   var module = angular.module("gn_settings_controller", [
     "gn_system_settings_controller",
@@ -47,7 +48,8 @@
     "gn_metadata_identifier_templates_controller",
     "gn_cssstyle_settings_controller",
     "gn_scroll_spy",
-    "gn_static_pages_controller"
+    "gn_static_pages_controller",
+    "gn_doiserver_controller"
   ]);
 
   module.controller("GnSettingsController", [
@@ -126,6 +128,12 @@
             label: "manageMapServers",
             href: "#/settings/mapservers"
           },
+          {
+            type: "doiservers",
+            icon: "fa-globe",
+            label: "manageDoiServers",
+            href: "#/settings/doiservers"
+          },
           {
             type: "static-pages",
             icon: "fa-link",
diff --git a/web-ui/src/main/resources/catalog/locales/ca-admin.json b/web-ui/src/main/resources/catalog/locales/ca-admin.json
index b3a272c60bd6..919d6027cdd3 100644
--- a/web-ui/src/main/resources/catalog/locales/ca-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/ca-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publicació",
-    "system/publication/doi/doienabled": "Permetre la creació de Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Un Digital Object Identifier (DOI) és una cadena alfanumèrica que s'assigna a un objecte per a identificar-lo unívocament. Queda lligat a la descripció de la metadada de l'objecte, així com a una localització digital, com ara una URL, on tots els detalls de l'objecte són accessibles. Més informació disponible a <a href=\"https://www.datacite.org/dois.html\">DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "Punt d'accés de l'API DataCite",
-    "system/publication/doi/doiurl-help": "Usualment, https://mds.datacite.org o https://mds.test.datacite.org per a validació.",
-    "system/publication/doi/doiusername": "El teu usuari DataCite",
-    "system/publication/doi/doipassword": "La teva contrasenya DataCite",
-    "system/publication/doi/doipassword-help": "Totes les peticions a API MDS requereixen d'identificació. Per aquesta raó, només es suporta l'ús de connexions segures (HTTPS). El DataCite Metadata Store (MDS) utilitza d'identificació HTML bàsica. Podeu obtenir un compte <a href='https://support.datacite.org/docs/obtain-test-account'>aquí</a>.",
-    "system/publication/doi/doikey": "El teu prefix DataCite",
-    "system/publication/doi/doikey-help": "Usualment s'assembla a 10.xxxx. Tindràs permís per a registrar noms DOI només sota els prefixos que t'hagin sigut assignats.",
-    "system/publication/doi/doilandingpagetemplate": "Pàgina d'inici de la plantilla URL DOI",
-    "system/publication/doi/doilandingpagetemplate-help": "La URL a utilitzar per a registrar el DOI. Una bona URL per defecte per a GeoNetwork és http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. La URL de la pàgina d'inici HA DE contenir el UUID del registre.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Registre a utilitzar per al GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Escollir el registre a utilitzar per a construir documents GetCapabilities personalitzats. Si no n'existeix cap, crear un registre de metadades de servei (utilitzant els estàndards ISO19139 o 19115-3). Per a disposar d'un document capabilities amb la informació principal requerida, cal informar el títol, resum, punt de contacte, paraules clau i restriccions. Si es necessita suport a INSPIRE, també s'ha d'informar de l'idioma principal del registre i altres idiomes addicionals, els temes INSPIRE i la conformitat a INSPIRE.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/cs-admin.json b/web-ui/src/main/resources/catalog/locales/cs-admin.json
index 497466354b21..ea52609bbe07 100644
--- a/web-ui/src/main/resources/catalog/locales/cs-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/cs-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Vydání",
-    "system/publication/doi/doienabled": "Povolit vytvoření identifikátoru digitálního objektu (DOI)",
-    "system/publication/doi/doipattern": "Vzor DOI",
-    "system/publication/doi/doipattern-help": "Výchozí je '\\{\\{uuid\\}\\}' ale strukturu DOI lze přizpůsobit pomocí ID databáze a/nebo skupiny záznamů, např. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Identifikátor digitálních objektů (DOI) je alfanumerický řetězec určený k jedinečné identifikaci objektu. Je svázán s popisem metadat objektu stejně jako s digitálním umístěním, například adresou URL, kde jsou přístupné všechny podrobnosti o objektu. Další informace jsou k dispozici na <a href='https://www.datacite.org/dois.html'>webových stránkách DataCite</a>.",
-    "system/publication/doi/doipublicurl": "Konečná předpona URL DOI",
-    "system/publication/doi/doipublicurl-help": "Nechte ji prázdnou, abyste použili výchozí předponu https://doi.org. Při použití testovacího rozhraní API použijte https://mds.test.datacite.org/doi.",
-    "system/publication/doi/doiurl": "Konečný bod API DataCite",
-    "system/publication/doi/doiurl-help": "Obvykle se testuje https://mds.datacite.org nebo https://mds.test.datacite.org.",
-    "system/publication/doi/doiusername": "Vaše uživatelské jméno DataCite",
-    "system/publication/doi/doipassword": "Vaše heslo DataCite",
-    "system/publication/doi/doipassword-help": "Všechny požadavky na rozhraní MDS API vyžadují ověření. Z tohoto důvodu je podporována pouze přenos přes zabezpečené připojení (HTTPS). DataCite Metadata Store (MDS) používá základní autentizaci HTTP. <a href='https://support.datacite.org/docs/obtain-test-account'>Zde</a> můžete získat účet.",
-    "system/publication/doi/doikey": "Vaše DataCite předpona",
-    "system/publication/doi/doikey-help": "Obvykle vypadá jako 10.xxxx. Budete mít možnost zaregistrovat názvy DOI pouze s předponami, které vám byly přiděleny.",
-    "system/publication/doi/doilandingpagetemplate": "Šablona adresy URL vstupní stránky DOI",
-    "system/publication/doi/doilandingpagetemplate-help": "URL, který chcete použít k registraci DOI. Dobrým výchozím nastavením pro GeoNetwork je http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. Adresa URL vstupní stránky MUSÍ obsahovat UUID záznamu.",
     "system/csw": "Katalogová služba pro Web (CSW)",
     "system/csw/capabilityRecordUuid": "Záznam k použití pro GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Vyberte záznam, který chcete použít k vytvoření vlastního dokumentu GetCapabilities. Pokud žádný neexistuje, vytvořte záznam metadat služeb (pomocí standardů ISO19139 nebo 19115-3). Chcete-li mít dokument schopností s hlavními požadovanými informacemi, nastavte název, abstrakt, kontaktní místo, klíčová slova, omezení. Pokud potřebujete podporu INSPIRE, nastavte také správně hlavní jazyk záznamu a další jazyky, témata INSPIRE a shodu INSPIRE.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "Hodnota je příliš krátká",
     "fieldEmailNotValid": "Je vyžadována platná e-mailová adresa",
     "formConfirmExit": "Formulář obsahuje změny, pokud jej opustíte, změny budou ztraceny. Chcete stránku opustit?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/cy-admin.json b/web-ui/src/main/resources/catalog/locales/cy-admin.json
index 68283209d3f5..d7082f08f62c 100644
--- a/web-ui/src/main/resources/catalog/locales/cy-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/cy-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publication",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "Mae'r gwerth yn rhy fyr",
     "fieldEmailNotValid": "Mae angen cyfeiriad e-bost dilys",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/da-admin.json b/web-ui/src/main/resources/catalog/locales/da-admin.json
index e4c81a6c4184..6b77cc9ad308 100644
--- a/web-ui/src/main/resources/catalog/locales/da-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/da-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publikation",
-    "system/publication/doi/doienabled": "Tillad skabelse af Digital Objekt Identifikator (DOI)",
-    "system/publication/doi/doipattern": "DOI mønster",
-    "system/publication/doi/doipattern-help": "Standarden er '\\{\\{uuid\\}\\}', men DOI-strukturen kan tilpasses med et database ID og/eller en Instans gruppe. For eksempel: 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "En Digital Objekt Identifikator (DOI) er en alfanumerisk streng, der er tildelt til entydigt at identificere et objekt. Det er knyttet til en metadatabeskrivelse af objektet samt til en digital placering, såsom en URL, hvor alle detaljer om objektet er tilgængelige. Mere information tilgængelig på <a href='https://www.datacite.org/dois.html'>DataCite-webstedet</a> .",
-    "system/publication/doi/doipublicurl": "Det endelige DOI URL-præfiks",
-    "system/publication/doi/doipublicurl-help": "Hold denne tom for at bruge standard-præfikset: https://doi.org. Benyt i stedet https://mds.test.datacite.org/doi, når du bruger test-API'en.",
-    "system/publication/doi/doiurl": "DataCite API'ets endpoint",
-    "system/publication/doi/doiurl-help": "Normalt udføres test via https://mds.datacite.org eller https://mds.test.datacite.org. ",
-    "system/publication/doi/doiusername": "Dit DataCite brugernavn",
-    "system/publication/doi/doipassword": "Dit DataCite kodeord",
-    "system/publication/doi/doipassword-help": "Alle anmodninger til MDS API kræver godkendelse. Af denne grund understøttes kun trafik via en sikker forbindelse (HTTPS). DataCite Metadata Store (MDS) bruger HTTP Basic-godkendelse. Du kan få oprettet en konto <a href='https://support.datacite.org/docs/obtain-test-account'>her</a> .",
-    "system/publication/doi/doikey": "Dit DataCite præfiks",
-    "system/publication/doi/doikey-help": "Et DOI-navn har normalt formatet 10.xxxx. Du vil kun få lov til at registrere DOI-navne under de præfikser, der er blevet tildelt dig.",
-    "system/publication/doi/doilandingpagetemplate": "DOI destinationsside URL-skabelon",
-    "system/publication/doi/doilandingpagetemplate-help": "Dette er URL'et, som benyttes til at registrere en DOI. En god standard for GeoNetwork er http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. Webadressen til landingssiden SKAL indeholde en UUID af instansen.",
     "system/csw": "Katalogtjeneste til internettet (CSW)",
     "system/csw/capabilityRecordUuid": "Post til brug ved GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Vælg den instans, som skal bruges til at bygge et brugerdefineret GetCapabilities-dokument. Hvis ingen instanser er tilgængelige, skal du oprette en servicemetadatainstans (ved hjælp af ISO19139 eller 19115-3 standarder). For at have et kapacitetsdokument med de vigtigste nødvendige oplysninger, skal du angive titel, abstrakt, kontaktpunkt, nøgleord og begrænsninger. Hvis du har brug for INSPIRE-support, skal du også indstille hovedsproget og yderligere sprog, INSPIRE-temaer og INSPIRE-overensstemmelse korrekt.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "Værdien er for kort",
     "fieldEmailNotValid": "En valid e-mail er nødvendig",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/de-admin.json b/web-ui/src/main/resources/catalog/locales/de-admin.json
index 288672926cba..c6c1f04760d3 100644
--- a/web-ui/src/main/resources/catalog/locales/de-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/de-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publikation",
-    "system/publication/doi/doienabled": "Erstellung eines Digital Object Identifier (DOI) zulassen",
-    "system/publication/doi/doipattern": "Muster für den DOI",
-    "system/publication/doi/doipattern-help": "Der Standardwert ist  '\\{\\{uuid\\}\\}', aber die DOI-Struktur kann z. B. mit der Datenbank-ID und/oder der Datensatzgruppe angepasst werden. Beispiel:  'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Ein Digital Object Identifier (DOI) ist eine alphanumerische Zeichenfolge zur eindeutigen Identifizierung eines Objekts. Es ist an eine Metadatenbeschreibung des Objekts sowie an einen digitalen Ort gebunden, z. B. eine URL, über die auf alle Details des Objekts zugegriffen werden kann. Weitere Informationen finden Sie auf der <a href='https://www.datacite.org/dois.html'>DataCite-Website</a> .",
-    "system/publication/doi/doipublicurl": "Das endgültige DOI-URL-Präfix",
-    "system/publication/doi/doipublicurl-help": "Leer lassen, um das Standardpräfix https://doi.org zu verwenden. Verwenden Sie https://mds.test.datacite.org/doi, wenn Sie die Test-API verwenden.",
-    "system/publication/doi/doiurl": "Der DataCite-API-Endpunkt",
-    "system/publication/doi/doiurl-help": "In der Regel https://mds.datacite.org oder https://mds.test.datacite.org zum Testen verwenden.",
-    "system/publication/doi/doiusername": "Ihr DataCite-Benutzername",
-    "system/publication/doi/doipassword": "Ihr DataCite Passwort",
-    "system/publication/doi/doipassword-help": "Alle Anfragen an die MDS-API erfordern eine Authentifizierung. Aus diesem Grund wird nur Datenverkehr über eine sichere Verbindung (HTTPS) unterstützt. Der DataCite Metadata Store (MDS) verwendet die HTTP-Basisauthentifizierung. Sie können ein Konto <a href='https://support.datacite.org/docs/obtain-test-account'>hier</a> einrichten .",
-    "system/publication/doi/doikey": "Ihr DataCite-Präfix",
-    "system/publication/doi/doikey-help": "Sieht normalerweise aus wie 10.xxxx. Sie dürfen DOI-Namen nur unter den Ihnen zugewiesenen Präfixen registrieren.",
-    "system/publication/doi/doilandingpagetemplate": "DOI-Zielseiten-URL-Vorlage",
-    "system/publication/doi/doilandingpagetemplate-help": "Die URL, die zum Registrieren des DOI verwendet werden soll. Eine gute Voreinstellung für GeoNetwork ist http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. Die Zielseiten-URL MUSS die UUID des Datensatzes enthalten.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Eintrag zu benutzen für GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Wähle den Datensatz aus, der zum Erstellen eines benutzerdefinierten GetCapabilities-Dokuments verwendet werden soll. Sollte keiner vorhanden sein, erstelle einen Service-Metadatensatz (unter Verwendung der Standards ISO19139 oder 19115-3). Um ein Funktionsdokument mit den wichtigsten erforderlichen Informationen zu erhalten, lege Titel, Zusammenfassung, Kontaktstelle, Schlüsselwörter und Einschränkungen fest. Wenn du INSPIRE-Unterstützung benötigst, stelle die Hauptsprache, die zusätzlichen Sprachen, die INSPIRE-Themen und die INSPIRE-Konformität für den Datensatz korrekt ein.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "Der Wert ist zu kurz",
     "fieldEmailNotValid": "Eine gültige E-Mail-Adresse wird benötigt",
     "formConfirmExit": "Das Formular weist Änderungen auf. Wenn Sie es verlassen, gehen die Änderungen verloren. Möchten Sie die Seite wirklich verlassen?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/en-admin.json b/web-ui/src/main/resources/catalog/locales/en-admin.json
index fc15214f39b0..f05ecc9347d2 100644
--- a/web-ui/src/main/resources/catalog/locales/en-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/en-admin.json
@@ -627,22 +627,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publication",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1495,6 +1479,30 @@
     "fieldTooLong": "The value is too long",
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
-    "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
+    "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?",
+    "manageDoiServers": "DOI servers",
+    "doiservers": "DOI servers",
+    "doiservers-description": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
+    "newDoiServer": "New server",
+    "updateDoiServer": "Update server",
+    "doiserver-name": "Server name",
+    "doiserver-description": "Description",
+    "doiserver-url": "DataCite API endpoint",
+    "doiserver-url-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
+    "doiserver-apiKey": "API Key",
+    "doiserver-landingPageTemplate": "Landing page URL template",
+    "doiserver-landingPageTemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
+    "doiserver-publicUrl": "Final DOI URL prefix",
+    "doiserver-publicUrl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
+    "doiserver-username": "DataCite username",
+    "doiserver-password": "DataCite password",
+    "doiserver-password-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
+    "doiserver-pattern": "DOI pattern",
+    "doiserver-pattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
+    "doiserver-prefix": "DataCite prefix",
+    "doiserver-prefix-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
+    "doiserver-publicationGroups": "Publication groups",
+    "doiserver-publicationGroups-help": "Select the groups which metadata should be published to the DOI server. If no groups are selected, the server will be provided to publish the metadata that has no other DOI servers related to the metadata owner group.",
+    "confirmDoiServerDelete": "Are you sure you want to delete this DOI server?"
 }
 
diff --git a/web-ui/src/main/resources/catalog/locales/es-admin.json b/web-ui/src/main/resources/catalog/locales/es-admin.json
index b7da257de406..f0ab5a27c23a 100644
--- a/web-ui/src/main/resources/catalog/locales/es-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/es-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publicación",
-    "system/publication/doi/doienabled": "Permitir la creación de Identificadores de Objetos Digitales (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Un Identificador Digital de Objeto (DOI) es un código alfanumérico asignado de forma única a un objeto. Se enlaza a una descripción del metadato de dicho objeto así como a su localización digital, como una URL, donde todos los detalles del objeto están accesibles. Más información en <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "La URl de la API de DataCite",
-    "system/publication/doi/doiurl-help": "Normalmente https://mds.datacite.org o https://mds.test.datacite.org para pruebas.",
-    "system/publication/doi/doiusername": "Tu usuario DataCite",
-    "system/publication/doi/doipassword": "Tu contraseña DataCite",
-    "system/publication/doi/doipassword-help": "Todas las peticiones a la API MDS requiren autenticación. Por esto, sólo se permitirá el tráfico a través de una conexión segura (HTTPS). La DataCite Metadata Store (MDS) usa autenticación HTTP básica. Puedes obtener una cuenta <a href='https://support.datacite.org/docs/obtain-test-account'>aquí</a>.",
-    "system/publication/doi/doikey": "Tu prefijo DataCite",
-    "system/publication/doi/doikey-help": "Normalmente algo como 10.xxxx. Se te permitirá registrar nombres DOI bajo los prefijos que se te han asignado.",
-    "system/publication/doi/doilandingpagetemplate": "Plantilla para la página de bienvenida de DOI",
-    "system/publication/doi/doilandingpagetemplate-help": "La URL para registrar el DOI. Una buena URL por defecto para GeoNetwork es http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. La URL de la página de entrada TIENE que contener el UUID del registro.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Registro para usar para GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Elija el registro que se utilizará para crear un documento GetCapabilities personalizado. Si no existe ninguno, cree un registro de metadatos de servicio (utilizando los estándares ISO19139 o 19115-3). Tener un documento de capacidades con la información principal requerida, establecer título, resumen, punto de contacto, palabras clave, restricciones. Si necesita el soporte de INSPIRE, configure correctamente el idioma principal del registro y los idiomas adicionales, los temas de INSPIRE y la conformidad de INSPIRE.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/fi-admin.json b/web-ui/src/main/resources/catalog/locales/fi-admin.json
index ec007a37ab9b..ab766d84ec95 100644
--- a/web-ui/src/main/resources/catalog/locales/fi-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/fi-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Julkaisu",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/fr-admin.json b/web-ui/src/main/resources/catalog/locales/fr-admin.json
index 57f7982fdcb5..97414b06a72e 100644
--- a/web-ui/src/main/resources/catalog/locales/fr-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/fr-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Configuration de la documentation",
     "system/documentation/url": "URL de la documentation",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publication",
-    "system/publication/doi/doienabled": "Permettre la création d'un Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Par défaut, le motif est '\\{\\{uuid\\}\\}' mais il est possible de le personnaliser avec des informations tel que l'id de base de données ou le groupe de la fiche eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Un Digital Object Identifier (DOI) est une chaîne alphanumérique affectée à l'identification unique d'un objet. Il est lié à une description des métadonnées de l'objet ainsi qu'à un emplacement numérique, tel qu'une URL, où tous les détails concernant l'objet sont accessibles. Plus d'informations disponibles sur <a href='https://www.datacite.org/dois.html'>le site de DataCite</a>.",
-    "system/publication/doi/doipublicurl": "Le préfixe définitif de l'URL DOI",
-    "system/publication/doi/doipublicurl-help": "Laissez-le vide pour utiliser le préfixe par défaut https://doi.org. Utilisez https://mds.test.datacite.org/doi lors de l'utilisation de l'API de test.",
-    "system/publication/doi/doiurl": "URL de l'API de DataCite",
-    "system/publication/doi/doiurl-help": "Habituellement https://mds.datacite.org ou https://mds.test.datacite.org pour tester.",
-    "system/publication/doi/doiusername": "Votre nom d'utilisateur DataCite",
-    "system/publication/doi/doipassword": "Votre mot de passe DataCite",
-    "system/publication/doi/doipassword-help": "Toutes les requêtes à l'API de MDS requirent une authentification. Pour cette raison, seulement le traffic avec une connection sécurisée (HTTPS) est supportée. Le DataCite Metadata Store (MDS) utilise l'authentification basique HTTP. Vous pouvez obtenir un compte <a href='https://support.datacite.org/docs/obtain-test-account'>ici</a>. ",
-    "system/publication/doi/doikey": "Votre préfixe DataCite",
-    "system/publication/doi/doikey-help": "En général, ça ressemble à 10.xxxx. Vous ne pourrez enregistrer des noms de DOI que sous les préfixes qui vous ont été assignés.",
-    "system/publication/doi/doilandingpagetemplate": "Modèle d'URL de page de chargement DOI",
-    "system/publication/doi/doilandingpagetemplate-help": "L'URL à utiliser pour enregistrer le DOI. Pour GeoNetwork, il est conseillé d'utiliser http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. L'URL de la page de chargement doit contenir l'UUID de la fiche.",
     "system/csw": "CSW",
     "system/csw/capabilityRecordUuid": "Fiche à utiliser pour le GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Sélectionnez une fiche à utiliser pour construire le document de capacités (GetCapabilities) du service CSW. S'il n'y a aucune fiche de service, vous pouvez en créer une en utilisant le standard ISO19139 ou ISO19115-3. Pour avoir un GetCapabilities complet, il est recommandé de renseigner le titre, le résumé, le point de contact, les mots clés et les contraintes. Pour un service de découverte INSPIRE, complétez cette description par la langue principale (et les langues complémentaires), les thèmes INSPIRE, l'emprise temporelle et la conformité.  ",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "La valeur est trop courte",
     "fieldEmailNotValid": "Un email valide est requis",
     "formConfirmExit": "Le formulaire comporte des modifications, si vous quittez, les modifications seront perdues. Voulez-vous quitter la page ?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/is-admin.json b/web-ui/src/main/resources/catalog/locales/is-admin.json
index 55d17e497ee6..22a995d020b7 100644
--- a/web-ui/src/main/resources/catalog/locales/is-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/is-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Útgáfa",
-    "system/publication/doi/doienabled": "Leyfa að búa til Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Digital Object Identifier (DOI) er alstafa strengur ætlaður til að bera kennsl á hlut. Þetta tengist lýsingu á lýsiögnum á hlutnum sem og stafræna staðsetningu, eins og vefslóð, þar sem allar nánari upplýsingar um hlutinn eru aðgengilegar. Nánari upplýsingar er að finna á <a href='https://www.datacite.org/dois.html'>DataCite vefslóðinni</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "DataCite API endapunktur",
-    "system/publication/doi/doiurl-help": "Venjulega https://mds.datacite.org eða https://mds.test.datacite.org til að prófa.",
-    "system/publication/doi/doiusername": "DataCite notandanafnið þitt",
-    "system/publication/doi/doipassword": "DataCite lykilorðið þitt",
-    "system/publication/doi/doipassword-help": "Allar beiðnir til MDS API krefjast auðkenningar. Af þessum ástæðum, er aðeins studd umferð um örugga tenginu (HTTPS). DataCite Metadata Store (MDS) notar HTTP Basic auðkenningu. Þú getur stofnað reikning <a href='https://support.datacite.org/docs/obtain-test-account'>hérna</a>.",
-    "system/publication/doi/doikey": "DataCite forskeytið þitt",
-    "system/publication/doi/doikey-help": "Lítur venjulega út eins og 10.xxxx. Þér verður aðeins leyft að skrá DOI nöfn undir þeim forskeytum sem hafa verið úthlutað til þín. ",
-    "system/publication/doi/doilandingpagetemplate": "DOI áfangasíða URL sniðmát",
-    "system/publication/doi/doilandingpagetemplate-help": "Slóðin sem á að nota til að skrá DOI. Góð sjálfgefin fyrir GeoNetwork er http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. VEFSLÓÐ áfangasíðunnar VERÐUR að innihalda UUID skráarinnar.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/it-admin.json b/web-ui/src/main/resources/catalog/locales/it-admin.json
index 524c1f736129..b49bcb988c0b 100644
--- a/web-ui/src/main/resources/catalog/locales/it-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/it-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publication",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/ko-admin.json b/web-ui/src/main/resources/catalog/locales/ko-admin.json
index 93fe2e31cdf2..c2d5ae4d6697 100644
--- a/web-ui/src/main/resources/catalog/locales/ko-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/ko-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "출판",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/nl-admin.json b/web-ui/src/main/resources/catalog/locales/nl-admin.json
index da893c535202..3ffadabd6386 100644
--- a/web-ui/src/main/resources/catalog/locales/nl-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/nl-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publicatie",
-    "system/publication/doi/doienabled": "Activeer aanmaken Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI patroon",
-    "system/publication/doi/doipattern-help": "De default is '\\{\\{uuid\\}\\}' maar de DOI structuur kan aangepast worden met een database id en/of record groep, e.g., 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Een Digital Object Identifier (DOI) is een alphanumerieke string om een object uniek te identificeren. Meer informatie op de <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "Het definitieve voorvoegsel van de DOI-URL",
-    "system/publication/doi/doipublicurl-help": "Houd dit veld leeg om het standaard https://doi.org voorvoegsel te gebruiken. Gebruik https://mds.test.datacite.org/doi bij gebruik van de test-API.",
-    "system/publication/doi/doiurl": "DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Gewoonlijk https://mds.datacite.org of https://mds.test.datacite.org",
-    "system/publication/doi/doiusername": "DataCite gebruikersnaam",
-    "system/publication/doi/doipassword": "DataCite wachtwoord",
-    "system/publication/doi/doipassword-help": "Requests richting het MDS API endpoint vereisen authenticatie. Je kunt <a href='https://support.datacite.org/docs/obtain-test-account'>hier</a> een account aanvragen.",
-    "system/publication/doi/doikey": "DataCite prefix",
-    "system/publication/doi/doikey-help": "Gewoonlijk in de vorm van 10.xxxx.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landings pagina URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "De URL om de DOI te registreren. Bijvoorbeeld http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. De landings pagina dient  de UUID van het record te bevatten",
     "system/csw": "Catalog Service voor het web ( CSW )",
     "system/csw/capabilityRecordUuid": "Record om te gebruiken voor GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Kies het record dat moet worden gebruikt om een aangepast GetCapabilities-document te maken. Als er geen bestaat, maakt u een service metadata record (op basis van de ISO19139- of 19115-3 standaarden). Om een capabilities document te verkrijgen met de belangrijkste vereiste informatie, stelt u de titel, samenvatting, contactpersoon, trefwoorden en beperkingen in. Als u INSPIRE-ondersteuning nodig heeft, stel dan ook de hoofdtaal en aanvullende talen, INSPIRE-thema's en INSPIRE-conformiteit goed in.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "De waarde is te kort",
     "fieldEmailNotValid": "Een geldig email adres is vereist",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/pt-admin.json b/web-ui/src/main/resources/catalog/locales/pt-admin.json
index f06069538f85..6089fdbfb97c 100644
--- a/web-ui/src/main/resources/catalog/locales/pt-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/pt-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publicação",
-    "system/publication/doi/doienabled": "Permitir a criação do Identificador de Objeto Digital (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "Um Digital Object Identifier (DOI) é uma cadeia alfanumérica atribuída para identificar um objeto de forma exclusiva. Ele está ligado a uma descrição de metadados do objeto, bem como a um local digital, como um URL, onde todos os detalhes sobre o objeto estão acessíveis. Mais informações disponíveis no <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "O API DataCite endpoint",
-    "system/publication/doi/doiurl-help": "Normalmente, https://mds.datacite.org ou https://mds.test.datacite.org para testes.",
-    "system/publication/doi/doiusername": "Seu nome de usuário do DataCite",
-    "system/publication/doi/doipassword": "Sua senha do DataCite",
-    "system/publication/doi/doipassword-help": "Todas as solicitações para a API do MDS exigem autenticação. Por esse motivo, somente o tráfego por meio de uma conexão segura (HTTPS) é suportado. O DataCite Metadata Store (MDS) usa a autenticação HTTP básica. Você pode obter uma conta <a href='https://support.datacite.org/docs/obtain-test-account'>aqui</a>.",
-    "system/publication/doi/doikey": "Seu prefixo DataCite",
-    "system/publication/doi/doikey-help": "Geralmente parece com 10.xxxx. Você poderá registrar nomes DOI somente sob os prefixos que foram atribuídos a você.",
-    "system/publication/doi/doilandingpagetemplate": "Modelo de URL da página de destino DOI",
-    "system/publication/doi/doilandingpagetemplate-help": "O URL a ser usado para registrar o DOI. Um bom padrão para o http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. O URL da página de destino DEVE conter o UUID do registro.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/ru-admin.json b/web-ui/src/main/resources/catalog/locales/ru-admin.json
index 2a87a57d4377..723aa69810ab 100644
--- a/web-ui/src/main/resources/catalog/locales/ru-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/ru-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publication",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "Служба Каталогов для Интернета (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/sk-admin.json b/web-ui/src/main/resources/catalog/locales/sk-admin.json
index cf41986a745d..06b37cb4e043 100644
--- a/web-ui/src/main/resources/catalog/locales/sk-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/sk-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publication",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "Katalógová služba pre Web (CSW)",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/sv-admin.json b/web-ui/src/main/resources/catalog/locales/sv-admin.json
index 5932dbfe7fe3..185a9658d847 100644
--- a/web-ui/src/main/resources/catalog/locales/sv-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/sv-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publicering",
-    "system/publication/doi/doienabled": "Tillåt att skapa en digital objektidentifierare (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "En digital objektidentifierare (DOI) är en alfanumerisk sträng som tilldelas för att unikt identifiera ett objekt. Det är knutet till en metadatabeskrivning av objektet och till en digital plats, till exempel en URL, där alla detaljer om objektet är tillgängliga. Mer information finns på <a href='https://www.datacite.org/dois.html'>DataCite webbplats</a> .",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "DataCite API-slutpunkt",
-    "system/publication/doi/doiurl-help": "Vanligtvis https://mds.datacite.org eller https://mds.test.datacite.org för testning.",
-    "system/publication/doi/doiusername": "Ditt DataCite-användarnamn",
-    "system/publication/doi/doipassword": "Ditt DataCite-lösenord",
-    "system/publication/doi/doipassword-help": "Alla förfrågningar till MDS API kräver autentisering. Av detta skäl stöds endast trafik via en säker anslutning (HTTPS). DataCite Metadata Store (MDS) använder HTTP Basic-autentisering. Du kan få ett konto <a href='https://support.datacite.org/docs/obtain-test-account'>här</a> .",
-    "system/publication/doi/doikey": "Ditt DataCite-prefix",
-    "system/publication/doi/doikey-help": "Ser vanligtvis ut som 10.xxxx. Du får bara registrera DOI-namn under de prefix som har tilldelats dig.",
-    "system/publication/doi/doilandingpagetemplate": "DOI-målsidans URL-mall",
-    "system/publication/doi/doilandingpagetemplate-help": "URL: en som ska användas för att registrera DOI. Ett bra standard för GeoNetwork är http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. Målsidans URL MÅSTE innehålla postens UUID.",
     "system/csw": "Catalog Service for the Web (CSW)",
     "system/csw/capabilityRecordUuid": "Post att använda för GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Välj posten som ska användas för att skapa ett anpassat GetCapabilities-dokument. Om ingen finns, skapa en metadatapost för tjänster (med ISO19139 eller 19115-3-standarder). För att ha ett kapacitetsdokument med den viktigaste informationen som krävs, ange titel, sammanfattning, kontakt, nyckelord, begränsningar. Om du behöver INSPIRE-stöd också, ange huvudspråk och ytterligare språk, INSPIRE-teman och INSPIRE-överensstämmelse.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "Värdet är för kort",
     "fieldEmailNotValid": "En giltig emailadress krävs",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/locales/zh-admin.json b/web-ui/src/main/resources/catalog/locales/zh-admin.json
index b3a0c1f6f46d..627c2031a6b1 100644
--- a/web-ui/src/main/resources/catalog/locales/zh-admin.json
+++ b/web-ui/src/main/resources/catalog/locales/zh-admin.json
@@ -628,22 +628,6 @@
     "system/documentation": "Documentation configuration",
     "system/documentation/url": "Base manual url",
     "system/documentation/url-help": "Base application manual url. Defaults to the official manual page (https://docs.geonetwork-opensource.org/{version}/{lang}) and can be customised to use a self hosted documentation with a custom branding. The url can contain \\{\\{lang\\}\\} placeholder, to display the manual in different languages when available, and \\{\\{version\\}\\} placeholder to use the application version.",
-    "system/publication": "Publication",
-    "system/publication/doi/doienabled": "Allow creation of Digital Object Identifier (DOI)",
-    "system/publication/doi/doipattern": "DOI pattern",
-    "system/publication/doi/doipattern-help": "Default is '\\{\\{uuid\\}\\}' but the DOI structure can be customized with database id and/or record group eg. 'example-\\{\\{groupOwner\\}\\}-\\{\\{id\\}\\}'",
-    "system/publication/doi/doienabled-help": "A Digital Object Identifier (DOI) is an alphanumeric string assigned to uniquely identify an object. It is tied to a metadata description of the object as well as to a digital location, such as a URL, where all the details about the object are accessible. More information available on <a href='https://www.datacite.org/dois.html'>DataCite website</a>.",
-    "system/publication/doi/doipublicurl": "The final DOI URL prefix",
-    "system/publication/doi/doipublicurl-help": "Keep it empty to use the default https://doi.org prefix. Use https://mds.test.datacite.org/doi when using the test API.",
-    "system/publication/doi/doiurl": "The DataCite API endpoint",
-    "system/publication/doi/doiurl-help": "Usually https://mds.datacite.org or https://mds.test.datacite.org for testing.",
-    "system/publication/doi/doiusername": "Your DataCite username",
-    "system/publication/doi/doipassword": "Your DataCite password",
-    "system/publication/doi/doipassword-help": "All requests to the MDS API require authentication. For this reason, only traffic via a secure connection (HTTPS) is supported. The DataCite Metadata Store (MDS) uses HTTP Basic authentication. You can obtain an account <a href='https://support.datacite.org/docs/obtain-test-account'>here</a>.",
-    "system/publication/doi/doikey": "Your DataCite prefix",
-    "system/publication/doi/doikey-help": "Usually looks like 10.xxxx. You will be allowed to register DOI names only under the prefixes that have been assigned to you.",
-    "system/publication/doi/doilandingpagetemplate": "DOI landing page URL template",
-    "system/publication/doi/doilandingpagetemplate-help": "The URL to use to register the DOI. A good default for GeoNetwork is http://localhost:8080/geonetwork/srv/resources/records/\\{\\{uuid\\}\\}. The landing page URL MUST contains the UUID of the record.",
     "system/csw": "网络目录服务（CSW）",
     "system/csw/capabilityRecordUuid": "Record to use for GetCapabilities",
     "system/csw/capabilityRecordUuid-help": "Choose the record to be used to build custom GetCapabilities document. If none exist, create a service metadata record (using ISO19139 or 19115-3 standards). To have a capabilities document with the main information required, set title, abstract, point of contact, keywords, constraints. If you need INSPIRE support also set properly the record main language and additional languages, INSPIRE themes and INSPIRE conformity.",
@@ -1494,4 +1478,4 @@
     "fieldTooShort": "The value is too short",
     "fieldEmailNotValid": "A valid email address is required",
     "formConfirmExit": "The form has changes, if you exit the changes will be lost. Do you want to exit on the page?"
-}
\ No newline at end of file
+}
diff --git a/web-ui/src/main/resources/catalog/style/gn_admin.less b/web-ui/src/main/resources/catalog/style/gn_admin.less
index bdb3df8caebe..df08bc00014d 100644
--- a/web-ui/src/main/resources/catalog/style/gn_admin.less
+++ b/web-ui/src/main/resources/catalog/style/gn_admin.less
@@ -219,7 +219,8 @@ ul.pager {
 #gn-mapservers-container,
 #gn-sources-container,
 #gn-metadatatemplates-container,
-#gn-static-pages-container {
+#gn-static-pages-container,
+#gn-doiservers-container {
   // Fixes gn-modal windows; TODO: fix this globally in gn-popup style
   [gn-modal] {
     max-width: none;
diff --git a/web-ui/src/main/resources/catalog/templates/admin/settings/doiservers.html b/web-ui/src/main/resources/catalog/templates/admin/settings/doiservers.html
new file mode 100644
index 000000000000..78f517379411
--- /dev/null
+++ b/web-ui/src/main/resources/catalog/templates/admin/settings/doiservers.html
@@ -0,0 +1,491 @@
+<div class="row" data-ng-controller="GnDoiServerController" id="gn-doiservers-container">
+  <div class="col-lg-4">
+    <div class="panel panel-default">
+      <div class="panel-heading" data-translate="">doiservers</div>
+      <div class="panel-body">
+        <input
+          class="form-control"
+          data-ng-model="doiServersSearch.$"
+          autofocus=""
+          placeholder="{{'filter' | translate}}"
+        />
+        <input type="hidden" data-ng-model="doiServerSelected.id" />
+
+        <div class="list-group">
+          <a
+            href=""
+            class="list-group-item"
+            data-ng-repeat="v in doiServers | filter:doiServersSearch | orderBy:'name'"
+            data-ng-click="selectDoiServer(v)"
+            title="{{v.description}}"
+          >
+            {{v.name}}
+          </a>
+        </div>
+
+        <button
+          type="button"
+          class="btn btn-primary btn-block"
+          data-ng-click="addDoiServer()"
+        >
+          <i class="fa fa-plus"></i>
+          <span data-translate="">newDoiServer</span>
+        </button>
+      </div>
+    </div>
+
+    <div data-gn-need-help="doi-server-configuration"></div>
+  </div>
+
+  <div class="col-lg-8" data-ng-hide="doiServerSelected == null">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <span data-ng-hide="doiServerSelected.id == ''" data-translate=""
+          >updateDoiServer</span
+        >
+        <span data-ng-hide="doiServerSelected.id != ''" data-translate=""
+          >newDoiServer</span
+        >
+        <strong>{{doiServerSelected.name}}</strong>
+        <div class="btn-toolbar pull-right">
+          <button
+            data-ng-hide="doiServerSelected.id == ''"
+            type="button"
+            class="btn btn-default"
+            data-ng-click="resetDoiServerPassword(doiServerSelected.id)"
+          >
+            <i class="fa fa-lock"></i>&nbsp;
+            <span data-translate="">resetPassword</span>
+          </button>
+          <button
+            type="button"
+            class="btn btn-primary"
+            data-ng-disabled="!gnDoiServerEdit.$valid || !gnDoiServerEdit.$dirty"
+            data-ng-click="saveDoiServer('#gn-doiserver-edit')"
+          >
+            <i class="fa fa-save"></i>&nbsp;
+            <span data-translate="">save</span>
+          </button>
+          <button
+            type="button"
+            class="btn btn-primary btn-danger"
+            data-ng-hide="doiServerSelected.id == ''"
+            data-ng-click="deleteDoiServerConfig()"
+          >
+            <i class="fa fa-times"></i>&nbsp;
+            <span data-translate="">delete</span>
+          </button>
+        </div>
+      </div>
+      <div class="panel-body">
+        <form
+          id="gn-doiserver-edit"
+          name="gnDoiServerEdit"
+          class="form-horizontal"
+          data-ng-keypress="updatingDoiServer()"
+          data-confirm-message="{{ 'formConfirmExit' | translate}}"
+          data-confirm-on-exit=""
+          novalidate=""
+        >
+          <input type="hidden" name="_csrf" value="{{csrf}}" />
+          <input
+            type="hidden"
+            name="id"
+            data-ng-model="doiServerSelected.id"
+            value="{{doiServerSelected.id}}"
+          />
+
+          <div
+            class="form-group"
+            data-ng-class="gnDoiServerEdit.name.$error.required ||
+                             (gnDoiServerEdit.name.$touched && gnDoiServerEdit.name.$invalid) ? 'has-error' : ''"
+          >
+            <label class="control-label col-sm-3" data-translate="" for="name"
+              >doiserver-name</label
+            >
+
+            <div class="col-sm-9">
+              <input
+                type="text"
+                id="name"
+                name="name"
+                class="form-control"
+                required=""
+                data-ng-model="doiServerSelected.name"
+              />
+
+              <div
+                class="help-block"
+                data-ng-messages="gnDoiServerEdit.name.$error"
+                data-ng-if="gnDoiServerEdit.name.$touched"
+              >
+                <p data-ng-message="required" data-translate="">fieldRequired</p>
+              </div>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label class="control-label col-sm-3" data-translate=""
+              >doiserver-description</label
+            >
+
+            <div class="col-sm-9">
+              <textarea
+                name="description"
+                class="form-control"
+                data-ng-model="doiServerSelected.description"
+              ></textarea>
+            </div>
+          </div>
+
+          <div
+            class="form-group"
+            data-ng-class="gnDoiServerEdit.url.$error.required ||
+                             (gnDoiServerEdit.url.$touched && gnDoiServerEdit.url.$invalid) ? 'has-error' : ''"
+          >
+            <label class="control-label col-sm-3" data-translate="" for="url"
+              >doiserver-url</label
+            >
+
+            <div class="col-sm-9">
+              <div class="input-group">
+                <input
+                  type="url"
+                  name="url"
+                  id="url"
+                  class="form-control"
+                  required=""
+                  data-ng-model="doiServerSelected.url"
+                  placeholder="http://"
+                />
+                <div class="input-group-btn">
+                  <button
+                    type="button"
+                    class="btn btn-default dropdown-toggle"
+                    data-toggle="dropdown"
+                    aria-haspopup="true"
+                    aria-expanded="false"
+                  >
+                    <i class="fa fa-fw fa-th-list"></i>
+                    <span class="caret"></span>
+                  </button>
+                  <ul class="dropdown-menu dropdown-menu-right">
+                    <li>
+                      <a
+                        data-ng-click="doiServerSelected.url = 'https://mds.datacite.org'"
+                        title="https://mds.datacite.org"
+                        >https://mds.datacite.org</a
+                      >
+                    </li>
+                    <li>
+                      <a
+                        data-ng-click="doiServerSelected.url = 'https://mds.test.datacite.org'"
+                        title="https://mds.test.datacite.org"
+                        >https://mds.test.datacite.org</a
+                      >
+                    </li>
+                  </ul>
+                </div>
+              </div>
+
+              <div
+                class="help-block"
+                data-ng-messages="gnDoiServerEdit.url.$error"
+                data-ng-if="gnDoiServerEdit.url.$touched"
+              >
+                <p data-ng-message="required" data-translate="">fieldRequired</p>
+              </div>
+            </div>
+
+            <div class="col-sm-9 col-sm-offset-3">
+              <p class="help-block" data-translate="">doiserver-url-help</p>
+            </div>
+          </div>
+
+          <div data-ng-show="!isUpdate">
+            <div
+              class="form-group"
+              data-ng-class="gnDoiServerEdit.username.$error.required ||
+                             (gnDoiServerEdit.username.$touched && gnDoiServerEdit.username.$invalid) ? 'has-error' : ''"
+            >
+              <label class="control-label col-sm-3" data-translate="" for="username"
+                >doiserver-username</label
+              >
+
+              <div class="col-sm-9">
+                <input
+                  type="text"
+                  class="form-control"
+                  required=""
+                  id="username"
+                  name="username"
+                  data-ng-model="doiServerSelected.username"
+                />
+
+                <div
+                  class="help-block"
+                  data-ng-messages="gnDoiServerEdit.username.$error"
+                  data-ng-if="gnDoiServerEdit.username.$touched"
+                >
+                  <p data-ng-message="required" data-translate="">fieldRequired</p>
+                </div>
+              </div>
+            </div>
+
+            <div
+              class="form-group"
+              data-ng-class="gnDoiServerEdit.password.$error.required ||
+                             (gnDoiServerEdit.password.$touched && gnDoiServerEdit.password.$invalid) ? 'has-error' : ''"
+            >
+              <label class="control-label col-sm-3" data-translate="" for="password"
+                >doiserver-password</label
+              >
+
+              <div class="col-sm-9">
+                <input
+                  type="password"
+                  class="form-control"
+                  id="password"
+                  name="password"
+                  required="required"
+                  autocomplete="new-password"
+                  data-ng-model="doiServerSelected.password"
+                />
+
+                <div
+                  class="help-block"
+                  data-ng-messages="gnDoiServerEdit.password.$error"
+                  data-ng-if="gnDoiServerEdit.password.$touched"
+                >
+                  <p data-ng-message="required" data-translate="">fieldRequired</p>
+                </div>
+              </div>
+
+              <div class="col-sm-9 col-sm-offset-3">
+                <p class="help-block" data-translate="">doiserver-password-help</p>
+              </div>
+            </div>
+          </div>
+
+          <div
+            class="form-group"
+            data-ng-class="gnDoiServerEdit.landingPageTemplate.$error.required ||
+                             (gnDoiServerEdit.landingPageTemplate.$touched && gnDoiServerEdit.landingPageTemplate.$invalid) ? 'has-error' : ''"
+          >
+            <label
+              class="control-label col-sm-3"
+              data-translate=""
+              for="landingPageTemplate"
+              >doiserver-landingPageTemplate</label
+            >
+
+            <div class="col-sm-9">
+              <input
+                type="text"
+                id="landingPageTemplate"
+                name="landingPageTemplate"
+                class="form-control"
+                required=""
+                data-ng-model="doiServerSelected.landingPageTemplate"
+                placeholder=""
+              />
+
+              <div
+                class="help-block"
+                data-ng-messages="gnDoiServerEdit.landingPageTemplate.$error"
+                data-ng-if="gnDoiServerEdit.landingPageTemplate.$touched"
+              >
+                <p data-ng-message="required" data-translate="">fieldRequired</p>
+              </div>
+            </div>
+
+            <div class="col-sm-9 col-sm-offset-3">
+              <p class="help-block" data-translate="">
+                doiserver-landingPageTemplate-help
+              </p>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label class="control-label col-sm-3" data-translate="" for="publicUrl"
+              >doiserver-publicUrl</label
+            >
+
+            <div class="col-sm-9">
+              <input
+                type="text"
+                id="publicUrl"
+                class="form-control"
+                data-ng-model="doiServerSelected.publicUrl"
+                placeholder=""
+              />
+            </div>
+
+            <div class="col-sm-9 col-sm-offset-3">
+              <p class="help-block" data-translate="">doiserver-publicUrl-help</p>
+            </div>
+          </div>
+
+          <div
+            class="form-group"
+            data-ng-class="gnDoiServerEdit.pattern.$error.required ||
+                             (gnDoiServerEdit.pattern.$touched && gnDoiServerEdit.pattern.$invalid) ? 'has-error' : ''"
+          >
+            <label class="control-label col-sm-3" data-translate="" for="pattern"
+              >doiserver-pattern</label
+            >
+
+            <div class="col-sm-9">
+              <input
+                type="text"
+                id="pattern"
+                name="pattern"
+                class="form-control"
+                required=""
+                data-ng-model="doiServerSelected.pattern"
+                placeholder=""
+              />
+
+              <div
+                class="help-block"
+                data-ng-messages="gnDoiServerEdit.pattern.$error"
+                data-ng-if="gnDoiServerEdit.pattern.$touched"
+              >
+                <p data-ng-message="required" data-translate="">fieldRequired</p>
+              </div>
+            </div>
+
+            <div class="col-sm-9 col-sm-offset-3">
+              <p class="help-block" data-translate="">doiserver-pattern-help</p>
+            </div>
+          </div>
+
+          <div
+            class="form-group"
+            data-ng-class="gnDoiServerEdit.prefix.$error.required ||
+                             (gnDoiServerEdit.prefix.$touched && gnDoiServerEdit.pattern.$invalid) ? 'has-error' : ''"
+          >
+            <label class="control-label col-sm-3" data-translate="" for="prefix"
+              >doiserver-prefix</label
+            >
+
+            <div class="col-sm-9">
+              <input
+                type="text"
+                id="prefix"
+                name="prefix"
+                class="form-control"
+                required=""
+                data-ng-model="doiServerSelected.prefix"
+                placeholder=""
+              />
+
+              <div
+                class="help-block"
+                data-ng-messages="gnDoiServerEdit.prefix.$error"
+                data-ng-if="gnDoiServerEdit.prefix.$touched"
+              >
+                <p data-ng-message="required" data-translate="">fieldRequired</p>
+              </div>
+            </div>
+
+            <div class="col-sm-9 col-sm-offset-3">
+              <p class="help-block" data-translate="">doiserver-prefix-help</p>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label class="control-label col-sm-3" data-translate=""
+              >doiserver-publicationGroups</label
+            >
+            <div class="col-sm-9">
+              <div
+                data-gn-multiselect="selectedPublicationGroups"
+                data-choices="groupsForPublication"
+              ></div>
+            </div>
+
+            <div class="col-sm-9 col-sm-offset-3">
+              <p class="help-block" data-translate="">doiserver-publicationGroups-help</p>
+            </div>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+
+  <div
+    class="modal fade"
+    id="passwordResetModal"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="{{'passwordReset' | translate}}"
+    aria-hidden="true"
+  >
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+            &times;
+          </button>
+          <h4
+            class="modal-title"
+            data-translate=""
+            data-translate-values="{ user: '{{doiServerSelected.name}}'}"
+          >
+            resetPasswordTitle
+          </h4>
+        </div>
+        <div class="modal-body">
+          <form id="gn-password-reset" class="form-horizontal" name="gnPasswordReset">
+            <div class="form-group">
+              <input type="hidden" name="_csrf" value="{{csrf}}" />
+              <label class="control-label col-sm-3" data-translate="">username</label>
+
+              <div class="col-sm-9">
+                <input
+                  type="text"
+                  class="form-control"
+                  required=""
+                  data-ng-model="resetUsername"
+                />
+              </div>
+            </div>
+
+            <div class="form-group">
+              <label class="control-label col-sm-3" data-translate="">password</label>
+
+              <div class="col-sm-9">
+                <input
+                  type="password"
+                  class="form-control"
+                  required="required"
+                  autocomplete="off"
+                  data-ng-model="resetPassword"
+                />
+              </div>
+            </div>
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn" data-dismiss="modal">
+            <i class="fa fa-ban-circle"></i>&nbsp; <span data-translate="">cancel</span>
+          </button>
+          <button type="button" class="btn btn-primary" data-ng-click="saveNewPassword()">
+            <i class="fa fa-lock"></i>&nbsp;
+            <span data-translate="">resetPassword</span>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div
+    gn-modal
+    class="gn-confirm-delete"
+    gn-popup-options="{title: 'confirmDialogTitle', confirmCallback: confirmDeleteDoiServerConfig}"
+    id="gn-confirm-remove-doiserver"
+  >
+    <p translate>confirmDoiServerDelete</p>
+  </div>
+</div>
diff --git a/web-ui/src/main/resources/catalog/views/default/directives/directive.js b/web-ui/src/main/resources/catalog/views/default/directives/directive.js
index 3cb6d2575019..37ec7662bc3e 100644
--- a/web-ui/src/main/resources/catalog/views/default/directives/directive.js
+++ b/web-ui/src/main/resources/catalog/views/default/directives/directive.js
@@ -98,6 +98,7 @@
   module.directive("gnMdActionsMenu", [
     "gnMetadataActions",
     "$http",
+    "$q",
     "gnConfig",
     "gnConfigService",
     "gnGlobalSettings",
@@ -105,6 +106,7 @@
     function (
       gnMetadataActions,
       $http,
+      $q,
       gnConfig,
       gnConfigService,
       gnGlobalSettings,
@@ -122,6 +124,12 @@
           scope.tasks = [];
           scope.hasVisibletasks = false;
 
+          scope.doiServers = [];
+
+          $http.get("../api/doiservers").then(function (response) {
+            scope.doiServers = response.data;
+          });
+
           gnConfigService.load().then(function (c) {
             scope.isMdWorkflowEnable = gnConfig["metadata.workflow.enable"];
 
@@ -224,7 +232,16 @@
           scope.taskConfiguration = {
             doiCreationTask: {
               isVisible: function (md) {
-                return gnConfig["system.publication.doi.doienabled"];
+                var hasDoiServer = false;
+
+                for (var i = 0; i < scope.doiServers.length; i++) {
+                  if (scope.doiServers[i].defaultServer) {
+                    hasDoiServer = true;
+                    break;
+                  }
+                }
+
+                return hasDoiServer;
               },
               isApplicable: function (md) {
                 // TODO: Would be good to return why a task is not applicable as tooltip
diff --git a/web/src/main/webResources/WEB-INF/config-db/database_migration.xml b/web/src/main/webResources/WEB-INF/config-db/database_migration.xml
index 1e3fb2025e63..1b1cb2deb32e 100644
--- a/web/src/main/webResources/WEB-INF/config-db/database_migration.xml
+++ b/web/src/main/webResources/WEB-INF/config-db/database_migration.xml
@@ -391,6 +391,7 @@
     </entry>
     <entry key="4.4.5">
       <list>
+        <value>java:v445.DoiServerDatabaseMigration</value>
         <value>WEB-INF/classes/setup/sql/migrate/v445/migrate-</value>
       </list>
     </entry>
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
index 0e84082618eb..b1f7bceaabc8 100644
--- a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
+++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
@@ -723,16 +723,6 @@ INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/userSelfRegistration/recaptcha/publickey', '', 0, 1910, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/userSelfRegistration/recaptcha/secretkey', '', 0, 1910, 'y');
 
-
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/publication/doi/doienabled', 'false', 2, 100191, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/publication/doi/doiurl', '', 0, 100192, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/publication/doi/doiusername', '', 0, 100193, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal, encrypted) VALUES ('system/publication/doi/doipassword', '', 0, 100194, 'y', 'y');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/publication/doi/doikey', '', 0, 110095, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/publication/doi/doilandingpagetemplate', 'http://localhost:8080/geonetwork/srv/resources/records/{{uuid}}', 0, 100195, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/publication/doi/doipublicurl', '', 0, 100196, 'n');
-INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/publication/doi/doipattern', '{{uuid}}', 0, 100197, 'n');
-
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/security/passwordEnforcement/minLength', '6', 1, 12000, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/security/passwordEnforcement/maxLength', '20', 1, 12001, 'n');
 INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/security/passwordEnforcement/usePattern', 'true', 2, 12002, 'n');
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v445/DoiServerDatabaseMigration.java b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v445/DoiServerDatabaseMigration.java
new file mode 100644
index 000000000000..bc1408c0a0dd
--- /dev/null
+++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v445/DoiServerDatabaseMigration.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * United Nations (FAO-UN), United Nations World Food Programme (WFP)
+ * and United Nations Environment Programme (UNEP)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+ * Rome - Italy. email: geonetwork@osgeo.org
+ */
+
+package v445;
+
+import org.fao.geonet.DatabaseMigrationTask;
+import org.fao.geonet.constants.Geonet;
+import org.fao.geonet.migration.DatabaseMigrationException;
+import org.fao.geonet.utils.Log;
+import org.springframework.util.StringUtils;
+
+
+import java.sql.*;
+
+public class DoiServerDatabaseMigration extends DatabaseMigrationTask {
+    @Override
+    public void update(Connection connection) throws SQLException, DatabaseMigrationException {
+        Log.debug(Geonet.DB, "DoiServerDatabaseMigration");
+
+        boolean doiEnabled = false;
+        String doiUrl = "";
+        String doiUsername = "";
+        String doiPassword = "";
+        String doiKey = "";
+        String doiLandingPageTemplate = "";
+        String doiPublicUrl = "";
+        String doiPattern = "";
+
+        try (Statement statement = connection.createStatement()) {
+            final String selectDoiSerttingsSQL = "SELECT name, value FROM Settings WHERE name LIKE 'system/publication/doi%'";
+
+            String columnForName = "name";
+            String columnForValue = "value";
+
+            final ResultSet resultSet = statement.executeQuery(selectDoiSerttingsSQL);
+            while (resultSet.next()) {
+                if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doienabled")) {
+                    doiEnabled = resultSet.getString(columnForValue).equalsIgnoreCase("true");
+                } else if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doiurl")) {
+                    doiUrl = resultSet.getString(columnForValue);
+                } else if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doiusername")) {
+                    doiUsername = resultSet.getString(columnForValue);
+                } else if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doipassword")) {
+                    doiPassword = resultSet.getString(columnForValue);
+                } else if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doikey")) {
+                    doiKey = resultSet.getString(columnForValue);
+                } else if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doilandingpagetemplate")) {
+                    doiLandingPageTemplate = resultSet.getString(columnForValue);
+                } else if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doipublicurl")) {
+                    doiPublicUrl = resultSet.getString(columnForValue);
+                } else if (resultSet.getString(columnForName).equalsIgnoreCase("system/publication/doi/doipattern")) {
+                    doiPattern = resultSet.getString(columnForValue);
+                }
+
+            }
+        }
+
+        if (doiEnabled) {
+
+            // Check the information is filled
+            boolean createDoiServer = StringUtils.hasLength(doiUrl) &&
+                StringUtils.hasLength(doiUsername) &&
+                StringUtils.hasLength(doiPassword) &&
+                StringUtils.hasLength(doiKey) &&
+                StringUtils.hasLength(doiPattern);
+
+            if (createDoiServer) {
+                try (PreparedStatement update = connection.prepareStatement(
+                    "INSERT INTO doiservers " +
+                        "(id, isdefault, landingpagetemplate, name, url, username, password, pattern, prefix, publicurl) " +
+                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+                ) {
+
+                    update.setInt(1, 1);
+                    update.setString(2, "y");
+                    update.setString(3, doiLandingPageTemplate);
+                    update.setString(4, "Default DOI server");
+                    update.setString(5, doiUrl);
+                    update.setString(6, doiUsername);
+                    update.setString(7, doiPassword);
+                    update.setString(8, doiPattern);
+                    update.setString(9, doiKey);
+                    update.setString(10, doiPublicUrl);
+
+                    update.execute();
+
+                } catch (java.sql.BatchUpdateException e) {
+                    connection.rollback();
+                    Log.error(Geonet.GEONETWORK, "Error occurred while creating the DOI server:" + e.getMessage(), e);
+                    SQLException next = e.getNextException();
+                    while (next != null) {
+                        Log.error(Geonet.GEONETWORK, "Next error: " + next.getMessage(), next);
+                        next = e.getNextException();
+                    }
+
+                    throw new RuntimeException(e);
+                } catch (Exception e) {
+                    connection.rollback();
+
+                    throw new Error(e);
+                }
+
+
+                try (PreparedStatement delete = connection.prepareStatement(
+                    "DELETE FROM Settings WHERE name LIKE 'system/publication/doi%'")
+                ) {
+                    delete.execute();
+                } catch (java.sql.BatchUpdateException e) {
+                    connection.rollback();
+                    Log.error(Geonet.GEONETWORK, "Error occurred while creating the DOI server:" + e.getMessage(), e);
+                    SQLException next = e.getNextException();
+                    while (next != null) {
+                        Log.error(Geonet.GEONETWORK, "Next error: " + next.getMessage(), next);
+                        next = e.getNextException();
+                    }
+
+                    throw new RuntimeException(e);
+                } catch (Exception e) {
+                    connection.rollback();
+
+                    throw new Error(e);
+                }
+
+                connection.commit();
+
+                Log.info(Geonet.DB, "Migration: migrated DOI server");
+            }
+        }
+    }
+}