diff --git a/pom.xml b/pom.xml
index ba622642..455b93f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,6 +280,11 @@
       <artifactId>celements-keycloak</artifactId>
       <version>7.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>com.celements</groupId>
+      <artifactId>celements-s3</artifactId>
+      <version>7.0-SNAPSHOT</version>
+    </dependency>
 
     <!-- Spring -->
     <dependency>
@@ -365,7 +370,7 @@
   </dependencies>
   <dependencyManagement>
     <dependencies>
-      <!-- Align ALL Spring 5.3.x artifacts -->
+      <!-- Align Spring artifacts -->
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-framework-bom</artifactId>
@@ -373,8 +378,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-
-      <!-- Align ALL Jackson 2.x artifacts (core, databind, annotations, dataformats, datatype-*) -->
+      <!-- Align Jackson artifacts -->
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
@@ -382,13 +386,21 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-
-      <!-- Force the newer JTA for old Hibernate transitive -->
+      <!-- internal conflict between hibernate:jar:3.2.6.ga and hibernate-core:jar:3.3.2.GA -->
       <dependency>
         <groupId>javax.transaction</groupId>
         <artifactId>jta</artifactId>
         <version>1.1</version>
       </dependency>
+      <!--
+        aws-sdk internal conflict because they don't enforce dependency convergence, see
+        https://github.com/aws/aws-sdk-java-v2/issues/2669
+      -->
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>4.4.16</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>