diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-resource-id.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-resource-id.xsl
index 935954f09c0c..7ea1f1f8f53f 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-resource-id.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/process/add-resource-id.xsl
@@ -8,14 +8,16 @@
                 xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
                 xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0"
                 xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0"
+                xmlns:util="java:org.fao.geonet.util.XslUtil"
+                xmlns:util-uuid="java:java.util.UUID"
                 version="2.0" exclude-result-prefixes="#all">
 
   <xsl:import href="../../iso19139/process/process-utility.xsl"/>
 
   <!-- i18n information -->
   <xsl:variable name="add-resource-id-loc">
-    <msg id="a" xml:lang="eng">Current record does not contain resource identifier. Compute resource identifier from metadata record identifier.</msg>
-    <msg id="a" xml:lang="fre">Cette fiche ne contient pas d'identifiant pour la ressource. Calculer l'identifiant à partir de l'identifiant de la fiche.</msg>
+    <msg id="a" xml:lang="eng">Current record does not contain resource identifier. Compute a resource identifier.</msg>
+    <msg id="a" xml:lang="fre">Cette fiche ne contient pas d'identifiant pour la ressource.  Calculer un identifiant de ressource.</msg>
   </xsl:variable>
 
 
@@ -72,10 +74,19 @@
                 cit:edition|
                 cit:editionDate"/>
 
-      <!-- Create resource identifier based on metadata record identifier -->
-      <xsl:variable name="urlWithoutLang" select="substring-before($catalogUrl, $nodeId)"/>
-      <xsl:variable name="prefix" select="if ($resource-id-url-prefix != '') then $resource-id-url-prefix else $urlWithoutLang"/>
-      <xsl:variable name="code" select="concat($prefix, /*/mdb:metadataIdentifier/mcc:MD_Identifier/mcc:code/gco:CharacterString)"/>
+      <!-- Create a random resource identifier -->
+      <xsl:variable name="resource-id-url-prefix-tmp"
+                    select="util:getSettingValue('metadata/resourceIdentifierPrefix')"/>
+
+      <xsl:variable name="resource-id-url-prefix-local"
+                    select="if (ends-with($resource-id-url-prefix-tmp, '/'))
+                            then $resource-id-url-prefix-tmp
+                            else concat($resource-id-url-prefix-tmp, '/')"/>
+
+
+      <xsl:variable name="resourceUuid" select="util-uuid:toString(util-uuid:randomUUID())" />
+      <xsl:variable name="prefix" select="if ($resource-id-url-prefix != '') then $resource-id-url-prefix else $resource-id-url-prefix-local"/>
+      <xsl:variable name="code" select="concat($prefix, $resourceUuid)"/>
 
       <xsl:copy-of
               select="cit:identifier[mcc:MD_Identifier/mcc:code/gco:CharacterString != $code]"/>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/process/add-resource-id.xsl b/schemas/iso19139/src/main/plugin/iso19139/process/add-resource-id.xsl
index ef94f4208840..f686d65de003 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/process/add-resource-id.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/process/add-resource-id.xsl
@@ -29,25 +29,28 @@
                 xmlns:xs="http://www.w3.org/2001/XMLSchema"
                 xmlns:gn-fn-iso19139="http://geonetwork-opensource.org/xsl/functions/profiles/iso19139"
                 xmlns:util="java:org.fao.geonet.util.XslUtil"
+                xmlns:util-uuid="java:java.util.UUID"
                 version="2.0" exclude-result-prefixes="#all">
 
   <xsl:import href="../../iso19139/process/process-utility.xsl"/>
 
   <!-- i18n information -->
   <xsl:variable name="add-resource-id-loc">
-    <msg id="a" xml:lang="eng">Current record does not contain resource identifier. Add the
-      following identifier:
-    </msg>
-    <msg id="a" xml:lang="fre">Cette fiche ne contient pas d'identifiant pour la ressource. Ajouter
-      l'identifiant suivant :
-    </msg>
-    <msg id="a" xml:lang="dut">Het huidige record bevat geen resource-ID. Voeg deze identifier toe: </msg>
+    <msg id="a" xml:lang="eng">Current record does not contain resource identifier. Compute a resource identifier.</msg>
+    <msg id="a" xml:lang="fre">Cette fiche ne contient pas d'identifiant pour la ressource. Calculer un identifiant de ressource.</msg>
+    <msg id="a" xml:lang="dut">Het huidige record bevat geen resource-ID. Bereken een bronidentificatie.</msg>
   </xsl:variable>
 
 
-  <xsl:variable name="resource-id-url-prefix"
+  <xsl:variable name="resource-id-url-prefix-tmp"
                 select="util:getSettingValue('metadata/resourceIdentifierPrefix')"/>
 
+  <xsl:variable name="resource-id-url-prefix"
+                select="if (ends-with($resource-id-url-prefix-tmp, '/'))
+                            then $resource-id-url-prefix-tmp
+                            else concat($resource-id-url-prefix-tmp, '/')"/>
+
+
 
   <xsl:template name="list-add-resource-id">
     <suggestion process="add-resource-id"/>
@@ -62,14 +65,11 @@
                   select="count($root//gmd:identificationInfo/*/gmd:citation/
             gmd:CI_Citation/gmd:identifier/*/gmd:code[gco:CharacterString != '']) > 0"/>
 
-    <xsl:variable name="code"
-                  select="gn-fn-iso19139:resource-id-generate($root/*/gmd:fileIdentifier/gco:CharacterString)"/>
     <xsl:if test="not($hasResourceId)">
       <suggestion process="add-resource-id" id="{generate-id()}" category="identification"
                   target="identification">
         <name>
-          <xsl:value-of select="geonet:i18n($add-resource-id-loc, 'a', $guiLang)"/><xsl:text> </xsl:text><xsl:value-of
-          select="$code"/>.
+          <xsl:value-of select="geonet:i18n($add-resource-id-loc, 'a', $guiLang)"/>
         </name>
         <operational>true</operational>
       </suggestion>
@@ -89,13 +89,13 @@
   <xsl:template match="geonet:*" priority="2"/>
 
   <xsl:function name="gn-fn-iso19139:resource-id-generate" as="xs:string">
-    <xsl:param name="fileIdentifier" as="xs:string"/>
+    <xsl:param name="resourceIdentifier" as="xs:string"/>
 
     <!-- Create resource identifier based on metadata record identifier -->
     <xsl:variable name="urlWithoutLang" select="substring-before($catalogUrl, $nodeId)"/>
     <xsl:variable name="prefix"
                   select="if ($resource-id-url-prefix != '') then $resource-id-url-prefix else $urlWithoutLang"/>
-    <xsl:value-of select="concat($prefix, $fileIdentifier)"/>
+    <xsl:value-of select="concat($prefix, $resourceIdentifier)"/>
   </xsl:function>
 
   <xsl:template
@@ -112,10 +112,10 @@
                 gmd:edition|
                 gmd:editionDate"/>
 
-      <xsl:variable name="code"
-                    select="gn-fn-iso19139:resource-id-generate(/*/gmd:fileIdentifier/gco:CharacterString)"/>
+      <xsl:variable name="code" select="gn-fn-iso19139:resource-id-generate(util-uuid:toString(util-uuid:randomUUID()))" />
+
       <xsl:copy-of
-        select="gmd:identifier[gmd:MD_Identifier/gmd:code/gco:CharacterString != $code]"/>
+        select="gmd:identifier"/>
       <gmd:identifier>
         <gmd:MD_Identifier>
           <gmd:code>