diff --git a/core/pom.xml b/core/pom.xml
index 28134f13a7a..727d0c0ec7f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -391,29 +391,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.jclouds</groupId>
-      <artifactId>jclouds-all</artifactId>
-      <version>2.5.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.chemistry.opencmis</groupId>
-      <artifactId>chemistry-opencmis-client-api</artifactId>
-      <version>1.1.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.chemistry.opencmis</groupId>
-      <artifactId>chemistry-opencmis-client-impl</artifactId>
-      <version>1.1.0</version>
-      <exclusions>
-        <exclusion>
-          <groupId>xml-resolver</groupId>
-          <artifactId>xml-resolver</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
     <dependency>
       <groupId>org.tmatesoft.svnkit</groupId>
@@ -593,11 +570,7 @@
       <groupId>org.elasticsearch.client</groupId>
       <artifactId>elasticsearch-rest-high-level-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
-      <version>1.12.261</version>
-    </dependency>
+
     <dependency>
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
diff --git a/core/src/main/resources/config-spring-geonetwork.xml b/core/src/main/resources/config-spring-geonetwork.xml
index 340bfcce665..052e4d6ae6d 100644
--- a/core/src/main/resources/config-spring-geonetwork.xml
+++ b/core/src/main/resources/config-spring-geonetwork.xml
@@ -251,5 +251,5 @@
      s3      - AWS S3 storage (see config-store/config-s3.xml for more details)
      cmis    - CMIS storage (see config-store/config-cmis.xml for more details)
   -->
-  <import resource="config-store/config-${geonetwork.store.type:default}.xml"/>
+  <import resource="classpath*:/config-store/config-${geonetwork.store.type:default}.xml"/>
 </beans>
diff --git a/datastorages/README.md b/datastorages/README.md
new file mode 100644
index 00000000000..721c1687d55
--- /dev/null
+++ b/datastorages/README.md
@@ -0,0 +1,12 @@
+# Data storage
+
+Extensions for data storage (used for storage resources such as record attachments and thumbnails).
+
+Core provides the default implementation for a data directory:
+
+* org.fao.geonet.resource.FileResources
+
+For more information see:
+
+* org.fao.geonet.resource.Resources
+
diff --git a/datastorages/cmis/README.md b/datastorages/cmis/README.md
new file mode 100644
index 00000000000..5bd20e924f1
--- /dev/null
+++ b/datastorages/cmis/README.md
@@ -0,0 +1,11 @@
+# CMIS Data storage
+
+Extension for data storage (used for storage resources such as record attachments and thumbnails).
+
+* cmis: content management interoperability services
+
+This data storage is based on the Apache Chemistry project which has been retired.
+
+Reference:
+
+* https://chemistry.apache.org/java/opencmis.html
diff --git a/datastorages/cmis/pom.xml b/datastorages/cmis/pom.xml
new file mode 100644
index 00000000000..b7aee1cb941
--- /dev/null
+++ b/datastorages/cmis/pom.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2023 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
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>gn-datastorages</artifactId>
+    <groupId>org.geonetwork-opensource.datastorage</groupId>
+    <version>4.2.12-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>gn-datastorage-cmis</artifactId>
+  <name>CMIS datastorage</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>chemistry-opencmis-client-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.chemistry.opencmis</groupId>
+      <artifactId>chemistry-opencmis-client-impl</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>run-static-analysis</id>
+      <activation>
+        <property>
+          <name>!skipTests</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- Profile to release datastorage bundle -->
+    <profile>
+      <id>release</id>
+      <activation>
+        <property>
+          <!-- include when making a release -->
+          <name>release</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <!-- stage jars for assembly -->
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>stage-libs</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+                <!-- libs to include are managed here rather than in assembly -->
+                <configuration>
+                  <silent>true</silent>
+                  <includeScope>runtime</includeScope>
+                  <excludeScope>provided</excludeScope>
+                  <excludeGroupIds>com.google.code.findbugs</excludeGroupIds>
+                  <excludeTransitive>false</excludeTransitive>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                  <overWriteReleases>false</overWriteReleases>
+                  <overWriteSnapshots>true</overWriteSnapshots>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- generate html conrtents-->
+          <plugin>
+            <groupId>com.ruleoftech</groupId>
+            <artifactId>markdown-page-generator-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>readme</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+                <configuration>
+                  <inputDirectory>${project.basedir}/src/main/assembly</inputDirectory>
+                  <outputDirectory>${project.build.directory}/html</outputDirectory>
+                </configuration>
+              </execution>
+              <execution>
+                <id>licenses</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+                <configuration>
+                  <inputDirectory>${project.basedir}/../../</inputDirectory>
+                  <outputDirectory>${project.build.directory}/html/license</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+            <configuration>
+              <recursiveInput>false</recursiveInput>
+              <transformRelativeMarkdownLinks>true</transformRelativeMarkdownLinks>
+              <headerHtmlFile>${project.basedir}/../../release/src/markdown/html/header.html</headerHtmlFile>
+              <footerHtmlFile>${project.basedir}/../../release/src/markdown/html/footer.html</footerHtmlFile>
+              <pegdownExtensions>TABLES,FENCED_CODE_BLOCKS</pegdownExtensions>
+              <defaultTitle>true</defaultTitle>
+            </configuration>
+          </plugin>
+          <!-- assemble into zip for release -->
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>release-zip</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <descriptors>
+                    <descriptor>src/main/assembly/assembly.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <properties>
+    <rootProjectDir>${basedir}/..</rootProjectDir>
+  </properties>
+</project>
diff --git a/datastorages/cmis/src/main/assembly/README.md b/datastorages/cmis/src/main/assembly/README.md
new file mode 100644
index 00000000000..ee08bc7a3e3
--- /dev/null
+++ b/datastorages/cmis/src/main/assembly/README.md
@@ -0,0 +1,27 @@
+# CMIS data storage provider library
+
+To install the CMIS data storage provider in GeoNetwork:
+
+1. Copy the `lib` folder jar files into to `{GEONETWORK_DIR}/WEB-INF/lib` folder.
+
+2. Define the following environmental variables:
+
+    - Use CMIS data storage provider:
+
+        ```bash
+        export GEONETWORK_STORE_TYPE=cmis
+        ```
+
+    - Setup CMIS connection (check with your setup):
+
+        ```bash
+        export CMIS_REPOSITORY_ID=-default-
+        export CMIS_USERNAME=username
+        export CMIS_PASSWORD=password
+        export CMIS_SERVICES_BASE_URL=http://localhost:8080/alfresco
+        export CMIS_BASE_REPOSITORY_PATH=geonetwork
+        export CMIS_BINDING_TYPE=browser
+        export CMIS_BROWSER_URL=/api/-default-/public/cmis/versions/1.1/browser
+        ```
+
+3. Start GeoNetwork
diff --git a/datastorages/cmis/src/main/assembly/assembly.xml b/datastorages/cmis/src/main/assembly/assembly.xml
new file mode 100644
index 00000000000..86569455568
--- /dev/null
+++ b/datastorages/cmis/src/main/assembly/assembly.xml
@@ -0,0 +1,31 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/lib</directory>
+      <outputDirectory>/lib</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+      <outputDirectory>/lib</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/html/README.html</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/html/license/LICENSE.html</source>
+      <outputDirectory>/license</outputDirectory>
+    </file>
+  </files>
+</assembly>
diff --git a/core/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java b/datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
similarity index 99%
rename from core/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
rename to datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
index 5957cc4c3c8..be1ef9a8d25 100644
--- a/core/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
+++ b/datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java
@@ -190,7 +190,7 @@ public ResourceHolder getResource(final ServiceContext context, final String met
 
     @Override
     public ResourceHolder getResourceInternal(String metadataUuid, MetadataResourceVisibility visibility, String resourceId, Boolean approved) throws Exception {
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
         checkResourceId(resourceId);
 
         try {
@@ -483,7 +483,7 @@ protected boolean tryDelResource(final ServiceContext context, final String meta
     @Override
     public MetadataResource getResourceDescription(final ServiceContext context, final String metadataUuid,
                                                    final MetadataResourceVisibility visibility, final String filename, Boolean approved) throws Exception {
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
         final String key = getKey(context, metadataUuid, metadataId, visibility, filename);
 
         try {
@@ -496,7 +496,7 @@ public MetadataResource getResourceDescription(final ServiceContext context, fin
 
     @Override
     public MetadataResourceContainer getResourceContainerDescription(final ServiceContext context, final String metadataUuid, Boolean approved) throws Exception {
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
 
         final String key = getMetadataDir(context, metadataId);
 
diff --git a/core/src/main/java/org/fao/geonet/resources/CMISConfiguration.java b/datastorages/cmis/src/main/java/org/fao/geonet/resources/CMISConfiguration.java
similarity index 100%
rename from core/src/main/java/org/fao/geonet/resources/CMISConfiguration.java
rename to datastorages/cmis/src/main/java/org/fao/geonet/resources/CMISConfiguration.java
diff --git a/core/src/main/java/org/fao/geonet/resources/CMISResources.java b/datastorages/cmis/src/main/java/org/fao/geonet/resources/CMISResources.java
similarity index 98%
rename from core/src/main/java/org/fao/geonet/resources/CMISResources.java
rename to datastorages/cmis/src/main/java/org/fao/geonet/resources/CMISResources.java
index 408e30386dd..6d10bd48125 100644
--- a/core/src/main/java/org/fao/geonet/resources/CMISResources.java
+++ b/datastorages/cmis/src/main/java/org/fao/geonet/resources/CMISResources.java
@@ -169,7 +169,7 @@ protected Path findImagePath(final String imageName, final Path logosDir) {
                 for (CmisObject object : children) {
                     if (object instanceof Document) {
                         String ext = FilenameUtils.getExtension(object.getName());
-                        if (IMAGE_EXTENSIONS.contains(ext.toLowerCase())) {
+                        if (Resources.IMAGE_EXTENSIONS.contains(ext.toLowerCase())) {
                             //Todo not sure if name will be correct.
                             return getKeyPath(((Document) object).getName());
                         }
@@ -285,7 +285,7 @@ protected Path locateResource(@Nullable final Path resourcesDir, final ServletCo
                 final String suffix = FilenameUtils.getExtension(key);
 
                 // find a different format and convert it to our desired format
-                if (IMAGE_WRITE_SUFFIXES.contains(suffix.toLowerCase())) {
+                if (Resources.IMAGE_WRITE_SUFFIXES.contains(suffix.toLowerCase())) {
                     final String suffixless = FilenameUtils.removeExtension(key);
                     final String suffixlessKeyFilename = FilenameUtils.getName(suffixless);
                     final String suffixlessKeyFolder = getKey(Paths.get(FilenameUtils.getFullPath(suffixless)));
@@ -298,7 +298,7 @@ protected Path locateResource(@Nullable final Path resourcesDir, final ServletCo
                             Document object = entry.getValue();
                             String cmisFilePath = entry.getKey();
                             final String ext = FilenameUtils.getExtension(object.getName()).toLowerCase();
-                            if (IMAGE_READ_SUFFIXES.contains(ext)) {
+                            if (Resources.IMAGE_READ_SUFFIXES.contains(ext)) {
                                 try (ResourceHolder in = new CMISResourceHolder(object.getName(), true);
                                      ResourceHolder out = new CMISResourceHolder(key, true)) {
                                     try (InputStream inS = IO.newInputStream(in.getPath());
diff --git a/core/src/main/java/org/fao/geonet/resources/CMISUtils.java b/datastorages/cmis/src/main/java/org/fao/geonet/resources/CMISUtils.java
similarity index 100%
rename from core/src/main/java/org/fao/geonet/resources/CMISUtils.java
rename to datastorages/cmis/src/main/java/org/fao/geonet/resources/CMISUtils.java
diff --git a/core/src/main/resources/config-store/config-cmis-overrides.properties b/datastorages/cmis/src/main/resources/config-store/config-cmis-overrides.properties
similarity index 100%
rename from core/src/main/resources/config-store/config-cmis-overrides.properties
rename to datastorages/cmis/src/main/resources/config-store/config-cmis-overrides.properties
diff --git a/core/src/main/resources/config-store/config-cmis.xml b/datastorages/cmis/src/main/resources/config-store/config-cmis.xml
similarity index 100%
rename from core/src/main/resources/config-store/config-cmis.xml
rename to datastorages/cmis/src/main/resources/config-store/config-cmis.xml
diff --git a/datastorages/jcloud/README.md b/datastorages/jcloud/README.md
new file mode 100644
index 00000000000..43723d5659c
--- /dev/null
+++ b/datastorages/jcloud/README.md
@@ -0,0 +1,10 @@
+# JCloud Data storage
+
+Extension for data storage (used for storage resources such as record attachments and thumbnails).
+
+This extension uses the Apache JCloud library for portable storage across different cloud providers.
+
+Reference:
+
+* https://jclouds.apache.org
+
diff --git a/datastorages/jcloud/pom.xml b/datastorages/jcloud/pom.xml
new file mode 100644
index 00000000000..08a88efb682
--- /dev/null
+++ b/datastorages/jcloud/pom.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2023 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
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>gn-datastorages</artifactId>
+    <groupId>org.geonetwork-opensource.datastorage</groupId>
+    <version>4.2.12-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>gn-datastorage-jcloud</artifactId>
+  <name>JCloud datastorage</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-domain</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-core</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-domain</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-services</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.jclouds</groupId>
+      <artifactId>jclouds-all</artifactId>
+    </dependency>
+  </dependencies>
+
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>run-static-analysis</id>
+      <activation>
+        <property>
+          <name>!skipTests</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- Profile to release datastorage bundle -->
+    <profile>
+      <id>release</id>
+      <activation>
+        <property>
+          <!-- include when making a release -->
+          <name>release</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <!-- stage jars for assembly -->
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>stage-libs</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+                <!-- libs to include are managed here rather than in assembly -->
+                <configuration>
+                  <silent>true</silent>
+                  <includeScope>runtime</includeScope>
+                  <excludeScope>provided</excludeScope>
+                  <excludeGroupIds>com.google.code.findbugs</excludeGroupIds>
+                  <excludeTransitive>false</excludeTransitive>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                  <overWriteReleases>false</overWriteReleases>
+                  <overWriteSnapshots>true</overWriteSnapshots>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- generate html conrtents-->
+          <plugin>
+            <groupId>com.ruleoftech</groupId>
+            <artifactId>markdown-page-generator-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>readme</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+                <configuration>
+                  <inputDirectory>${project.basedir}/src/main/assembly</inputDirectory>
+                  <outputDirectory>${project.build.directory}/html</outputDirectory>
+                </configuration>
+              </execution>
+              <execution>
+                <id>licenses</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+                <configuration>
+                  <inputDirectory>${project.basedir}/../../</inputDirectory>
+                  <outputDirectory>${project.build.directory}/html/license</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+            <configuration>
+              <recursiveInput>false</recursiveInput>
+              <transformRelativeMarkdownLinks>true</transformRelativeMarkdownLinks>
+              <headerHtmlFile>${project.basedir}/../../release/src/markdown/html/header.html</headerHtmlFile>
+              <footerHtmlFile>${project.basedir}/../../release/src/markdown/html/footer.html</footerHtmlFile>
+              <pegdownExtensions>TABLES,FENCED_CODE_BLOCKS</pegdownExtensions>
+              <defaultTitle>true</defaultTitle>
+            </configuration>
+          </plugin>
+          <!-- assemble into zip for release -->
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>release-zip</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <descriptors>
+                    <descriptor>src/main/assembly/assembly.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <properties>
+    <rootProjectDir>${basedir}/..</rootProjectDir>
+  </properties>
+</project>
diff --git a/datastorages/jcloud/src/main/assembly/README.md b/datastorages/jcloud/src/main/assembly/README.md
new file mode 100644
index 00000000000..2d6ff271b9f
--- /dev/null
+++ b/datastorages/jcloud/src/main/assembly/README.md
@@ -0,0 +1,17 @@
+# JCloud data storage provider library
+
+To install the JCloud data storage provider in GeoNetwork:
+
+1. Copy the `lib` folder jar files into to `{GEONETWORK_DIR}/WEB-INF/lib` folder.
+
+2. Define the following environmental variables:
+   
+    - Use JCloud data storage provider:
+
+        ```bash
+        export GEONETWORK_STORE_TYPE=jcloud
+        ```
+     
+    - Setup JCloud connection `TODO`
+
+3. Start GeoNetwork
diff --git a/datastorages/jcloud/src/main/assembly/assembly.xml b/datastorages/jcloud/src/main/assembly/assembly.xml
new file mode 100644
index 00000000000..86569455568
--- /dev/null
+++ b/datastorages/jcloud/src/main/assembly/assembly.xml
@@ -0,0 +1,31 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/lib</directory>
+      <outputDirectory>/lib</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+      <outputDirectory>/lib</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/html/README.html</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/html/license/LICENSE.html</source>
+      <outputDirectory>/license</outputDirectory>
+    </file>
+  </files>
+</assembly>
diff --git a/core/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java b/datastorages/jcloud/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
similarity index 99%
rename from core/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
rename to datastorages/jcloud/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
index 10c89045643..8de64640d6a 100644
--- a/core/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
+++ b/datastorages/jcloud/src/main/java/org/fao/geonet/api/records/attachments/JCloudStore.java
@@ -230,7 +230,7 @@ public ResourceHolder getResource(final ServiceContext context, final String met
 
     @Override
     public ResourceHolder getResourceInternal(String metadataUuid, MetadataResourceVisibility visibility, String resourceId, Boolean approved) throws Exception {
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
         checkResourceId(resourceId);
 
         try {
@@ -691,7 +691,7 @@ public void copyResources(ServiceContext context, String sourceUuid, String targ
     @Override
     public MetadataResource getResourceDescription(final ServiceContext context, final String metadataUuid,
                                                    final MetadataResourceVisibility visibility, final String filename, Boolean approved) throws Exception {
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
         final String key = getKey(context, metadataUuid, metadataId, visibility, filename);
         try {
             final Blob object = jCloudConfiguration.getClient().getBlobStore().getBlob(jCloudConfiguration.getContainerName(), key);
@@ -708,7 +708,7 @@ public MetadataResource getResourceDescription(final ServiceContext context, fin
 
     @Override
     public MetadataResourceContainer getResourceContainerDescription(final ServiceContext context, final String metadataUuid, Boolean approved) throws Exception {
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
 
         MetadataResourceExternalManagementProperties metadataResourceExternalManagementProperties =
             getMetadataResourceExternalManagementProperties(context, metadataId, metadataUuid, null, String.valueOf(metadataId), null, null, StorageType.FOLDER,
diff --git a/core/src/main/java/org/fao/geonet/resources/JCloudConfiguration.java b/datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudConfiguration.java
similarity index 100%
rename from core/src/main/java/org/fao/geonet/resources/JCloudConfiguration.java
rename to datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudConfiguration.java
diff --git a/core/src/main/java/org/fao/geonet/resources/JCloudMetadataNameValidator.java b/datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudMetadataNameValidator.java
similarity index 100%
rename from core/src/main/java/org/fao/geonet/resources/JCloudMetadataNameValidator.java
rename to datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudMetadataNameValidator.java
diff --git a/core/src/main/java/org/fao/geonet/resources/JCloudResources.java b/datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudResources.java
similarity index 98%
rename from core/src/main/java/org/fao/geonet/resources/JCloudResources.java
rename to datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudResources.java
index b1b61cb9eeb..4a752b9d878 100644
--- a/core/src/main/java/org/fao/geonet/resources/JCloudResources.java
+++ b/datastorages/jcloud/src/main/java/org/fao/geonet/resources/JCloudResources.java
@@ -179,7 +179,7 @@ protected Path findImagePath(final String imageName, final Path logosDir) {
                     // Only add to the list if it is a blob and it matches the filter.
                     if (storageMetadata.getType() == StorageType.BLOB) {
                         String ext = FilenameUtils.getExtension(storageMetadata.getName());
-                        if (IMAGE_EXTENSIONS.contains(ext.toLowerCase())) {
+                        if (Resources.IMAGE_EXTENSIONS.contains(ext.toLowerCase())) {
                             return getKeyPath(storageMetadata.getName());
                         }
                     }
@@ -287,7 +287,7 @@ protected Path locateResource(@Nullable final Path resourcesDir, final ServletCo
                 final String suffix = FilenameUtils.getExtension(key);
 
                 // find a different format and convert it to our desired format
-                if (IMAGE_WRITE_SUFFIXES.contains(suffix.toLowerCase())) {
+                if (Resources.IMAGE_WRITE_SUFFIXES.contains(suffix.toLowerCase())) {
                     final String suffixless = FilenameUtils.removeExtension(key);
                     ListContainerOptions opts = new ListContainerOptions();
                     opts.delimiter(jCloudConfiguration.getFolderDelimiter());
@@ -306,7 +306,7 @@ protected Path locateResource(@Nullable final Path resourcesDir, final ServletCo
                             // Only add to the list if it is a blob and it matches the filter.
                             if (storageMetadata.getType() == StorageType.BLOB) {
                                 final String ext = FilenameUtils.getExtension(storageMetadata.getName()).toLowerCase();
-                                if (IMAGE_READ_SUFFIXES.contains(ext)) {
+                                if (Resources.IMAGE_READ_SUFFIXES.contains(ext)) {
                                     try (ResourceHolder in = new JCloudResourceHolder(storageMetadata.getName(), true);
                                          ResourceHolder out = new JCloudResourceHolder(key, true)) {
                                         try (InputStream inS = IO.newInputStream(in.getPath());
diff --git a/core/src/main/resources/config-store/config-jcloud-overrides.properties b/datastorages/jcloud/src/main/resources/config-store/config-jcloud-overrides.properties
similarity index 100%
rename from core/src/main/resources/config-store/config-jcloud-overrides.properties
rename to datastorages/jcloud/src/main/resources/config-store/config-jcloud-overrides.properties
diff --git a/core/src/main/resources/config-store/config-jcloud.xml b/datastorages/jcloud/src/main/resources/config-store/config-jcloud.xml
similarity index 100%
rename from core/src/main/resources/config-store/config-jcloud.xml
rename to datastorages/jcloud/src/main/resources/config-store/config-jcloud.xml
diff --git a/services/src/test/java/org/fao/geonet/api/records/attachments/JCloudStoreTest.java b/datastorages/jcloud/src/test/java/org/fao/geonet/api/records/attachments/JCloudStoreTest.java
similarity index 100%
rename from services/src/test/java/org/fao/geonet/api/records/attachments/JCloudStoreTest.java
rename to datastorages/jcloud/src/test/java/org/fao/geonet/api/records/attachments/JCloudStoreTest.java
diff --git a/datastorages/pom.xml b/datastorages/pom.xml
new file mode 100644
index 00000000000..b09e325d928
--- /dev/null
+++ b/datastorages/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2023 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
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>geonetwork</artifactId>
+    <groupId>org.geonetwork-opensource</groupId>
+    <version>4.2.12-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+
+  <groupId>org.geonetwork-opensource.datastorage</groupId>
+  <artifactId>gn-datastorages</artifactId>
+  <name>GeoNetwork datastorage providers</name>
+  <packaging>pom</packaging>
+
+  <profiles>
+    <!-- Profile to include CMIS datastorage -->
+    <profile>
+      <id>datastorage-cmis</id>
+      <activation>
+        <property>
+          <!-- include when making a release -->
+          <name>release</name>
+        </property>
+      </activation>
+      <modules>
+        <module>cmis</module>
+      </modules>
+    </profile>
+    <!-- Profile to include S3 datastorage -->
+    <profile>
+      <id>datastorage-s3</id>
+      <activation>
+        <property>
+          <!-- include when making a release -->
+          <name>release</name>
+        </property>
+      </activation>
+      <modules>
+        <module>s3</module>
+      </modules>
+    </profile>
+    <!-- Profile to include JCloud datastorage -->
+    <profile>
+      <id>datastorage-jcloud</id>
+      <activation>
+        <property>
+          <!-- include when making a release -->
+          <name>release</name>
+        </property>
+      </activation>
+      <modules>
+        <module>jcloud</module>
+      </modules>
+    </profile>
+  </profiles>
+
+  <properties>
+    <rootProjectDir>../..</rootProjectDir>
+  </properties>
+</project>
diff --git a/datastorages/s3/README.md b/datastorages/s3/README.md
new file mode 100644
index 00000000000..10cbc40199e
--- /dev/null
+++ b/datastorages/s3/README.md
@@ -0,0 +1,9 @@
+# S3 Data storage
+
+Extension for data storage (used for storage resources such as record attachments and thumbnails).
+
+This extension uses Amazon Web Services Simple Storage Service (S3) data storage directly.
+
+Reference:
+
+* https://docs.aws.amazon.com/AmazonS3/latest/API/Welcome.html
diff --git a/datastorages/s3/pom.xml b/datastorages/s3/pom.xml
new file mode 100644
index 00000000000..9039ac364ea
--- /dev/null
+++ b/datastorages/s3/pom.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2001-2023 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
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>gn-datastorages</artifactId>
+    <groupId>org.geonetwork-opensource.datastorage</groupId>
+    <version>4.2.12-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>gn-datastorage-s3</artifactId>
+  <name>S3 datastorage</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-core</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-domain</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-core</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-domain</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+
+    <dependency>
+      <groupId>org.geonetwork-opensource</groupId>
+      <artifactId>gn-services</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk-s3</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>test-jar</id>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>run-static-analysis</id>
+      <activation>
+        <property>
+          <name>!skipTests</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>findbugs-maven-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <!-- Profile to release datastorage bundle -->
+    <profile>
+      <id>release</id>
+      <activation>
+        <property>
+          <!-- include when making a release -->
+          <name>release</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <!-- stage jars for assembly -->
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>stage-libs</id>
+                <phase>prepare-package</phase>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+                <!-- libs to include are managed here rather than in assembly -->
+                <configuration>
+                  <silent>true</silent>
+                  <includeScope>runtime</includeScope>
+                  <excludeScope>provided</excludeScope>
+                  <excludeGroupIds>com.google.code.findbugs</excludeGroupIds>
+                  <excludeTransitive>false</excludeTransitive>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                  <overWriteReleases>false</overWriteReleases>
+                  <overWriteSnapshots>true</overWriteSnapshots>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <!-- generate html conrtents-->
+          <plugin>
+            <groupId>com.ruleoftech</groupId>
+            <artifactId>markdown-page-generator-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>readme</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+                <configuration>
+                  <inputDirectory>${project.basedir}/src/main/assembly</inputDirectory>
+                  <outputDirectory>${project.build.directory}/html</outputDirectory>
+                </configuration>
+              </execution>
+              <execution>
+                <id>licenses</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+                <configuration>
+                  <inputDirectory>${project.basedir}/../../</inputDirectory>
+                  <outputDirectory>${project.build.directory}/html/license</outputDirectory>
+                </configuration>
+              </execution>
+            </executions>
+            <configuration>
+              <recursiveInput>false</recursiveInput>
+              <transformRelativeMarkdownLinks>true</transformRelativeMarkdownLinks>
+              <headerHtmlFile>${project.basedir}/../../release/src/markdown/html/header.html</headerHtmlFile>
+              <footerHtmlFile>${project.basedir}/../../release/src/markdown/html/footer.html</footerHtmlFile>
+              <pegdownExtensions>TABLES,FENCED_CODE_BLOCKS</pegdownExtensions>
+              <defaultTitle>true</defaultTitle>
+            </configuration>
+          </plugin>
+          <!-- assemble into zip for release -->
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>release-zip</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <finalName>${project.artifactId}-${project.version}</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <descriptors>
+                    <descriptor>src/main/assembly/assembly.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <properties>
+    <rootProjectDir>${basedir}/..</rootProjectDir>
+  </properties>
+</project>
diff --git a/datastorages/s3/src/main/assembly/README.md b/datastorages/s3/src/main/assembly/README.md
new file mode 100644
index 00000000000..7d10887aa70
--- /dev/null
+++ b/datastorages/s3/src/main/assembly/README.md
@@ -0,0 +1,17 @@
+# Amazon S3 data storage provider library
+
+To install the Amazon S3 data storage provider in GeoNetwork:
+
+1. Copy the `lib` folder jar files into to `{GEONETWORK_DIR}/WEB-INF/lib` folder.
+
+2. Define the following environmental variables:
+
+  - Use S3 data storage provider:
+
+    ```shell
+    export GEONETWORK_STORE_TYPE=s3
+    ```
+
+  - Setup S3 connection as described in https://geonetwork-opensource.org/manuals/4.0.x/en/install-guide/customizing-data-directory.html#using-a-s3-object-storage
+
+3. Start GeoNetwork
diff --git a/datastorages/s3/src/main/assembly/assembly.xml b/datastorages/s3/src/main/assembly/assembly.xml
new file mode 100644
index 00000000000..86569455568
--- /dev/null
+++ b/datastorages/s3/src/main/assembly/assembly.xml
@@ -0,0 +1,31 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/lib</directory>
+      <outputDirectory>/lib</outputDirectory>
+    </fileSet>
+  </fileSets>
+
+  <files>
+    <file>
+      <source>${project.build.directory}/${project.artifactId}-${project.version}.jar</source>
+      <outputDirectory>/lib</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/html/README.html</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+
+    <file>
+      <source>${project.build.directory}/html/license/LICENSE.html</source>
+      <outputDirectory>/license</outputDirectory>
+    </file>
+  </files>
+</assembly>
diff --git a/core/src/main/java/org/fao/geonet/api/records/attachments/S3Store.java b/datastorages/s3/src/main/java/org/fao/geonet/api/records/attachments/S3Store.java
similarity index 98%
rename from core/src/main/java/org/fao/geonet/api/records/attachments/S3Store.java
rename to datastorages/s3/src/main/java/org/fao/geonet/api/records/attachments/S3Store.java
index 2114f8f5d20..45871425233 100644
--- a/core/src/main/java/org/fao/geonet/api/records/attachments/S3Store.java
+++ b/datastorages/s3/src/main/java/org/fao/geonet/api/records/attachments/S3Store.java
@@ -243,7 +243,7 @@ private boolean tryDelResource(final String metadataUuid, final int metadataId,
     @Override
     public MetadataResource getResourceDescription(final ServiceContext context, final String metadataUuid,
             final MetadataResourceVisibility visibility, final String filename, Boolean approved) throws Exception {
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
         final String key = getKey(metadataUuid, metadataId, visibility, filename);
         try {
             final ObjectMetadata metadata = s3.getClient().getObjectMetadata(s3.getBucket(), key);
@@ -257,7 +257,7 @@ public MetadataResource getResourceDescription(final ServiceContext context, fin
     @Override
     public MetadataResourceContainer getResourceContainerDescription(ServiceContext context, String metadataUuid, Boolean approved) throws Exception {
 
-        int metadataId = getAndCheckMetadataId(metadataUuid, approved);
+        int metadataId = AbstractStore.getAndCheckMetadataId(metadataUuid, approved);
 
         return new FilesystemStoreResourceContainer(metadataUuid, metadataId, metadataUuid, settingManager.getNodeURL() + "api/records/", approved);
     }
diff --git a/core/src/main/java/org/fao/geonet/resources/S3Credentials.java b/datastorages/s3/src/main/java/org/fao/geonet/resources/S3Credentials.java
similarity index 100%
rename from core/src/main/java/org/fao/geonet/resources/S3Credentials.java
rename to datastorages/s3/src/main/java/org/fao/geonet/resources/S3Credentials.java
diff --git a/core/src/main/java/org/fao/geonet/resources/S3Resources.java b/datastorages/s3/src/main/java/org/fao/geonet/resources/S3Resources.java
similarity index 98%
rename from core/src/main/java/org/fao/geonet/resources/S3Resources.java
rename to datastorages/s3/src/main/java/org/fao/geonet/resources/S3Resources.java
index 418ee170035..fb0c9c71967 100644
--- a/core/src/main/java/org/fao/geonet/resources/S3Resources.java
+++ b/datastorages/s3/src/main/java/org/fao/geonet/resources/S3Resources.java
@@ -105,7 +105,7 @@ protected Path findImagePath(final String imageName, final Path logosDir) {
             final ListObjectsV2Result objects = s3.getClient().listObjectsV2(s3.getBucket(), key);
             for (S3ObjectSummary next: objects.getObjectSummaries()) {
                 String ext = FilenameUtils.getExtension(next.getKey());
-                if (IMAGE_EXTENSIONS.contains(ext.toLowerCase())) {
+                if (Resources.IMAGE_EXTENSIONS.contains(ext.toLowerCase())) {
                     return getKeyPath(next.getKey());
                 }
             }
@@ -203,13 +203,13 @@ protected Path locateResource(@Nullable final Path resourcesDir, final ServletCo
                 final String suffix = FilenameUtils.getExtension(key);
 
                 // find a different format and convert it to our desired format
-                if (IMAGE_WRITE_SUFFIXES.contains(suffix.toLowerCase())) {
+                if (Resources.IMAGE_WRITE_SUFFIXES.contains(suffix.toLowerCase())) {
                     final String suffixless = FilenameUtils.removeExtension(key);
                     final ListObjectsV2Result objects =
                         s3.getClient().listObjectsV2(s3.getBucket(), suffixless + ".");
                     for (S3ObjectSummary object: objects.getObjectSummaries()) {
                         final String ext = FilenameUtils.getExtension(object.getKey()).toLowerCase();
-                        if (IMAGE_READ_SUFFIXES.contains(ext)) {
+                        if (Resources.IMAGE_READ_SUFFIXES.contains(ext)) {
                             try (ResourceHolder in = new S3ResourceHolder(object.getKey(), true);
                                  ResourceHolder out = new S3ResourceHolder(key, true)) {
                                 try (InputStream inS = IO.newInputStream(in.getPath());
diff --git a/core/src/main/resources/config-store/config-s3.xml b/datastorages/s3/src/main/resources/config-s3.xml
similarity index 100%
rename from core/src/main/resources/config-store/config-s3.xml
rename to datastorages/s3/src/main/resources/config-s3.xml
diff --git a/services/src/test/java/org/fao/geonet/api/records/attachments/S3StoreTest.java b/datastorages/s3/src/test/java/org/fao/geonet/api/records/attachments/S3StoreTest.java
similarity index 100%
rename from services/src/test/java/org/fao/geonet/api/records/attachments/S3StoreTest.java
rename to datastorages/s3/src/test/java/org/fao/geonet/api/records/attachments/S3StoreTest.java
diff --git a/pom.xml b/pom.xml
index b01bac0752e..4ebde11a958 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1218,6 +1218,36 @@
         <artifactId>json</artifactId>
         <version>20240205</version>
       </dependency>
+
+      <dependency>
+        <groupId>org.apache.chemistry.opencmis</groupId>
+        <artifactId>chemistry-opencmis-client-api</artifactId>
+        <version>1.1.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.chemistry.opencmis</groupId>
+        <artifactId>chemistry-opencmis-client-impl</artifactId>
+        <version>1.1.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-resolver</groupId>
+            <artifactId>xml-resolver</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.jclouds</groupId>
+        <artifactId>jclouds-all</artifactId>
+        <version>2.3.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.amazonaws</groupId>
+        <artifactId>aws-java-sdk-s3</artifactId>
+        <version>1.12.261</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -1330,6 +1360,7 @@
     <module>estest</module>
     <module>index</module>
     <module>translationproviders</module>
+    <module>datastorages</module>
   </modules>
 
   <profiles>
diff --git a/release/README.md b/release/README.md
index c7bb22a0600..1f11c5772da 100644
--- a/release/README.md
+++ b/release/README.md
@@ -3,6 +3,21 @@ Release
 
 The release module for GeoNetwork.
 
+To generate ``zip`` bundles use the release profile (``release``, ``cmis``, ``jcloud``, ``s3``):
+```
+mvn clean install -Drelease
+```
+
+To generate only for the ``release`` module:
+```bash
+cd release
+mvn clean install -Drelease
+```
+
+This module is designed to be used as part of a full build. It copies files from web/target so gn-web-app must be built first.
+
+## Manual release
+
 Open a terminal window and execute the following steps from within the ``release`` folder.
 
 1. Once GeoNetwork has been built (run Maven in the repository root), download Jetty:
diff --git a/release/src/markdown/html/footer.html b/release/src/markdown/html/footer.html
new file mode 100644
index 00000000000..4585167c822
--- /dev/null
+++ b/release/src/markdown/html/footer.html
@@ -0,0 +1,8 @@
+    </div>
+    <footer>
+      <p>
+        © Copyright 2023, Open Source Geospatial Foundation
+      </p>
+    </footer>
+  </body>
+</html>
diff --git a/release/src/markdown/html/header.html b/release/src/markdown/html/header.html
new file mode 100644
index 00000000000..01bb2ff3142
--- /dev/null
+++ b/release/src/markdown/html/header.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html>
+
+<html lang="${lang}">
+<head>
+    <title>titleToken</title>
+    <meta charset="utf-8" />
+  <style>
+
+    body, html, h1, h2, h3, h4, h5, .rst-content .toctree-wrapper p.caption {
+      font-family: "Lucida Sans", "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
+      -webkit-font-smoothing: antialiased;
+      text-rendering: optimizeLegibility;
+      color: #777;
+    }
+    /* general */
+    body {
+     font-family: 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
+      margin: 0;
+    }
+    h1 {
+      font-size: 32px;
+    }
+    h2 {
+      padding-bottom: .3rem;
+      border-bottom: 1px solid #eaecef;
+    }
+    h4 {
+      font-size: 110%;
+      text-decoration: underline;
+    }
+    p {
+      margin-bottom: 20px;
+      line-height: 24px;
+    }
+    a {
+      color: #003366;
+    }
+    a:hover, a:focus, a:visited {
+      color: #003366;
+      text-decoration: underline;
+    }
+    ul {
+      margin-bottom: 24px;
+    }
+    ul li {
+      margin-top: 5px;
+      margin-bottom: 5px;
+      line-height: 24px;
+    }
+    ul li p {
+      margin-top: 5px;
+      margin-bottom: 5px;
+    }
+    .clearfix:before, .clearfix:after {
+      content: " ";
+      display: table;
+    }
+    .clearfix:after {
+      clear: both;
+    }
+    /* layout */
+    header {
+      border-bottom: 1px solid #003366;
+      padding: 15px 10px 10px 10px;
+    }
+    .gn-logo {
+      float: left;
+    }
+    .gn-logo svg {
+      width: 42px;
+      height: 42px;
+    }
+    .wrapper {
+      max-width: 700px;
+      margin: 0 auto;
+    }
+    @media (max-width: 700px) {
+      .wrapper {
+        padding: 0 15px;
+      }
+    }
+    footer {
+      border-top: 1px solid #003366;
+      padding: 15px;
+      color: grey;
+    }
+    footer p {
+      margin: 0;
+    }
+  </style>
+</head>
+<body>
+  <header class="clearfix">
+    <div class="gn-logo">
+      <a href="https://geonetwork-opensource.org" target="_blank">
+
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="70px" height="70px" viewBox="0 0 70 70" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Logos/GeoNetwork</title>
+    <defs>
+        <radialGradient cx="52.047668%" cy="53.0601864%" fx="52.047668%" fy="53.0601864%" r="69.8119254%" gradientTransform="translate(0.5205, 0.5306), scale(0.8599, 1), translate(-0.5205, -0.5306)" id="radialGradient-1">
+            <stop stop-color="#CDCD08" offset="0%"></stop>
+            <stop stop-color="#CDCD08" offset="58.74%"></stop>
+            <stop stop-color="#998675" offset="100%"></stop>
+        </radialGradient>
+        <radialGradient cx="34.2741853%" cy="51.5249214%" fx="34.2741853%" fy="51.5249214%" r="34.5721994%" gradientTransform="translate(0.3427, 0.5152), scale(0.9825, 1), translate(-0.3427, -0.5152)" id="radialGradient-2">
+            <stop stop-color="#0D71B9" offset="0%"></stop>
+            <stop stop-color="#1C3761" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="Logos/GeoNetwork" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="gn-logo" transform="translate(2, 3)" fill-rule="nonzero">
+            <g id="Group">
+                <path d="M33.582707,55.1704248 C18.5164297,55.1704248 6.10587257,52.8613512 4.47316747,49.9313725 C4.3520451,49.7152282 4.29066827,49.4956174 4.29066827,49.272948 C4.29066827,47.2536301 9.38881902,46.601119 17.1477877,46.3951702 C21.9751463,46.9956843 27.5904121,47.3072583 33.582707,47.3072583 C48.2996869,47.3072583 60.2310562,49.9340233 60.2310562,53.1739448 C60.2310562,53.4420861 60.1494923,53.6871856 59.9912584,53.9108745 C58.8991179,55.4536554 54.1657617,55.9856559 47.4920005,56.1663199 C43.7924665,55.5468422 38.9206556,55.1704248 33.582707,55.1704248 Z M17.6436961,18.6169572 C20.6215936,18.2486962 23.897811,17.8300696 27.37386,17.8300696 L27.3742678,17.8300696 C27.624465,15.3217762 27.9129973,13.6849929 28.2535265,11.855311 C29.9677955,11.9376905 31.6033554,11.9847936 33.5117464,11.9847936 L33.5117464,17.8300696 L33.58495,17.8300696 C39.3843463,17.8300696 44.8183363,18.1016773 49.5160084,18.68282 C56.0246026,17.6139253 60.2345227,15.8749832 60.2345227,13.9494638 C60.2345227,13.5901748 60.0862803,13.2229334 59.8061084,12.8830159 C57.5547412,10.1447123 46.6702444,8.06055112 33.582707,8.06055112 C20.6014066,8.06055112 9.78746252,10.1004639 7.41660424,12.8055302 C7.10034027,13.1678778 6.93374603,13.5369544 6.93374603,13.9190812 C6.93374603,15.843785 11.1422387,17.5476546 17.6436961,18.6169572 Z" id="Shape" fill="url(#radialGradient-1)"></path>
+                <path d="M59.8028458,12.8729066 C59.940907,13.0507025 60.0756009,13.2318657 60.2136621,13.413029 C60.0877233,13.2278249 59.9557233,13.0480086 59.8095805,12.8675188 L59.8028458,12.8729066 Z" id="Shape" stroke="#35679A" stroke-width="0.2674" fill="#1C3761"></path>
+                <path d="M46.6916549,64.561283 L46.6932862,64.561283 C46.4683737,63.4165338 40.5598858,63.2024286 33.582707,63.2024286 C23.7281582,63.2024286 15.4634934,61.7952476 13.2288468,60.066705 L13.2321094,60.0614033 C9.67103007,57.3210606 6.69109346,53.8727434 4.47316747,49.9362663 C6.10566866,52.8668568 18.5164297,55.1785812 33.582707,55.1785812 C38.9206556,55.1785812 43.7922626,55.5619315 47.4920005,56.1816131 C51.8097888,56.9050848 54.5313718,57.975203 54.5313718,59.149723 C54.5313718,59.4419256 54.3631463,59.7565583 54.0440276,60.0300012 L54.0436197,60.102797 C51.8032637,61.8407195 49.3351405,63.1439065 46.6916549,64.561283 Z M60.2310562,53.1737409 C60.2310562,53.4418822 60.1494923,53.6869816 59.9912584,53.9106706 C62.4410297,50.7129584 64.4680962,47.014444 65.6377224,43.055129 C65.6940014,42.8854761 65.7219371,42.6988987 65.7219371,42.5267989 C65.7219371,38.6871789 51.3330479,35.5751088 33.582707,35.5751088 C15.3464492,35.5751088 0.54810932,32.5176865 0.54810932,28.6788822 L0.545866313,28.6034356 C0.305048937,30.2226827 0.18025619,31.8800608 0.18025619,33.5659864 C0.18025619,36.0257493 0.445950552,38.4241354 0.950627102,40.7323934 C1.46733433,43.1617738 7.85664141,45.2410412 17.1479916,46.3951702 C21.9753502,46.9956843 27.590616,47.3072583 33.5829109,47.3072583 C48.2996869,47.3070544 60.2310562,49.9338194 60.2310562,53.1737409 Z M40.234038,19.6012294 C40.5992404,23.2367357 40.8265997,27.2284724 40.8863452,31.4322751 C55.1167966,30.7167559 65.7160237,27.9572457 65.7160237,24.6606373 C65.7160237,24.4881297 65.6942053,24.3141947 65.6377224,24.1455614 C64.439141,20.0616575 62.4807921,16.3036014 59.9272307,13.0328896 C60.1264505,13.3218296 60.2308523,13.6179066 60.2308523,13.9186734 C60.2310562,16.6533066 51.7339344,18.9509613 40.234038,19.6012294 Z M33.5665981,11.9847936 C31.7124471,11.9847936 29.9955272,11.9421765 28.28187,11.8604087 C27.8469305,14.1857951 27.4725523,16.7938004 27.1901373,19.6148913 C15.5642248,18.9841986 6.93863986,16.6730859 6.93863986,13.9182656 C6.93863986,13.6164792 7.04161427,13.3191788 7.2416497,13.0288114 C4.67157162,16.320322 2.67937369,20.0985652 1.48283146,24.2120359 C1.4396026,24.3606861 1.43491268,24.509948 1.43491268,24.6602295 C1.43491268,28.4992377 16.0625802,31.6115117 33.5665981,31.6115117 L33.5665981,11.9847936 Z M46.0931799,3.35064447 C46.0931799,2.75645156 45.2367591,2.2054875 43.7806398,1.75505094 L43.782271,1.74974928 C40.5664109,0.720616941 37.139912,0.163943413 33.582707,0.163943413 C29.9211002,0.163943413 26.3985598,0.752630767 23.1005241,1.84130475 L23.1021553,1.84579076 C21.8187476,2.27869109 21.072438,2.79580613 21.072438,3.35064447 C21.072438,4.87140315 26.6728184,6.10526085 33.582707,6.10526085 C40.4913721,6.10526085 46.0931799,4.87140315 46.0931799,3.35064447 Z" id="Shape" fill="url(#radialGradient-2)"></path>
+            </g>
+        </g>
+    </g>
+</svg>
+
+      </a>
+    </div>
+  </header>
+  <div class="wrapper" role="main">
diff --git a/software_development/BUILDING.md b/software_development/BUILDING.md
index 397a7074c69..0ea9fff8c9a 100644
--- a/software_development/BUILDING.md
+++ b/software_development/BUILDING.md
@@ -66,7 +66,19 @@ Please refer to the maven documentation for additional options, [Maven: The Comp
 
 ## Maven Profiles
 
-Maven profiles are used to enable additional build configuration.
+Maven profiles are used to enable additional build configuration or optional modules:
+
+```
+mvn install -Pdatastorage-s3
+```
+
+Some build profiles are activated with specific properties, such as `release` to build release bundles:
+
+```
+mvn install -Drelease
+```
+
+The `release` flag above asks `datastorage-s3`, `datastorage-jcloud`, `datastorage-cmis` and the `release` module to produce `zip` bundles for distribution.
 
 ## Run Elasticsearch
 
diff --git a/web/pom.xml b/web/pom.xml
index 35a182c832b..efe8c160dd6 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -1331,6 +1331,39 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <id>datastorage-cmis</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.geonetwork-opensource.datastorage</groupId>
+          <artifactId>gn-datastorage-cmis</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>datastorage-jcloud</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.geonetwork-opensource.datastorage</groupId>
+          <artifactId>gn-datastorage-jcloud</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>datastorage-s3</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.geonetwork-opensource.datastorage</groupId>
+          <artifactId>gn-datastorage-s3</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
     <profile>
       <id>war</id>
       <dependencies>