diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab023816d..68258f4df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,9 +9,11 @@
 <!-- TOC -->
 * [Changelog](#changelog)
 * [PLANNED - 5.x - RELEASE TBD](#planned---5x---release-tbd)
-    * [Planned changes](#planned-changes)
+  * [Planned changes](#planned-changes)
 * [CURRENT - 4.x - THIS VERSION IS UNDER ACTIVE DEVELOPMENT](#current---4x---this-version-is-under-active-development)
-    * [4.0.0](#400)
+  * [4.1.1 - PLANNED](#411---planned)
+  * [4.1.0 - PLANNED](#410---planned)
+  * [4.0.0](#400)
 * [DEPRECATED - 3.x](#deprecated---3x)
   * [3.12.0](#3120)
   * [3.11.0](#3110)
@@ -113,11 +115,13 @@ Running S3Mock in unit tests is still supported by using [TestContainers](https:
 
 **Once 5.x is released, 4.x may receive bug fixes and features, this will be best-effort only.**
 
-### Planned changes
+## Planned changes
 
 * Features and fixes
   * TBD
 * Refactorings
+  * AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
+    * S3Mock will remove usage of Java v1 early 2026.
   * Looking to Remove unit test modules. This enables
     * Refactoring S3Mock to a "standard" Spring Boot application.
     * Removal of workarounds to use `S3MockApplication#start` from a static context
@@ -133,24 +137,76 @@ Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Jav
 
 **The current major version 4 will receive new features, dependency updates and bug fixes on a continuous basis.**
 
-### 4.0.0
+## 4.1.1 - PLANNED
+Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+* Features and fixes
+  * Content-Encoding: aws-chunked should not be stored (fixes #2218)
+* Refactorings
+  * TBD
+* Version updates (deliverable dependencies)
+  * TBD
+* Version updates (build dependencies)
+  * TBD
+
+## 4.1.0 - PLANNED
+Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
 
 * Features and fixes
+  * Support Browser-Based Uploads Using POST (fixes #2200)
+    * https://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-UsingHTTPPOST.html
+* Refactorings
+  * TBD
+* Version updates (deliverable dependencies)
+  * TBD
+* Version updates (build dependencies)
+  * TBD
+
+## 4.0.0
+Version 4.x is JDK17 LTS bytecode compatible, with Docker and JUnit / direct Java integration.
+
+* Features and fixes
+  * Basic support for versions in API (fixes #64)
   * Allow overriding headers in head object
   * Implement If-(Un)modified-Since handling (fixes #829)
   * Close all InputStreams and OutputStreams
+  * Add AWS SDK V1 deprecation notice
+    * AWS has deprecated SDK for Java v1, and will remove support EOY 2025.
+    * S3Mock will remove usage of Java v1 early 2026.
 * Refactorings
   * Use Tomcat instead of Jetty as the application container (fixes #2136)
   * "FROM" in Dockerfile did not match "as"
   * Delete files on shutdown using a `DisposableBean` instead of `File#deleteOnExit()`
 * Version updates (deliverable dependencies)
-  * Bump spring-boot.version from 3.3.5 to 3.4.1
-* Version updates (build dependencies)
-  * Bump github/codeql-action from 3.27.6 to 3.27.9
-  * Bump actions/upload-artifact from 4.4.3 to 4.5.0
-  * Bump actions/setup-java from 4.5.0 to 4.6.0
-  * Bump com.puppycrawl.tools:checkstyle from 10.20.2 to 10.21.0
+  * Bump spring-boot.version from 3.3.5 to 3.4.4
   * Jackson 2.18.2 to 2.17.2 (remove override, use Spring-Boot supplied version)
+  * Bump aws-v2.version from 2.29.29 to 2.31.17
+  * Bump aws.version from 1.12.779 to 1.12.780
+  * Bump aws.sdk.kotlin:s3-jvm from 1.4.41 to 1.4.59
+  * Bump kotlin.version from 2.1.0 to 2.1.20
+  * Bump testcontainers.version from 1.20.4 to 1.20.6
+  * Bump org.testng:testng from 7.10.2 to 7.11.0
+  * Bump aws.version from 1.12.780 to 1.12.782
+  * Bump alpine from 3.21.0 to 3.21.3 in /docker
+* Version updates (build dependencies)
+  * Bump org.apache.maven.plugins:maven-compiler-plugin from 3.13.0 to 3.14.0
+  * Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.0 to 3.4.1
+  * Bump org.apache.maven.plugins:maven-install-plugin from 3.1.3 to 3.1.4
+  * Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.3 to 3.1.4
+  * Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.2 to 3.5.3
+  * Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.2 to 3.5.3
+  * Bump io.fabric8:docker-maven-plugin from 0.45.1 to 0.46.0
+  * Bump org.jacoco:jacoco-maven-plugin from 0.8.12 to 0.8.13
+  * Bump license-maven-plugin-git.version from 4.6 to 5.0.0
+  * Bump github/codeql-action from 3.27.6 to 3.28.15
+  * Bump docker/setup-qemu-action from 3.2.0 to 3.6.0
+  * Bump actions/upload-artifact from 4.4.3 to 4.6.2
+  * Bump actions/setup-java from 4.5.0 to 4.7.0
+  * Bump actions/dependency-review-action from 4.5.0 to 4.6.0
+  * Bump step-security/harden-runner from 2.10.2 to 2.11.1
+  * Bump ossf/scorecard-action from 2.4.0 to 2.4.1
+  * Bump com.puppycrawl.tools:checkstyle from 10.20.2 to 10.23.0
+  * Bump advanced-security/sbom-generator-action from 0.0.1 to 0.0.2
 
 
 # DEPRECATED - 3.x
diff --git a/README.md b/README.md
index c95d0dc52..732533b55 100755
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ Of these [operations of the Amazon S3 API](https://docs.aws.amazon.com/AmazonS3/
 | [GetBucketReplication](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketReplication.html)                                               | :x:                |                           |
 | [GetBucketRequestPayment](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketRequestPayment.html)                                         | :x:                |                           |
 | [GetBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketTagging.html)                                                       | :x:                |                           |
-| [GetBucketVersioning](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketVersioning.html)                                                 | :x:                |                           |
+| [GetBucketVersioning](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketVersioning.html)                                                 | :white_check_mark: |                           |
 | [GetBucketWebsite](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketWebsite.html)                                                       | :x:                |                           |
 | [GetObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html)                                                                     | :white_check_mark: |                           |
 | [GetObjectAcl](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectAcl.html)                                                               | :white_check_mark: |                           |
@@ -143,7 +143,7 @@ Of these [operations of the Amazon S3 API](https://docs.aws.amazon.com/AmazonS3/
 | [PutBucketReplication](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketReplication.html)                                               | :x:                |                           |
 | [PutBucketRequestPayment](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketRequestPayment.html)                                         | :x:                |                           |
 | [PutBucketTagging](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketTagging.html)                                                       | :x:                |                           |
-| [PutBucketVersioning](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketVersioning.html)                                                 | :x:                |                           |
+| [PutBucketVersioning](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketVersioning.html)                                                 | :white_check_mark: |                           |
 | [PutBucketWebsite](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketWebsite.html)                                                       | :x:                |                           |
 | [PutObject](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html)                                                                     | :white_check_mark: |                           |
 | [PutObjectAcl](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObjectAcl.html)                                                               | :white_check_mark: |                           |
diff --git a/build-config/src/main/resources/build-config/checkstyle.xml b/build-config/src/main/resources/build-config/checkstyle.xml
index be380256a..dce275c58 100644
--- a/build-config/src/main/resources/build-config/checkstyle.xml
+++ b/build-config/src/main/resources/build-config/checkstyle.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 
-     Copyright 2017-2021 Adobe.
+     Copyright 2017-2025 Adobe.
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -201,7 +201,9 @@
       <property name="allowedAbbreviationLength" value="4"/>
     </module>
     <module name="OverloadMethodsDeclarationOrder"/>
-    <module name="VariableDeclarationUsageDistance"/>
+    <module name="VariableDeclarationUsageDistance">
+      <property name="allowedDistance" value="4"/>
+    </module>
     <module name="CustomImportOrder">
       <property name="sortImportsInGroupAlphabetically" value="true"/>
       <property name="separateLineBetweenGroups" value="true"/>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7e776f912..1591a7657 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -40,6 +40,7 @@
       <groupId>com.adobe.testing</groupId>
       <artifactId>s3mock-docker</artifactId>
       <type>pom</type>
+      <scope>test</scope>
       <exclusions>
         <exclusion>
           <groupId>*</groupId>
@@ -70,6 +71,7 @@
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
@@ -170,7 +172,7 @@
                     <COM_ADOBE_TESTING_S3MOCK_DOMAIN_INITIAL_BUCKETS>bucket-a, bucket-b</COM_ADOBE_TESTING_S3MOCK_DOMAIN_INITIAL_BUCKETS>
                     <COM_ADOBE_TESTING_S3MOCK_REGION>eu-west-1</COM_ADOBE_TESTING_S3MOCK_REGION>
                   </env>
-                  <memory>192000000</memory>
+                  <memory>256000000</memory>
                 </run>
               </image>
             </images>
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV1IT.kt
index 462fd3f17..85d7db33f 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV1IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV1IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -32,6 +32,8 @@ import java.util.stream.Collectors
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class BucketV1IT : S3TestBase() {
 
   private val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV2IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV2IT.kt
index 446731a09..b32b1df1e 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV2IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/BucketV2IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import software.amazon.awssdk.awscore.exception.AwsServiceException
 import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.model.AbortIncompleteMultipartUpload
 import software.amazon.awssdk.services.s3.model.BucketLifecycleConfiguration
+import software.amazon.awssdk.services.s3.model.BucketVersioningStatus
 import software.amazon.awssdk.services.s3.model.CreateBucketRequest
 import software.amazon.awssdk.services.s3.model.DeleteBucketLifecycleRequest
 import software.amazon.awssdk.services.s3.model.DeleteBucketRequest
@@ -36,6 +37,8 @@ import software.amazon.awssdk.services.s3.model.HeadBucketRequest
 import software.amazon.awssdk.services.s3.model.LifecycleExpiration
 import software.amazon.awssdk.services.s3.model.LifecycleRule
 import software.amazon.awssdk.services.s3.model.LifecycleRuleFilter
+import software.amazon.awssdk.services.s3.model.MFADelete
+import software.amazon.awssdk.services.s3.model.MFADeleteStatus
 import software.amazon.awssdk.services.s3.model.NoSuchBucketException
 import software.amazon.awssdk.services.s3.model.PutBucketLifecycleConfigurationRequest
 import java.util.concurrent.TimeUnit
@@ -79,6 +82,89 @@ internal class BucketV2IT : S3TestBase() {
     assertThat(bucketLocation.locationConstraint().toString()).isEqualTo("eu-west-1")
   }
 
+  @Test
+  @S3VerifiedSuccess(year = 2024)
+  fun getDefaultBucketVersioning(testInfo: TestInfo) {
+    val bucketName = givenBucketV2(testInfo)
+
+    s3ClientV2.getBucketVersioning {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.status()).isNull()
+      assertThat(it.mfaDelete()).isNull()
+    }
+  }
+
+  @Test
+  @S3VerifiedTodo
+  fun putAndGetBucketVersioning(testInfo: TestInfo) {
+    val bucketName = givenBucketV2(testInfo)
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    s3ClientV2.getBucketVersioning {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.status()).isEqualTo(BucketVersioningStatus.ENABLED)
+    }
+  }
+
+  @Test
+  @S3VerifiedTodo
+  fun putAndGetBucketVersioning_suspended(testInfo: TestInfo) {
+    val bucketName = givenBucketV2(testInfo)
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    s3ClientV2.getBucketVersioning {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.status()).isEqualTo(BucketVersioningStatus.ENABLED)
+    }
+
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.SUSPENDED)
+      }
+    }
+
+    s3ClientV2.getBucketVersioning {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.status()).isEqualTo(BucketVersioningStatus.SUSPENDED)
+    }
+  }
+
+  @Test
+  @S3VerifiedFailure(year = 2024, reason = "No real Mfa value")
+  fun putAndGetBucketVersioning_mfa(testInfo: TestInfo) {
+    val bucketName = givenBucketV2(testInfo)
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.mfa("fakeMfaValue")
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+        it.mfaDelete(MFADelete.ENABLED)
+      }
+    }
+
+    s3ClientV2.getBucketVersioning {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.status()).isEqualTo(BucketVersioningStatus.ENABLED)
+      assertThat(it.mfaDelete()).isEqualTo(MFADeleteStatus.ENABLED)
+    }
+  }
+
   @Test
   @S3VerifiedSuccess(year = 2024)
   fun duplicateBucketCreation(testInfo: TestInfo) {
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectV1IT.kt
index 4077a15f3..9ddda54fb 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectV1IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/CopyObjectV1IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -36,6 +36,8 @@ import java.util.UUID
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class CopyObjectV1IT : S3TestBase() {
 
   private val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesV1IT.kt
index 3cff2fd53..0900ba47d 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesV1IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ErrorResponsesV1IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -41,6 +41,8 @@ import java.util.UUID
  * Test the application using the AmazonS3 SDK V1.
  * Verifies S3 Mocks Error Responses.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ErrorResponsesV1IT : S3TestBase() {
 
   private val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectV1IT.kt
index ea980cf8c..624690425 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectV1IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectV1IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -51,6 +51,8 @@ import kotlin.math.min
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class GetPutDeleteObjectV1IT : S3TestBase() {
 
   private val httpClient: CloseableHttpClient = createHttpClient()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1IT.kt
index 9be2e623f..17ebe12db 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,6 +33,8 @@ import java.util.stream.Collectors
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ListObjectV1IT : S3TestBase() {
 
   val s3Client: AmazonS3 = createS3ClientV1()
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1MaxKeysIT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1MaxKeysIT.kt
index bbf3c0101..eb02f0f67 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1MaxKeysIT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1MaxKeysIT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
 
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ListObjectV1MaxKeysIT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1PaginationIT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1PaginationIT.kt
index 0524c758c..58e9e35d5 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1PaginationIT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectV1PaginationIT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
 
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ListObjectV1PaginationIT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectVersionsV2IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectVersionsV2IT.kt
index aa4fb8a8d..a1c5b5a76 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectVersionsV2IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ListObjectVersionsV2IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -22,49 +22,134 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
 import software.amazon.awssdk.core.sync.RequestBody
 import software.amazon.awssdk.services.s3.S3Client
-import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm
-import software.amazon.awssdk.services.s3.model.ListObjectVersionsRequest
-import software.amazon.awssdk.services.s3.model.ObjectVersion
-import software.amazon.awssdk.services.s3.model.PutObjectRequest
+import software.amazon.awssdk.services.s3.model.BucketVersioningStatus
 import java.io.File
 
 internal class ListObjectVersionsV2IT : S3TestBase() {
   private val s3ClientV2: S3Client = createS3ClientV2()
 
   @Test
-  @S3VerifiedSuccess(year = 2024)
-  fun testPutObjects_listObjectVersions(testInfo: TestInfo) {
+  @S3VerifiedSuccess(year = 2025)
+  fun listObjectVersions(testInfo: TestInfo) {
+    val uploadFile = File(UPLOAD_FILE_NAME)
+    val bucketName = givenBucketV2(testInfo)
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    val version1 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-1")
+      },
+      RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    val version2 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-2")
+      },
+      RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    s3ClientV2.listObjectVersions {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.versions())
+        .hasSize(2)
+        .extracting("versionId", "isLatest")
+        .containsExactlyInAnyOrder(Tuple(version1, true), Tuple(version2, true))
+    }
+  }
+
+  @Test
+  @S3VerifiedTodo
+  fun listObjectVersions_noVersioning(testInfo: TestInfo) {
     val uploadFile = File(UPLOAD_FILE_NAME)
     val bucketName = givenBucketV2(testInfo)
 
     s3ClientV2.putObject(
-      PutObjectRequest.builder()
-        .bucket(bucketName).key("$UPLOAD_FILE_NAME-1")
-        .checksumAlgorithm(ChecksumAlgorithm.SHA256)
-        .build(),
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-1")
+      },
       RequestBody.fromFile(uploadFile)
     )
 
     s3ClientV2.putObject(
-      PutObjectRequest.builder()
-        .bucket(bucketName).key("$UPLOAD_FILE_NAME-2")
-        .checksumAlgorithm(ChecksumAlgorithm.SHA256)
-        .build(),
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-2")
+      },
       RequestBody.fromFile(uploadFile)
     )
 
-    s3ClientV2.listObjectVersions(
-      ListObjectVersionsRequest.builder()
-        .bucket(bucketName)
-        .build()
-    ).also {
+    s3ClientV2.listObjectVersions {
+      it.bucket(bucketName)
+    }.also {
       assertThat(it.versions())
         .hasSize(2)
-        .extracting(ObjectVersion::checksumAlgorithm)
-        .containsOnly(
-          Tuple(arrayListOf(ChecksumAlgorithm.SHA256)),
-          Tuple(arrayListOf(ChecksumAlgorithm.SHA256))
-        )
+        .extracting("versionId")
+        .containsExactlyInAnyOrder("null", "null")
+    }
+  }
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun listObjectVersions_deleteMarker(testInfo: TestInfo) {
+    val uploadFile = File(UPLOAD_FILE_NAME)
+    val bucketName = givenBucketV2(testInfo)
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    val version1 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-1")
+      },
+      RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    val version2 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-2")
+      },
+      RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    val version3 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName)
+        it.key("$UPLOAD_FILE_NAME-3")
+      },
+      RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    s3ClientV2.deleteObject {
+      it.bucket(bucketName)
+      it.key("$UPLOAD_FILE_NAME-3")
+    }
+
+    s3ClientV2.listObjectVersions {
+      it.bucket(bucketName)
+    }.also {
+      assertThat(it.versions())
+        .hasSize(3)
+        .extracting("versionId", "isLatest")
+        .containsExactlyInAnyOrder(Tuple(version1, true), Tuple(version2, true), Tuple(version3, false))
+      assertThat(it.deleteMarkers())
+        .hasSize(1)
+        .extracting("key")
+        .containsExactlyInAnyOrder("$UPLOAD_FILE_NAME-3")
     }
   }
 }
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/MultiPartUploadV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/MultiPartUploadV1IT.kt
index b5f33bb58..7e48dda30 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/MultiPartUploadV1IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/MultiPartUploadV1IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -42,6 +42,8 @@ import java.util.UUID
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class MultiPartUploadV1IT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ObjectTaggingV1IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ObjectTaggingV1IT.kt
index fcf0267e3..cd038c1d6 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ObjectTaggingV1IT.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/ObjectTaggingV1IT.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,6 +29,8 @@ import java.io.File
 /**
  * Test the application using the AmazonS3 SDK V1.
  */
+@Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+  "    * S3Mock will remove usage of Java v1 early 2026.")
 internal class ObjectTaggingV1IT : S3TestBase() {
   val s3Client: AmazonS3 = createS3ClientV1()
 
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt
index aa6ea051f..703265379 100644
--- a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/S3TestBase.kt
@@ -63,7 +63,6 @@ import software.amazon.awssdk.services.s3.model.ObjectLockEnabled
 import software.amazon.awssdk.services.s3.model.ObjectLockLegalHoldStatus
 import software.amazon.awssdk.services.s3.model.PutObjectResponse
 import software.amazon.awssdk.services.s3.model.S3Exception
-import software.amazon.awssdk.services.s3.model.S3Object
 import software.amazon.awssdk.services.s3.model.S3Response
 import software.amazon.awssdk.services.s3.model.StorageClass
 import software.amazon.awssdk.services.s3.model.UploadPartResponse
@@ -88,7 +87,6 @@ import java.time.Instant
 import java.util.UUID
 import java.util.concurrent.Executors
 import java.util.concurrent.ThreadFactory
-import java.util.function.Consumer
 import java.util.stream.Stream
 import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLEngine
@@ -111,10 +109,14 @@ internal abstract class S3TestBase {
       .build()
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   protected fun createS3ClientV1(endpoint: String = serviceEndpoint): AmazonS3 {
     return defaultTestAmazonS3ClientBuilder(endpoint).build()
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   protected fun defaultTestAmazonS3ClientBuilder(endpoint: String = serviceEndpoint): AmazonS3ClientBuilder {
     return AmazonS3ClientBuilder.standard()
       .withCredentials(AWSStaticCredentialsProvider(BasicAWSCredentials(s3AccessKeyId, s3SecretAccessKey)))
@@ -125,6 +127,8 @@ internal abstract class S3TestBase {
       .enablePathStyleAccess()
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   protected fun createTransferManagerV1(endpoint: String = serviceEndpoint,
       s3Client: AmazonS3 = createS3ClientV1(endpoint)): TransferManager {
     val threadFactory: ThreadFactory = object : ThreadFactory {
@@ -300,25 +304,35 @@ internal abstract class S3TestBase {
     return bucketName
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   fun givenBucketV1(testInfo: TestInfo): String {
     val bucketName = bucketName(testInfo)
     return givenBucketV1(bucketName)
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   private fun givenBucketV1(bucketName: String): String {
     _s3Client.createBucket(bucketName)
     return bucketName
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   fun givenRandomBucketV1(): String {
     return givenBucketV1(randomName)
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   private fun givenObjectV1(bucketName: String, key: String): PutObjectResult {
     val uploadFile = File(key)
     return _s3Client.putObject(PutObjectRequest(bucketName, key, uploadFile))
   }
 
+  @Deprecated("* AWS has deprecated SDK for Java v1, and will remove support EOY 2025.\n" +
+    "    * S3Mock will remove usage of Java v1 early 2026.")
   fun givenBucketAndObjectV1(testInfo: TestInfo, key: String): Pair<String, PutObjectResult> {
     val bucketName = givenBucketV1(testInfo)
     val putObjectResult = givenObjectV1(bucketName, key)
@@ -385,16 +399,35 @@ internal abstract class S3TestBase {
   }
 
   private fun deleteObjectsInBucket(bucket: Bucket, objectLockEnabled: Boolean) {
-    _s3ClientV2.listObjectsV2 {
+    _s3ClientV2.listObjectVersions {
       it.bucket(bucket.name())
       it.encodingType(EncodingType.URL)
-    }.contents().forEach(
-      Consumer { s3Object: S3Object ->
+    }.also {
+      it.versions().forEach { objectVersion ->
+          if (objectLockEnabled) {
+            //must remove potential legal hold, otherwise object can't be deleted
+            _s3ClientV2.putObjectLegalHold {
+              it.bucket(bucket.name())
+              it.key(objectVersion.key())
+              it.versionId(objectVersion.versionId())
+              it.legalHold {
+                it.status(ObjectLockLegalHoldStatus.OFF)
+              }
+            }
+          }
+          _s3ClientV2.deleteObject {
+            it.bucket(bucket.name())
+            it.key(objectVersion.key())
+            it.versionId(objectVersion.versionId())
+          }
+        }
+      it.deleteMarkers().forEach { marker ->
         if (objectLockEnabled) {
           //must remove potential legal hold, otherwise object can't be deleted
           _s3ClientV2.putObjectLegalHold {
             it.bucket(bucket.name())
-            it.key(s3Object.key())
+            it.key(marker.key())
+            it.versionId(marker.versionId())
             it.legalHold {
               it.status(ObjectLockLegalHoldStatus.OFF)
             }
@@ -402,9 +435,11 @@ internal abstract class S3TestBase {
         }
         _s3ClientV2.deleteObject {
           it.bucket(bucket.name())
-          it.key(s3Object.key())
+          it.key(marker.key())
+          it.versionId(marker.versionId())
         }
-      })
+      }
+    }
   }
 
   private fun isObjectLockEnabled(bucket: Bucket): Boolean {
diff --git a/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/VersionsV2IT.kt b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/VersionsV2IT.kt
new file mode 100644
index 000000000..321cfef39
--- /dev/null
+++ b/integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/VersionsV2IT.kt
@@ -0,0 +1,240 @@
+/*
+ *  Copyright 2017-2025 Adobe.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.adobe.testing.s3mock.its
+
+import com.adobe.testing.s3mock.util.DigestUtil
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatThrownBy
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInfo
+import software.amazon.awssdk.core.checksums.Algorithm
+import software.amazon.awssdk.core.sync.RequestBody
+import software.amazon.awssdk.services.s3.S3Client
+import software.amazon.awssdk.services.s3.model.BucketVersioningStatus
+import software.amazon.awssdk.services.s3.model.ChecksumAlgorithm
+import software.amazon.awssdk.services.s3.model.ObjectAttributes
+import software.amazon.awssdk.services.s3.model.S3Exception
+import software.amazon.awssdk.services.s3.model.StorageClass
+import java.io.File
+
+internal class VersionsV2IT : S3TestBase() {
+  private val s3ClientV2: S3Client = createS3ClientV2()
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun testListObjectVersions_nonVersionEnabledBucket(testInfo: TestInfo) {
+    val bucketName = givenBucketV2(testInfo)
+    givenObjectV2(bucketName, UPLOAD_FILE_NAME)
+    val listObjectVersions = s3ClientV2.listObjectVersions { it.bucket(bucketName) }
+    assertThat(listObjectVersions.hasVersions()).isTrue
+    assertThat(listObjectVersions.versions()[0].key()).isEqualTo(UPLOAD_FILE_NAME)
+    assertThat(listObjectVersions.versions()[0].versionId()).isEqualTo("null")
+  }
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun testListObjectVersions_versionEnabledBucket(testInfo: TestInfo) {
+    val bucketName = givenBucketV2(testInfo)
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    val versionId = givenObjectV2(bucketName, UPLOAD_FILE_NAME).versionId()
+
+    val listObjectVersions = s3ClientV2.listObjectVersions { it.bucket(bucketName) }
+    assertThat(listObjectVersions.hasVersions()).isTrue
+    assertThat(listObjectVersions.versions()[0].key()).isEqualTo(UPLOAD_FILE_NAME)
+    assertThat(listObjectVersions.versions()[0].versionId()).isEqualTo(versionId)
+  }
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun testPutGetObject_withVersion(testInfo: TestInfo) {
+    val uploadFile = File(UPLOAD_FILE_NAME)
+    val expectedChecksum = DigestUtil.checksumFor(uploadFile.toPath(), Algorithm.SHA1)
+    val bucketName = givenBucketV2(testInfo)
+
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    val versionId = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName).key(UPLOAD_FILE_NAME)
+        it.checksumAlgorithm(ChecksumAlgorithm.SHA1)
+      }, RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    s3ClientV2.getObjectAttributes {
+      it.bucket(bucketName)
+      it.key(UPLOAD_FILE_NAME)
+      it.versionId(versionId)
+      it.objectAttributes(
+        ObjectAttributes.OBJECT_SIZE,
+        ObjectAttributes.STORAGE_CLASS,
+        ObjectAttributes.E_TAG,
+        ObjectAttributes.CHECKSUM
+      )
+    }.also {
+      //
+      assertThat(it.versionId()).isEqualTo(versionId)
+      //default storageClass is STANDARD, which is never returned from APIs
+      assertThat(it.storageClass()).isEqualTo(StorageClass.STANDARD)
+      assertThat(it.objectSize()).isEqualTo(File(UPLOAD_FILE_NAME).length())
+      assertThat(it.checksum().checksumSHA1()).isEqualTo(expectedChecksum)
+    }
+  }
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun testPutGetObject_withMultipleVersions(testInfo: TestInfo) {
+    val uploadFile = File(UPLOAD_FILE_NAME)
+    val bucketName = givenBucketV2(testInfo)
+
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    val versionId1 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName).key(UPLOAD_FILE_NAME)
+        it.checksumAlgorithm(ChecksumAlgorithm.SHA1)
+      }, RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    val versionId2 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName).key(UPLOAD_FILE_NAME)
+        it.checksumAlgorithm(ChecksumAlgorithm.SHA1)
+      }, RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    s3ClientV2.getObject {
+      it.bucket(bucketName)
+      it.key(UPLOAD_FILE_NAME)
+      it.versionId(versionId2)
+    }.also {
+      assertThat(it.response().versionId()).isEqualTo(versionId2)
+    }
+
+    s3ClientV2.getObject {
+      it.bucket(bucketName)
+      it.key(UPLOAD_FILE_NAME)
+      it.versionId(versionId1)
+    }.also {
+      assertThat(it.response().versionId()).isEqualTo(versionId1)
+    }
+
+    s3ClientV2.getObject {
+      it.bucket(bucketName)
+      it.key(UPLOAD_FILE_NAME)
+    }.also {
+      assertThat(it.response().versionId()).isEqualTo(versionId2)
+    }
+  }
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun testPutGetDeleteObject_withVersion(testInfo: TestInfo) {
+    val uploadFile = File(UPLOAD_FILE_NAME)
+    val bucketName = givenBucketV2(testInfo)
+
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    val versionId1 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName).key(UPLOAD_FILE_NAME)
+        it.checksumAlgorithm(ChecksumAlgorithm.SHA1)
+      }, RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    val versionId2 = s3ClientV2.putObject(
+      {
+        it.bucket(bucketName).key(UPLOAD_FILE_NAME)
+        it.checksumAlgorithm(ChecksumAlgorithm.SHA1)
+      }, RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    s3ClientV2.deleteObject {
+      it.bucket(bucketName)
+      it.key(UPLOAD_FILE_NAME)
+      it.versionId(versionId2)
+    }
+
+    s3ClientV2.getObject {
+      it.bucket(bucketName)
+      it.key(UPLOAD_FILE_NAME)
+    }.also {
+      assertThat(it.response().versionId()).isEqualTo(versionId1)
+    }
+  }
+
+  @Test
+  @S3VerifiedSuccess(year = 2025)
+  fun testPutGetDeleteObject_withDeleteMarker(testInfo: TestInfo) {
+    val uploadFile = File(UPLOAD_FILE_NAME)
+    val bucketName = givenBucketV2(testInfo)
+
+    s3ClientV2.putBucketVersioning {
+      it.bucket(bucketName)
+      it.versioningConfiguration {
+        it.status(BucketVersioningStatus.ENABLED)
+      }
+    }
+
+    s3ClientV2.putObject(
+      {
+        it.bucket(bucketName).key(UPLOAD_FILE_NAME)
+      }, RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    s3ClientV2.putObject(
+      {
+        it.bucket(bucketName).key(UPLOAD_FILE_NAME)
+      }, RequestBody.fromFile(uploadFile)
+    ).versionId()
+
+    s3ClientV2.deleteObject {
+      it.bucket(bucketName)
+      it.key(UPLOAD_FILE_NAME)
+    }.also {
+      assertThat(it.deleteMarker()).isEqualTo(true)
+    }
+
+    assertThatThrownBy {
+      s3ClientV2.getObject {
+        it.bucket(bucketName)
+        it.key(UPLOAD_FILE_NAME)
+      }
+    }.isInstanceOf(S3Exception::class.java)
+      .hasMessageContaining("Service: S3, Status Code: 404")
+  }
+}
diff --git a/server/pom.xml b/server/pom.xml
index a8fcba5b9..099c1e2f8 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -35,6 +35,10 @@
   </properties>
 
   <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
@@ -59,11 +63,6 @@
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>s3</artifactId>
     </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>auth</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
@@ -82,9 +81,15 @@
       <artifactId>httpcore</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>auth</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
@@ -101,10 +106,6 @@
       <artifactId>spring-boot-configuration-processor</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-devtools</artifactId>
@@ -112,12 +113,13 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.xmlunit</groupId>
diff --git a/server/src/main/java/com/adobe/testing/s3mock/BucketController.java b/server/src/main/java/com/adobe/testing/s3mock/BucketController.java
index dd49b735d..5e28ff62f 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/BucketController.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/BucketController.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.adobe.testing.s3mock;
 
+import static com.adobe.testing.s3mock.S3Exception.NOT_FOUND_BUCKET_VERSIONING_CONFIGURATION;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_BUCKET_OBJECT_LOCK_ENABLED;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_OBJECT_OWNERSHIP;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.CONTINUATION_TOKEN;
@@ -30,9 +31,11 @@
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.NOT_LOCATION;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.NOT_OBJECT_LOCK;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.NOT_UPLOADS;
+import static com.adobe.testing.s3mock.util.AwsHttpParameters.NOT_VERSIONING;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.NOT_VERSIONS;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.OBJECT_LOCK;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.START_AFTER;
+import static com.adobe.testing.s3mock.util.AwsHttpParameters.VERSIONING;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.VERSIONS;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.VERSION_ID_MARKER;
 import static org.springframework.http.MediaType.APPLICATION_XML_VALUE;
@@ -44,7 +47,9 @@
 import com.adobe.testing.s3mock.dto.ListVersionsResult;
 import com.adobe.testing.s3mock.dto.LocationConstraint;
 import com.adobe.testing.s3mock.dto.ObjectLockConfiguration;
+import com.adobe.testing.s3mock.dto.VersioningConfiguration;
 import com.adobe.testing.s3mock.service.BucketService;
+import com.adobe.testing.s3mock.store.BucketMetadata;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -116,7 +121,8 @@ public ResponseEntity<ListAllMyBucketsResult> listBuckets() {
       },
       params = {
           NOT_OBJECT_LOCK,
-          NOT_LIFECYCLE
+          NOT_LIFECYCLE,
+          NOT_VERSIONING
       }
   )
   public ResponseEntity<Void> createBucket(@PathVariable final String bucketName,
@@ -180,6 +186,62 @@ public ResponseEntity<Void> deleteBucket(@PathVariable String bucketName) {
     return ResponseEntity.noContent().build();
   }
 
+  /**
+   * Get VersioningConfiguration of a bucket.
+   * <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetBucketVersioning.html">API Reference</a>
+   *
+   * @param bucketName name of the Bucket.
+   *
+   * @return 200, VersioningConfiguration
+   */
+  @GetMapping(
+      value = {
+          //AWS SDK V2 pattern
+          "/{bucketName:.+}",
+          //AWS SDK V1 pattern
+          "/{bucketName:.+}/"
+      },
+      params = {
+          VERSIONING,
+          NOT_LIST_TYPE
+      },
+      produces = APPLICATION_XML_VALUE
+  )
+  public ResponseEntity<VersioningConfiguration> getVersioningConfiguration(
+      @PathVariable String bucketName) {
+    bucketService.verifyBucketExists(bucketName);
+    var configuration = bucketService.getVersioningConfiguration(bucketName);
+    return ResponseEntity.ok(configuration);
+  }
+
+  /**
+   * Put VersioningConfiguration of a bucket.
+   * <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutBucketVersioning.html">API Reference</a>
+   *
+   * @param bucketName name of the Bucket.
+   *
+   * @return 200
+   */
+  @PutMapping(
+      value = {
+          //AWS SDK V2 pattern
+          "/{bucketName:.+}",
+          //AWS SDK V1 pattern
+          "/{bucketName:.+}/"
+      },
+      params = {
+          VERSIONING
+      },
+      consumes = APPLICATION_XML_VALUE
+  )
+  public ResponseEntity<Void> putVersioningConfiguration(
+      @PathVariable String bucketName,
+      @RequestBody VersioningConfiguration configuration) {
+    bucketService.verifyBucketExists(bucketName);
+    bucketService.setVersioningConfiguration(bucketName, configuration);
+    return ResponseEntity.ok().build();
+  }
+
   /**
    * Get ObjectLockConfiguration of a bucket.
    * <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObjectLockConfiguration.html">API Reference</a>
@@ -360,7 +422,8 @@ public ResponseEntity<LocationConstraint> getBucketLocation(
           NOT_LIST_TYPE,
           NOT_LIFECYCLE,
           NOT_LOCATION,
-          NOT_VERSIONS
+          NOT_VERSIONS,
+          NOT_VERSIONING
       },
       produces = APPLICATION_XML_VALUE
   )
@@ -429,10 +492,7 @@ public ResponseEntity<ListBucketResultV2> listObjectsV2(
    *
    * @param bucketName {@link String} set bucket name
    * @param prefix {@link String} find object names they start with prefix
-   * @param startAfter {@link String} return key names after a specific object key in your key
-   *     space
    * @param maxKeys {@link Integer} set maximum number of keys to be returned
-   * @param continuationToken {@link String} pagination token returned by previous request
    *
    * @return {@link ListVersionsResult} a list of objects in Bucket
    */
@@ -455,15 +515,13 @@ public ResponseEntity<ListVersionsResult> listObjectVersions(
       @RequestParam(name = KEY_MARKER, required = false) String keyMarker,
       @RequestParam(name = VERSION_ID_MARKER, required = false) String versionIdMarker,
       @RequestParam(name = ENCODING_TYPE, required = false) String encodingType,
-      @RequestParam(name = START_AFTER, required = false) String startAfter,
-      @RequestParam(name = MAX_KEYS, defaultValue = "1000", required = false) Integer maxKeys,
-      @RequestParam(name = CONTINUATION_TOKEN, required = false) String continuationToken) {
+      @RequestParam(name = MAX_KEYS, defaultValue = "1000", required = false) Integer maxKeys) {
     bucketService.verifyBucketExists(bucketName);
     bucketService.verifyMaxKeys(maxKeys);
     bucketService.verifyEncodingType(encodingType);
     var listVersionsResult =
-        bucketService.listVersions(bucketName, prefix, delimiter, encodingType, startAfter,
-            maxKeys, continuationToken, keyMarker, versionIdMarker);
+        bucketService.listVersions(bucketName, prefix, delimiter, encodingType, maxKeys, keyMarker,
+            versionIdMarker);
 
     return ResponseEntity.ok(listVersionsResult);
   }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/FaviconController.java b/server/src/main/java/com/adobe/testing/s3mock/FaviconController.java
index 0c4c1e459..afe6ab8a0 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/FaviconController.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/FaviconController.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2023 Adobe.
+ *  Copyright 2017-2024 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,20 +16,18 @@
 
 package com.adobe.testing.s3mock;
 
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Spring Boot 2.2+ does not include the default favicon.ico anymore.
  * This is needed to check if the S3 Mock is up (at least in our examples and some use-cases)
  */
-@Controller
+@RestController
 @RequestMapping
 class FaviconController {
   @GetMapping("favicon.ico")
-  @ResponseBody
   void favicon() {
     // Method is intentionally empty.
   }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/MultipartController.java b/server/src/main/java/com/adobe/testing/s3mock/MultipartController.java
index c795a2c89..36568f400 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/MultipartController.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/MultipartController.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_COPY_SOURCE_IF_UNMODIFIED_SINCE;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_COPY_SOURCE_RANGE;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_STORAGE_CLASS;
+import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_VERSION_ID;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.NOT_LIFECYCLE;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.PART_NUMBER;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.UPLOADS;
@@ -223,12 +224,12 @@ public ResponseEntity<Void> uploadPart(@PathVariable String bucketName,
 
     String checksum = null;
     ChecksumAlgorithm checksumAlgorithm = null;
-    ChecksumAlgorithm algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
+    var algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
     if (algorithmFromSdk != null) {
       checksum = tempFileAndChecksum.getRight();
       checksumAlgorithm = algorithmFromSdk;
     }
-    ChecksumAlgorithm algorithmFromHeader = checksumAlgorithmFromHeader(httpHeaders);
+    var algorithmFromHeader = checksumAlgorithmFromHeader(httpHeaders);
     if (algorithmFromHeader != null) {
       checksum = checksumFrom(httpHeaders);
       checksumAlgorithm = algorithmFromHeader;
@@ -295,9 +296,10 @@ public ResponseEntity<CopyPartResult> uploadPartCopy(
       @RequestParam String uploadId,
       @RequestParam String partNumber,
       @RequestHeader HttpHeaders httpHeaders) {
-    bucketService.verifyBucketExists(bucketName);
+    var bucket = bucketService.verifyBucketExists(bucketName);
     multipartService.verifyPartNumberLimits(partNumber);
-    var s3ObjectMetadata = objectService.verifyObjectExists(copySource.bucket(), copySource.key());
+    var s3ObjectMetadata = objectService.verifyObjectExists(copySource.bucket(), copySource.key(),
+        copySource.versionId());
     objectService.verifyObjectMatchingForCopy(match, noneMatch,
         ifModifiedSince, ifUnmodifiedSince, s3ObjectMetadata);
 
@@ -308,12 +310,19 @@ public ResponseEntity<CopyPartResult> uploadPartCopy(
         bucketName,
         key.key(),
         uploadId,
-        encryptionHeadersFrom(httpHeaders)
+        encryptionHeadersFrom(httpHeaders),
+        copySource.versionId()
     );
 
     //return encryption headers
-    //return source version id
-    return ResponseEntity.ok(result);
+    return ResponseEntity
+        .ok()
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
+        .body(result);
   }
 
   /**
@@ -385,7 +394,7 @@ public ResponseEntity<CompleteMultipartUploadResult> completeMultipartUpload(
       @RequestBody CompleteMultipartUpload upload,
       HttpServletRequest request,
       @RequestHeader HttpHeaders httpHeaders) {
-    bucketService.verifyBucketExists(bucketName);
+    var bucket = bucketService.verifyBucketExists(bucketName);
     multipartService.verifyMultipartUploadExists(bucketName, uploadId);
     multipartService.verifyMultipartParts(bucketName, key.key(), uploadId, upload.parts());
     var objectName = key.key();
@@ -401,14 +410,18 @@ public ResponseEntity<CompleteMultipartUploadResult> completeMultipartUpload(
         encryptionHeadersFrom(httpHeaders),
         locationWithEncodedKey);
 
-    String checksum = result.checksum();
-    ChecksumAlgorithm checksumAlgorithm = result.multipartUploadInfo().checksumAlgorithm();
+    var checksum = result.checksum();
+    var checksumAlgorithm = result.multipartUploadInfo().checksumAlgorithm();
 
     //return encryption headers.
-    //return version id
     return ResponseEntity
         .ok()
         .headers(h -> h.setAll(checksumHeaderFrom(checksum, checksumAlgorithm)))
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && result.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, result.versionId());
+          }
+        })
         .body(result);
   }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java b/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java
index c970d5fea..19d6426c4 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/ObjectController.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.adobe.testing.s3mock;
 
+import static com.adobe.testing.s3mock.S3Exception.NO_SUCH_KEY_DELETE_MARKER;
 import static com.adobe.testing.s3mock.dto.StorageClass.STANDARD;
 import static com.adobe.testing.s3mock.service.ObjectService.getChecksum;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.CONTENT_MD5;
@@ -28,11 +29,13 @@
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_COPY_SOURCE_IF_MODIFIED_SINCE;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_COPY_SOURCE_IF_NONE_MATCH;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_COPY_SOURCE_IF_UNMODIFIED_SINCE;
+import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_COPY_SOURCE_VERSION_ID;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_DELETE_MARKER;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_METADATA_DIRECTIVE;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_OBJECT_ATTRIBUTES;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_STORAGE_CLASS;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_TAGGING;
+import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_VERSION_ID;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.ACL;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.ATTRIBUTES;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.DELETE;
@@ -47,6 +50,7 @@
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.NOT_UPLOAD_ID;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.RETENTION;
 import static com.adobe.testing.s3mock.util.AwsHttpParameters.TAGGING;
+import static com.adobe.testing.s3mock.util.AwsHttpParameters.VERSION_ID;
 import static com.adobe.testing.s3mock.util.HeaderUtil.checksumAlgorithmFromHeader;
 import static com.adobe.testing.s3mock.util.HeaderUtil.checksumAlgorithmFromSdk;
 import static com.adobe.testing.s3mock.util.HeaderUtil.checksumFrom;
@@ -93,7 +97,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
@@ -164,7 +167,6 @@ public ResponseEntity<DeleteResult> deleteObjects(
       @PathVariable String bucketName,
       @RequestBody Delete body) {
     bucketService.verifyBucketExists(bucketName);
-    //return version id
     return ResponseEntity.ok(objectService.deleteObjects(bucketName, body));
   }
 
@@ -190,11 +192,11 @@ public ResponseEntity<Void> headObject(@PathVariable String bucketName,
       @RequestHeader(value = IF_NONE_MATCH, required = false) List<String> noneMatch,
       @RequestHeader(value = IF_MODIFIED_SINCE, required = false) List<Instant> ifModifiedSince,
       @RequestHeader(value = IF_UNMODIFIED_SINCE, required = false) List<Instant> ifUnmodifiedSince,
+      @RequestParam(value = VERSION_ID, required = false) String versionId,
       @RequestParam Map<String, String> queryParams) {
-    bucketService.verifyBucketExists(bucketName);
+    var bucket = bucketService.verifyBucketExists(bucketName);
 
-    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key());
-    //return version id
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
 
     if (s3ObjectMetadata != null) {
       objectService.verifyObjectMatching(match, noneMatch,
@@ -205,6 +207,11 @@ public ResponseEntity<Void> headObject(@PathVariable String bucketName,
           .lastModified(s3ObjectMetadata.lastModified())
           .contentLength(Long.parseLong(s3ObjectMetadata.size()))
           .contentType(mediaTypeFrom(s3ObjectMetadata.contentType()))
+          .headers(h -> {
+            if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+              h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+            }
+          })
           .headers(h -> h.setAll(s3ObjectMetadata.storeHeaders()))
           .headers(h -> h.setAll(userMetadataHeadersFrom(s3ObjectMetadata)))
           .headers(h -> h.setAll(s3ObjectMetadata.encryptionHeaders()))
@@ -232,14 +239,37 @@ public ResponseEntity<Void> headObject(@PathVariable String bucketName,
       }
   )
   public ResponseEntity<Void> deleteObject(@PathVariable String bucketName,
-      @PathVariable ObjectKey key) {
-    bucketService.verifyBucketExists(bucketName);
-
-    var deleted = objectService.deleteObject(bucketName, key.key());
+      @PathVariable ObjectKey key,
+       @RequestParam(value = VERSION_ID, required = false) String versionId) {
+    var bucket = bucketService.verifyBucketExists(bucketName);
+    S3ObjectMetadata s3ObjectMetadata = null;
+    try {
+      s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
+    } catch (S3Exception e) {
+      //ignore NO_SUCH_KEY
+    }
+    var s3ObjectMetadataVersionId = s3ObjectMetadata != null ? s3ObjectMetadata.versionId() : null;
+    var deleted = objectService.deleteObject(bucketName, key.key(), versionId);
 
-    //return version id
     return ResponseEntity.noContent()
         .header(X_AMZ_DELETE_MARKER, String.valueOf(deleted))
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadataVersionId != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadataVersionId);
+          }
+        })
+        .headers(h -> {
+          if (bucket.isVersioningEnabled()) {
+            try {
+              objectService.verifyObjectExists(bucketName, key.key(), versionId);
+            } catch (S3Exception e) {
+              //ignore all other exceptions here
+              if (e == NO_SUCH_KEY_DELETE_MARKER) {
+                h.set(X_AMZ_DELETE_MARKER, "true");
+              }
+            }
+          }
+        })
         .build();
   }
 
@@ -270,10 +300,11 @@ public ResponseEntity<StreamingResponseBody> getObject(@PathVariable String buck
       @RequestHeader(value = IF_NONE_MATCH, required = false) List<String> noneMatch,
       @RequestHeader(value = IF_MODIFIED_SINCE, required = false) List<Instant> ifModifiedSince,
       @RequestHeader(value = IF_UNMODIFIED_SINCE, required = false) List<Instant> ifUnmodifiedSince,
+      @RequestParam(value = VERSION_ID, required = false) String versionId,
       @RequestParam Map<String, String> queryParams) {
-    bucketService.verifyBucketExists(bucketName);
+    var bucket = bucketService.verifyBucketExists(bucketName);
 
-    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key());
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
     objectService.verifyObjectMatching(match, noneMatch,
         ifModifiedSince, ifUnmodifiedSince, s3ObjectMetadata);
 
@@ -281,7 +312,6 @@ public ResponseEntity<StreamingResponseBody> getObject(@PathVariable String buck
       return getObjectWithRange(range, s3ObjectMetadata);
     }
 
-    //return version id
     return ResponseEntity
         .ok()
         .eTag(s3ObjectMetadata.etag())
@@ -289,6 +319,11 @@ public ResponseEntity<StreamingResponseBody> getObject(@PathVariable String buck
         .lastModified(s3ObjectMetadata.lastModified())
         .contentLength(Long.parseLong(s3ObjectMetadata.size()))
         .contentType(mediaTypeFrom(s3ObjectMetadata.contentType()))
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .headers(h -> h.setAll(s3ObjectMetadata.storeHeaders()))
         .headers(h -> h.setAll(userMetadataHeadersFrom(s3ObjectMetadata)))
         .headers(h -> h.setAll(s3ObjectMetadata.encryptionHeaders()))
@@ -322,9 +357,10 @@ public ResponseEntity<StreamingResponseBody> getObject(@PathVariable String buck
   public ResponseEntity<Void> putObjectAcl(@PathVariable final String bucketName,
       @PathVariable ObjectKey key,
       @RequestHeader(value = X_AMZ_ACL, required = false) ObjectCannedACL cannedAcl,
+      @RequestParam(value = VERSION_ID, required = false) String versionId,
       @RequestBody(required = false) AccessControlPolicy body) {
-    bucketService.verifyBucketExists(bucketName);
-    objectService.verifyObjectExists(bucketName, key.key());
+    var bucket = bucketService.verifyBucketExists(bucketName);
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
     AccessControlPolicy policy;
     if (body != null) {
       policy = body;
@@ -333,9 +369,14 @@ public ResponseEntity<Void> putObjectAcl(@PathVariable final String bucketName,
     } else {
       return ResponseEntity.badRequest().build();
     }
-    objectService.setAcl(bucketName, key.key(), policy);
+    objectService.setAcl(bucketName, key.key(), versionId, policy);
     return ResponseEntity
         .ok()
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .build();
   }
 
@@ -360,11 +401,19 @@ public ResponseEntity<Void> putObjectAcl(@PathVariable final String bucketName,
       produces = APPLICATION_XML_VALUE
   )
   public ResponseEntity<AccessControlPolicy> getObjectAcl(@PathVariable final String bucketName,
-      @PathVariable ObjectKey key) {
-    bucketService.verifyBucketExists(bucketName);
-    objectService.verifyObjectExists(bucketName, key.key());
-    var acl = objectService.getAcl(bucketName, key.key());
-    return ResponseEntity.ok(acl);
+      @PathVariable ObjectKey key,
+       @RequestParam(value = VERSION_ID, required = false) String versionId) {
+    var bucket = bucketService.verifyBucketExists(bucketName);
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
+    var acl = objectService.getAcl(bucketName, key.key(), versionId);
+    return ResponseEntity
+        .ok()
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
+        .body(acl);
   }
 
   /**
@@ -384,16 +433,21 @@ public ResponseEntity<AccessControlPolicy> getObjectAcl(@PathVariable final Stri
       }
   )
   public ResponseEntity<Tagging> getObjectTagging(@PathVariable String bucketName,
-      @PathVariable ObjectKey key) {
-    bucketService.verifyBucketExists(bucketName);
+      @PathVariable ObjectKey key,
+       @RequestParam(value = VERSION_ID, required = false) String versionId) {
+    var bucket = bucketService.verifyBucketExists(bucketName);
 
-    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key());
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
 
-    //return version id
     return ResponseEntity
         .ok()
         .eTag(s3ObjectMetadata.etag())
         .lastModified(s3ObjectMetadata.lastModified())
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .body(new Tagging(new TagSet(s3ObjectMetadata.tags())));
   }
 
@@ -412,15 +466,21 @@ public ResponseEntity<Tagging> getObjectTagging(@PathVariable String bucketName,
   )
   public ResponseEntity<Void> putObjectTagging(@PathVariable String bucketName,
       @PathVariable ObjectKey key,
+       @RequestParam(value = VERSION_ID, required = false) String versionId,
       @RequestBody Tagging body) {
-    bucketService.verifyBucketExists(bucketName);
+    var bucket = bucketService.verifyBucketExists(bucketName);
 
-    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key());
-    objectService.setObjectTags(bucketName, key.key(), body.tagSet().tags());
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
+    objectService.setObjectTags(bucketName, key.key(), versionId, body.tagSet().tags());
     return ResponseEntity
         .ok()
         .eTag(s3ObjectMetadata.etag())
         .lastModified(s3ObjectMetadata.lastModified())
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .build();
   }
 
@@ -439,13 +499,20 @@ public ResponseEntity<Void> putObjectTagging(@PathVariable String bucketName,
       produces = APPLICATION_XML_VALUE
   )
   public ResponseEntity<LegalHold> getLegalHold(@PathVariable String bucketName,
-      @PathVariable ObjectKey key) {
-    bucketService.verifyBucketExists(bucketName);
+      @PathVariable ObjectKey key,
+       @RequestParam(value = VERSION_ID, required = false) String versionId) {
+    var bucket = bucketService.verifyBucketExists(bucketName);
     bucketService.verifyBucketObjectLockEnabled(bucketName);
-    var s3ObjectMetadata = objectService.verifyObjectLockConfiguration(bucketName, key.key());
+    var s3ObjectMetadata = objectService.verifyObjectLockConfiguration(bucketName, key.key(),
+        versionId);
 
     return ResponseEntity
         .ok()
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .body(s3ObjectMetadata.legalHold());
   }
 
@@ -464,14 +531,20 @@ public ResponseEntity<LegalHold> getLegalHold(@PathVariable String bucketName,
   )
   public ResponseEntity<Void> putLegalHold(@PathVariable String bucketName,
       @PathVariable ObjectKey key,
+      @RequestParam(value = VERSION_ID, required = false) String versionId,
       @RequestBody LegalHold body) {
-    bucketService.verifyBucketExists(bucketName);
+    var bucket = bucketService.verifyBucketExists(bucketName);
     bucketService.verifyBucketObjectLockEnabled(bucketName);
 
-    objectService.verifyObjectExists(bucketName, key.key());
-    objectService.setLegalHold(bucketName, key.key(), body);
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
+    objectService.setLegalHold(bucketName, key.key(), versionId, body);
     return ResponseEntity
         .ok()
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .build();
   }
 
@@ -490,13 +563,20 @@ public ResponseEntity<Void> putLegalHold(@PathVariable String bucketName,
       produces = APPLICATION_XML_VALUE
   )
   public ResponseEntity<Retention> getObjectRetention(@PathVariable String bucketName,
-      @PathVariable ObjectKey key) {
-    bucketService.verifyBucketExists(bucketName);
+      @PathVariable ObjectKey key,
+      @RequestParam(value = VERSION_ID, required = false) String versionId) {
+    var bucket = bucketService.verifyBucketExists(bucketName);
     bucketService.verifyBucketObjectLockEnabled(bucketName);
-    var s3ObjectMetadata = objectService.verifyObjectLockConfiguration(bucketName, key.key());
+    var s3ObjectMetadata = objectService.verifyObjectLockConfiguration(bucketName, key.key(),
+        versionId);
 
     return ResponseEntity
         .ok()
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .body(s3ObjectMetadata.retention());
   }
 
@@ -515,15 +595,21 @@ public ResponseEntity<Retention> getObjectRetention(@PathVariable String bucketN
   )
   public ResponseEntity<Void> putObjectRetention(@PathVariable String bucketName,
       @PathVariable ObjectKey key,
+      @RequestParam(value = VERSION_ID, required = false) String versionId,
       @RequestBody Retention body) {
-    bucketService.verifyBucketExists(bucketName);
+    var bucket = bucketService.verifyBucketExists(bucketName);
     bucketService.verifyBucketObjectLockEnabled(bucketName);
 
-    objectService.verifyObjectExists(bucketName, key.key());
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
     objectService.verifyRetention(body);
-    objectService.setRetention(bucketName, key.key(), body);
+    objectService.setRetention(bucketName, key.key(), versionId, body);
     return ResponseEntity
         .ok()
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .build();
   }
 
@@ -547,23 +633,24 @@ public ResponseEntity<GetObjectAttributesOutput> getObjectAttributes(
       @RequestHeader(value = IF_NONE_MATCH, required = false) List<String> noneMatch,
       @RequestHeader(value = IF_MODIFIED_SINCE, required = false) List<Instant> ifModifiedSince,
       @RequestHeader(value = IF_UNMODIFIED_SINCE, required = false) List<Instant> ifUnmodifiedSince,
-      @RequestHeader(value = X_AMZ_OBJECT_ATTRIBUTES) List<String> objectAttributes) {
-    bucketService.verifyBucketExists(bucketName);
+      @RequestHeader(value = X_AMZ_OBJECT_ATTRIBUTES) List<String> objectAttributes,
+      @RequestParam(value = VERSION_ID, required = false) String versionId) {
+    var bucket = bucketService.verifyBucketExists(bucketName);
 
     //this is for either an object request, or a parts request.
 
-    S3ObjectMetadata s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key());
+    var s3ObjectMetadata = objectService.verifyObjectExists(bucketName, key.key(), versionId);
     objectService.verifyObjectMatching(match, noneMatch,
         ifModifiedSince, ifUnmodifiedSince, s3ObjectMetadata);
     //S3Mock stores the etag with the additional quotation marks needed in the headers. This
     // response does not use eTag as a header, so it must not contain the quotation marks.
-    String etag = s3ObjectMetadata.etag().replace("\"", "");
-    long objectSize = Long.parseLong(s3ObjectMetadata.size());
+    var etag = s3ObjectMetadata.etag().replace("\"", "");
+    var objectSize = Long.parseLong(s3ObjectMetadata.size());
     //in object attributes, S3 returns STANDARD, in all other APIs it returns null...
-    StorageClass storageClass = s3ObjectMetadata.storageClass() == null
+    var storageClass = s3ObjectMetadata.storageClass() == null
         ? STANDARD
         : s3ObjectMetadata.storageClass();
-    GetObjectAttributesOutput response = new GetObjectAttributesOutput(
+    var response = new GetObjectAttributesOutput(
         getChecksum(s3ObjectMetadata),
         objectAttributes.contains(ObjectAttributes.ETAG.toString())
             ? etag
@@ -577,10 +664,14 @@ public ResponseEntity<GetObjectAttributesOutput> getObjectAttributes(
             : null
     );
 
-    //return version id
     return ResponseEntity
         .ok()
         .lastModified(s3ObjectMetadata.lastModified())
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .body(response);
   }
 
@@ -622,19 +713,18 @@ public ResponseEntity<Void> putObject(@PathVariable String bucketName,
 
     var tempFileAndChecksum = objectService.toTempFile(inputStream, httpHeaders);
 
-    //TODO: check checksum against incoming headers
-    ChecksumAlgorithm algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
+    var algorithmFromSdk = checksumAlgorithmFromSdk(httpHeaders);
     if (algorithmFromSdk != null) {
       checksum = tempFileAndChecksum.getRight();
       checksumAlgorithm = algorithmFromSdk;
     }
-    ChecksumAlgorithm algorithmFromHeader = checksumAlgorithmFromHeader(httpHeaders);
+    var algorithmFromHeader = checksumAlgorithmFromHeader(httpHeaders);
     if (algorithmFromHeader != null) {
       checksum = checksumFrom(httpHeaders);
       checksumAlgorithm = algorithmFromHeader;
     }
-    bucketService.verifyBucketExists(bucketName);
-    Path tempFile = tempFileAndChecksum.getLeft();
+    var bucket = bucketService.verifyBucketExists(bucketName);
+    var tempFile = tempFileAndChecksum.getLeft();
     objectService.verifyMd5(tempFile, contentMd5);
     if (checksum != null) {
       objectService.verifyChecksum(tempFile, checksum, checksumAlgorithm);
@@ -658,13 +748,17 @@ public ResponseEntity<Void> putObject(@PathVariable String bucketName,
 
     FileUtils.deleteQuietly(tempFile.toFile());
 
-    //return version id
     return ResponseEntity
         .ok()
         .headers(h -> h.setAll(checksumHeaderFrom(s3ObjectMetadata)))
         .headers(h -> h.setAll(s3ObjectMetadata.encryptionHeaders()))
         .lastModified(s3ObjectMetadata.lastModified())
         .eTag(s3ObjectMetadata.etag())
+        .headers(h -> {
+          if (bucket.isVersioningEnabled() && s3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, s3ObjectMetadata.versionId());
+          }
+        })
         .build();
   }
 
@@ -706,20 +800,23 @@ public ResponseEntity<CopyObjectResult> copyObject(@PathVariable String bucketNa
           required = false) List<Instant> ifUnmodifiedSince,
       @RequestHeader(value = X_AMZ_STORAGE_CLASS, required = false) StorageClass storageClass,
       @RequestHeader HttpHeaders httpHeaders) {
-    bucketService.verifyBucketExists(bucketName);
-    var s3ObjectMetadata = objectService.verifyObjectExists(copySource.bucket(), copySource.key());
+    var targetBucket = bucketService.verifyBucketExists(bucketName);
+    var sourceBucket = bucketService.verifyBucketExists(copySource.bucket());
+    var s3ObjectMetadata = objectService.verifyObjectExists(copySource.bucket(), copySource.key(),
+        copySource.versionId());
     objectService.verifyObjectMatchingForCopy(match, noneMatch,
         ifModifiedSince, ifUnmodifiedSince, s3ObjectMetadata);
 
-    Map<String, String> userMetadata = Collections.emptyMap();
-    Map<String, String> storeHeaders = Collections.emptyMap();
+    var userMetadata = Collections.<String, String>emptyMap();
+    var storeHeaders = Collections.<String, String>emptyMap();
     if (MetadataDirective.REPLACE == metadataDirective) {
       userMetadata = userMetadataFrom(httpHeaders);
       storeHeaders = storeHeadersFrom(httpHeaders);
     }
 
-    var copyObjectResult = objectService.copyS3Object(copySource.bucket(),
+    var copyS3ObjectMetadata = objectService.copyS3Object(copySource.bucket(),
         copySource.key(),
+        copySource.versionId(),
         bucketName,
         key.key(),
         encryptionHeadersFrom(httpHeaders),
@@ -727,10 +824,9 @@ public ResponseEntity<CopyObjectResult> copyObject(@PathVariable String bucketNa
         userMetadata,
         storageClass);
 
-    //return version id / copy source version id
     //return expiration
 
-    if (copyObjectResult == null) {
+    if (copyS3ObjectMetadata == null) {
       return ResponseEntity
           .notFound()
           .headers(headers -> headers.setAll(s3ObjectMetadata.encryptionHeaders()))
@@ -739,7 +835,16 @@ public ResponseEntity<CopyObjectResult> copyObject(@PathVariable String bucketNa
     return ResponseEntity
         .ok()
         .headers(headers -> headers.setAll(s3ObjectMetadata.encryptionHeaders()))
-        .body(copyObjectResult);
+        .headers(h -> {
+          if (sourceBucket.isVersioningEnabled() && copySource.versionId() != null) {
+            h.set(X_AMZ_COPY_SOURCE_VERSION_ID, copySource.versionId());
+          }
+        }).headers(h -> {
+          if (targetBucket.isVersioningEnabled() && copyS3ObjectMetadata.versionId() != null) {
+            h.set(X_AMZ_VERSION_ID, copyS3ObjectMetadata.versionId());
+          }
+        })
+        .body(new CopyObjectResult(copyS3ObjectMetadata));
   }
 
   /**
diff --git a/server/src/main/java/com/adobe/testing/s3mock/S3Exception.java b/server/src/main/java/com/adobe/testing/s3mock/S3Exception.java
index aac596785..81e4a78a0 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/S3Exception.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/S3Exception.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -59,6 +59,11 @@ public class S3Exception extends RuntimeException {
           "The lifecycle configuration does not exist.");
   public static final S3Exception NO_SUCH_KEY =
       new S3Exception(NOT_FOUND.value(), "NoSuchKey", "The specified key does not exist.");
+  public static final S3Exception NO_SUCH_VERSION =
+      new S3Exception(NOT_FOUND.value(), "NoSuchVersion", "The version ID specified in the "
+          + "request does not match an existing version.");
+  public static final S3Exception NO_SUCH_KEY_DELETE_MARKER =
+      new S3Exception(NOT_FOUND.value(), "NoSuchKey", "The specified key does not exist.");
   public static final S3Exception NOT_MODIFIED =
       new S3Exception(HttpStatus.NOT_MODIFIED.value(), "NotModified", "Not Modified");
   public static final S3Exception PRECONDITION_FAILED =
@@ -81,16 +86,19 @@ public class S3Exception extends RuntimeException {
   public static final S3Exception NOT_FOUND_BUCKET_OBJECT_LOCK =
       new S3Exception(BAD_REQUEST.value(), INVALID_REQUEST_CODE,
           "Bucket is missing Object Lock Configuration");
+  public static final S3Exception NOT_FOUND_BUCKET_VERSIONING_CONFIGURATION =
+      new S3Exception(BAD_REQUEST.value(), INVALID_REQUEST_CODE,
+          "Bucket is missing Versioning Configuration");
   public static final S3Exception NOT_FOUND_OBJECT_LOCK =
       new S3Exception(NOT_FOUND.value(), "NotFound",
           "The specified object does not have a ObjectLock configuration");
-  public static final S3Exception INVALID_REQUEST_RETAINDATE =
+  public static final S3Exception INVALID_REQUEST_RETAIN_DATE =
       new S3Exception(BAD_REQUEST.value(), INVALID_REQUEST_CODE,
           "The retain until date must be in the future!");
-  public static final S3Exception INVALID_REQUEST_MAXKEYS =
+  public static final S3Exception INVALID_REQUEST_MAX_KEYS =
       new S3Exception(BAD_REQUEST.value(), INVALID_REQUEST_CODE,
           "maxKeys should be non-negative");
-  public static final S3Exception INVALID_REQUEST_ENCODINGTYPE =
+  public static final S3Exception INVALID_REQUEST_ENCODING_TYPE =
       new S3Exception(BAD_REQUEST.value(), INVALID_REQUEST_CODE,
           "encodingtype can only be none or 'url'");
   public static final S3Exception INVALID_COPY_REQUEST_SAME_KEY =
diff --git a/server/src/main/java/com/adobe/testing/s3mock/S3MockConfiguration.java b/server/src/main/java/com/adobe/testing/s3mock/S3MockConfiguration.java
index ebe6875e6..465a81e6e 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/S3MockConfiguration.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/S3MockConfiguration.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.adobe.testing.s3mock;
 
+import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_DELETE_MARKER;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
 
 import com.adobe.testing.s3mock.dto.ErrorResponse;
@@ -228,6 +229,9 @@ public ResponseEntity<ErrorResponse> handleS3Exception(final S3Exception s3Excep
 
       var headers = new HttpHeaders();
       headers.setContentType(MediaType.APPLICATION_XML);
+      if (s3Exception == S3Exception.NO_SUCH_KEY_DELETE_MARKER) {
+        headers.set(X_AMZ_DELETE_MARKER, "true");
+      }
 
       return ResponseEntity.status(s3Exception.getStatus()).headers(headers).body(errorResponse);
     }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResult.java b/server/src/main/java/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResult.java
index 59b30a6c5..c76def56c 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResult.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -41,9 +41,21 @@ public record CompleteMultipartUploadResult(
     //workaround for adding xmlns attribute to root element only.
     @JacksonXmlProperty(isAttribute = true, localName = "xmlns")
     String xmlns,
-
+    @JsonProperty("ChecksumCRC32")
+    String checksumCRC32,
+    @JsonProperty("ChecksumCRC32C")
+    String checksumCRC32C,
+    @JsonProperty("ChecksumSHA1")
+    String checksumSHA1,
+    @JsonProperty("ChecksumSHA256")
+    String checksumSHA256,
+    @JsonProperty("ChecksumCRC64NVME")
+    String checksumCRC64NVME,
     @JsonIgnore
     MultipartUploadInfo multipartUploadInfo,
+    @JsonIgnore
+    String versionId,
+    @JsonIgnore
     String checksum
 ) {
   public CompleteMultipartUploadResult {
@@ -53,12 +65,28 @@ public record CompleteMultipartUploadResult(
     }
   }
 
-  public CompleteMultipartUploadResult(String location,
+  public static CompleteMultipartUploadResult from(String location,
                                        String bucket,
                                        String key,
                                        String etag,
                                        MultipartUploadInfo multipartUploadInfo,
-                                       String checksum) {
-    this(location, bucket, key, etag, null, multipartUploadInfo, checksum);
+                                       String checksum,
+                                       String versionId) {
+    if (multipartUploadInfo == null || multipartUploadInfo.checksumAlgorithm() == null) {
+      return new CompleteMultipartUploadResult(location, bucket, key, etag, null,
+          null, null, null, null, null, multipartUploadInfo, versionId, null);
+    }
+    return switch (multipartUploadInfo.checksumAlgorithm()) {
+      case CRC32 -> new CompleteMultipartUploadResult(location, bucket, key, etag, null,
+          checksum, null, null, null, null, multipartUploadInfo, versionId, checksum);
+      case CRC32C -> new CompleteMultipartUploadResult(location, bucket, key, etag, null,
+          null, checksum, null, null, null, multipartUploadInfo, versionId, checksum);
+      case SHA1 -> new CompleteMultipartUploadResult(location, bucket, key, etag, null,
+          null, null, checksum, null, null, multipartUploadInfo, versionId, checksum);
+      case SHA256 -> new CompleteMultipartUploadResult(location, bucket, key, etag, null,
+          null, null, null, checksum, null, multipartUploadInfo, versionId, checksum);
+      case CRC64NVME -> new CompleteMultipartUploadResult(location, bucket, key, etag, null,
+          null, null, null, null, checksum, multipartUploadInfo, versionId, checksum);
+    };
   }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/CopyObjectResult.java b/server/src/main/java/com/adobe/testing/s3mock/dto/CopyObjectResult.java
index c96645f41..856653e17 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/dto/CopyObjectResult.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/CopyObjectResult.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import static com.adobe.testing.s3mock.util.EtagUtil.normalizeEtag;
 
+import com.adobe.testing.s3mock.store.S3ObjectMetadata;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
@@ -45,4 +46,8 @@ public record CopyObjectResult(
   public CopyObjectResult(String lastModified, String etag) {
     this(lastModified, etag, null);
   }
+
+  public CopyObjectResult(S3ObjectMetadata metadata) {
+    this(metadata.modificationDate(), metadata.etag());
+  }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/CopySource.java b/server/src/main/java/com/adobe/testing/s3mock/dto/CopySource.java
index ba39a5d49..31623fe01 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/dto/CopySource.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/CopySource.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2022 Adobe.
+ *  Copyright 2017-2024 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -25,24 +25,31 @@
  */
 public record CopySource(
     String bucket,
-    String key
+    String key,
+    String versionId
 ) {
-  public static final String DELIMITER = "/";
+  static final String DELIMITER = "/";
 
   /**
-   * Creates a {@link CopySource} expecting the given String represents the source as {@code
-   * /{bucket}/{key}}.
+   * Creates a {@link CopySource} expecting the given String to represent the source as {@code
+   * /{bucket}/{key}[?versionId={versionId}]}.
    *
    * @param copySource The object references.
    *
    * @throws IllegalArgumentException If {@code copySource} could not be parsed.
    * @throws NullPointerException If {@code copySource} is null.
    */
-  public CopySource(String copySource) {
-    //inefficient duplicate parsing of incoming String, call to default constructor must be the
-    //first statement...
-    this(extractBucketAndKeyArray(SdkHttpUtils.urlDecode(copySource))[0],
-        extractBucketAndKeyArray(SdkHttpUtils.urlDecode(copySource))[1]);
+  public static CopySource from(String copySource) {
+    var bucketAndKey = extractBucketAndKeyArray(SdkHttpUtils.urlDecode(copySource));
+    var bucket = requireNonNull(bucketAndKey[0]);
+    var key = requireNonNull(bucketAndKey[1]);
+    String versionId = null;
+    if (key.contains("?versionId=")) {
+      String[] keyAndVersionId = key.split("\\?versionId=");
+      key = keyAndVersionId[0];
+      versionId = keyAndVersionId[1];
+    }
+    return new CopySource(bucket, key, versionId);
   }
 
   /**
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/DeleteMarkerEntry.java b/server/src/main/java/com/adobe/testing/s3mock/dto/DeleteMarkerEntry.java
index 8829bd4c9..8abc0215d 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/dto/DeleteMarkerEntry.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/DeleteMarkerEntry.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 package com.adobe.testing.s3mock.dto;
 
+import com.adobe.testing.s3mock.store.S3ObjectMetadata;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -34,4 +35,11 @@ public record DeleteMarkerEntry(
     String versionId
 ) {
 
+  public static DeleteMarkerEntry from(S3ObjectMetadata s3ObjectMetadata, boolean isLatest) {
+    return new DeleteMarkerEntry(isLatest,
+        s3ObjectMetadata.key(),
+        s3ObjectMetadata.modificationDate(),
+        s3ObjectMetadata.owner(),
+        s3ObjectMetadata.versionId());
+  }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectPart.java b/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectPart.java
index 119adc838..615b99e32 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectPart.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectPart.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -30,6 +30,8 @@ public record ObjectPart(
     String checksumSHA1,
     @JsonProperty("ChecksumSHA256")
     String checksumSHA256,
+    @JsonProperty("ChecksumCRC64NVME")
+    String checksumCRC64NVME,
     @JsonProperty("Size")
     Long size,
     @JsonProperty("PartNumber")
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectVersion.java b/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectVersion.java
index 03059982b..f18c09527 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectVersion.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/ObjectVersion.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public record ObjectVersion(
     etag = normalizeEtag(etag);
   }
 
-  public static ObjectVersion from(S3ObjectMetadata s3ObjectMetadata) {
+  public static ObjectVersion from(S3ObjectMetadata s3ObjectMetadata, boolean isLatest) {
     return new ObjectVersion(s3ObjectMetadata.key(),
         s3ObjectMetadata.modificationDate(),
         s3ObjectMetadata.etag(),
@@ -57,8 +57,8 @@ public static ObjectVersion from(S3ObjectMetadata s3ObjectMetadata) {
         s3ObjectMetadata.storageClass(),
         s3ObjectMetadata.owner(),
         s3ObjectMetadata.checksumAlgorithm(),
-        true,
-        "staticVersion");
+        isLatest,
+        s3ObjectMetadata.versionId());
   }
 
   public static ObjectVersion from(S3Object s3Object) {
@@ -69,7 +69,7 @@ public static ObjectVersion from(S3Object s3Object) {
         s3Object.storageClass(),
         s3Object.owner(),
         s3Object.checksumAlgorithm(),
-        true,
-        "staticVersion");
+        false,
+        "null");
   }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/S3ObjectIdentifier.java b/server/src/main/java/com/adobe/testing/s3mock/dto/S3ObjectIdentifier.java
index e7a1abf49..4eb7c2335 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/dto/S3ObjectIdentifier.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/S3ObjectIdentifier.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2022 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,7 +26,13 @@ public record S3ObjectIdentifier(
     @JsonProperty("Key")
     String key,
     @JsonProperty("VersionId")
-    String versionId
+    String versionId,
+    @JsonProperty("LastModifiedTime")
+    String lastModifiedTime,
+    @JsonProperty("ETag")
+    String etag,
+    @JsonProperty("Size")
+    String size
 ) {
 
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/dto/VersioningConfiguration.java b/server/src/main/java/com/adobe/testing/s3mock/dto/VersioningConfiguration.java
new file mode 100644
index 000000000..0804b4020
--- /dev/null
+++ b/server/src/main/java/com/adobe/testing/s3mock/dto/VersioningConfiguration.java
@@ -0,0 +1,81 @@
+/*
+ *  Copyright 2017-2025 Adobe.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.adobe.testing.s3mock.dto;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+
+/**
+ * <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_VersioningConfiguration.html">API Reference</a>.
+ */
+@JsonRootName("VersioningConfiguration")
+public record VersioningConfiguration(
+    @JsonProperty("MfaDelete")
+    MFADelete mfaDelete,
+    @JsonProperty("Status")
+    Status status,
+    //workaround for adding xmlns attribute to root element only.
+    @JacksonXmlProperty(isAttribute = true, localName = "xmlns")
+    String xmlns
+) {
+
+  public VersioningConfiguration {
+    if (xmlns == null) {
+      xmlns = "http://s3.amazonaws.com/doc/2006-03-01/";
+    }
+  }
+
+  public enum MFADelete {
+    ENABLED("Enabled"),
+    DISABLED("Disabled");
+
+    private final String value;
+
+    @JsonCreator
+    MFADelete(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+  public enum Status {
+    ENABLED("Enabled"),
+    SUSPENDED("Suspended");
+
+    private final String value;
+
+    @JsonCreator
+    Status(String value) {
+      this.value = value;
+    }
+
+    @Override
+    @JsonValue
+    public String toString() {
+      return value;
+    }
+  }
+
+}
diff --git a/server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java b/server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java
index d8169ea88..521fde25b 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/service/BucketService.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,9 +19,10 @@
 import static com.adobe.testing.s3mock.S3Exception.BUCKET_ALREADY_OWNED_BY_YOU;
 import static com.adobe.testing.s3mock.S3Exception.BUCKET_NOT_EMPTY;
 import static com.adobe.testing.s3mock.S3Exception.INVALID_BUCKET_NAME;
-import static com.adobe.testing.s3mock.S3Exception.INVALID_REQUEST_ENCODINGTYPE;
-import static com.adobe.testing.s3mock.S3Exception.INVALID_REQUEST_MAXKEYS;
+import static com.adobe.testing.s3mock.S3Exception.INVALID_REQUEST_ENCODING_TYPE;
+import static com.adobe.testing.s3mock.S3Exception.INVALID_REQUEST_MAX_KEYS;
 import static com.adobe.testing.s3mock.S3Exception.NOT_FOUND_BUCKET_OBJECT_LOCK;
+import static com.adobe.testing.s3mock.S3Exception.NOT_FOUND_BUCKET_VERSIONING_CONFIGURATION;
 import static com.adobe.testing.s3mock.S3Exception.NO_SUCH_BUCKET;
 import static com.adobe.testing.s3mock.S3Exception.NO_SUCH_LIFECYCLE_CONFIGURATION;
 import static com.adobe.testing.s3mock.dto.Owner.DEFAULT_OWNER;
@@ -32,6 +33,7 @@
 import com.adobe.testing.s3mock.dto.Bucket;
 import com.adobe.testing.s3mock.dto.BucketLifecycleConfiguration;
 import com.adobe.testing.s3mock.dto.Buckets;
+import com.adobe.testing.s3mock.dto.DeleteMarkerEntry;
 import com.adobe.testing.s3mock.dto.ListAllMyBucketsResult;
 import com.adobe.testing.s3mock.dto.ListBucketResult;
 import com.adobe.testing.s3mock.dto.ListBucketResultV2;
@@ -40,6 +42,8 @@
 import com.adobe.testing.s3mock.dto.ObjectVersion;
 import com.adobe.testing.s3mock.dto.Prefix;
 import com.adobe.testing.s3mock.dto.S3Object;
+import com.adobe.testing.s3mock.dto.VersioningConfiguration;
+import com.adobe.testing.s3mock.store.BucketMetadata;
 import com.adobe.testing.s3mock.store.BucketStore;
 import com.adobe.testing.s3mock.store.ObjectStore;
 import java.util.ArrayList;
@@ -64,7 +68,24 @@ public BucketService(BucketStore bucketStore, ObjectStore objectStore) {
   }
 
   public boolean isBucketEmpty(String bucketName) {
-    return bucketStore.isBucketEmpty(bucketName);
+    var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
+    if (bucketMetadata != null) {
+      var objects = bucketMetadata.objects();
+      if (!objects.isEmpty()) {
+        for (var id : objects.values()) {
+          var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucketMetadata, id, null);
+          if (s3ObjectMetadata != null) {
+            if (!s3ObjectMetadata.deleteMarker()) {
+              return false;
+            }
+          }
+        }
+        return true;
+      }
+      return bucketMetadata.objects().isEmpty();
+    } else {
+      throw new IllegalStateException("Requested Bucket does not exist: " + bucketName);
+    }
   }
 
   public boolean doesBucketExist(String bucketName) {
@@ -110,7 +131,47 @@ public Bucket createBucket(String bucketName,
   }
 
   public boolean deleteBucket(String bucketName) {
-    return bucketStore.deleteBucket(bucketName);
+    var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
+    if (bucketMetadata != null) {
+      var objects = bucketMetadata.objects();
+      if (!objects.isEmpty()) {
+        for (var entry : objects.entrySet()) {
+          var s3ObjectMetadata =
+              objectStore.getS3ObjectMetadata(bucketMetadata, entry.getValue(), null);
+          if (s3ObjectMetadata != null) {
+            if (s3ObjectMetadata.deleteMarker()) {
+              //yes, we really want to delete the objects here, if they are delete markers, they
+              //do not officially exist.
+              objectStore.doDeleteObject(bucketMetadata, entry.getValue());
+              bucketStore.removeFromBucket(entry.getKey(), bucketName);
+            }
+          }
+        }
+      }
+      //check again if bucket is empty
+      bucketMetadata = bucketStore.getBucketMetadata(bucketName);
+      if (!bucketMetadata.objects().isEmpty()) {
+        throw new IllegalStateException("Bucket is not empty: " + bucketName);
+      }
+      return bucketStore.deleteBucket(bucketName);
+    } else {
+      throw new IllegalStateException("Requested Bucket does not exist: " + bucketName);
+    }
+  }
+
+  public void setVersioningConfiguration(String bucketName, VersioningConfiguration configuration) {
+    var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
+    bucketStore.storeVersioningConfiguration(bucketMetadata, configuration);
+  }
+
+  public VersioningConfiguration getVersioningConfiguration(String bucketName) {
+    var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
+    var configuration = bucketMetadata.versioningConfiguration();
+    if (configuration != null) {
+      return configuration;
+    } else {
+      throw NOT_FOUND_BUCKET_VERSIONING_CONFIGURATION;
+    }
   }
 
   public void setObjectLockConfiguration(String bucketName, ObjectLockConfiguration configuration) {
@@ -161,7 +222,8 @@ public List<S3Object> getS3Objects(String bucketName, String prefix) {
     var uuids = bucketStore.lookupKeysInBucket(prefix, bucketName);
     return uuids
         .stream()
-        .map(uuid -> objectStore.getS3ObjectMetadata(bucketMetadata, uuid))
+        .filter(Objects::nonNull)
+        .map(uuid -> objectStore.getS3ObjectMetadata(bucketMetadata, uuid, null))
         .filter(Objects::nonNull)
         .map(S3Object::from)
         // List Objects results are expected to be sorted by key
@@ -173,16 +235,45 @@ public ListVersionsResult listVersions(String bucketName,
       String prefix,
       String delimiter,
       String encodingType,
-      String startAfter,
       Integer maxKeys,
-      String continuationToken,
       String keyMarker,
       String versionIdMarker) {
-    //first implementation with dummy versions, just list objects for now.
-    ListBucketResultV2 result = listObjectsV2(bucketName, prefix, delimiter, encodingType,
-        startAfter, maxKeys, continuationToken);
+    var result = listObjectsV1(bucketName, prefix, delimiter, keyMarker, encodingType, maxKeys);
 
-    var versions = result.contents().stream().map(ObjectVersion::from).toList();
+    var bucket = bucketStore.getBucketMetadata(bucketName);
+    var objectVersions = new ArrayList<ObjectVersion>();
+    var deleteMarkers = new ArrayList<DeleteMarkerEntry>();
+    String nextVersionIdMarker = null;
+
+    for (var object : result.contents()) {
+      if (nextVersionIdMarker != null) {
+        break;
+      }
+      var id = bucket.getID(object.key());
+
+      if (bucket.isVersioningEnabled()) {
+        var s3ObjectVersions = objectStore.getS3ObjectVersions(bucket, id);
+        for (var s3ObjectVersion : s3ObjectVersions.versions()) {
+          var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucket, id, s3ObjectVersion);
+          if (!s3ObjectMetadata.deleteMarker()) {
+            if (objectVersions.size() > maxKeys) {
+              nextVersionIdMarker = s3ObjectVersion;
+              break;
+            }
+            objectVersions.add(
+                ObjectVersion.from(s3ObjectMetadata,
+                    Objects.equals(s3ObjectVersions.getLatestVersion(), s3ObjectVersion))
+            );
+          } else {
+            deleteMarkers.add(
+                DeleteMarkerEntry.from(s3ObjectMetadata,
+                    Objects.equals(s3ObjectVersions.getLatestVersion(), s3ObjectVersion)));
+          }
+        }
+      } else {
+        objectVersions.add(ObjectVersion.from(object));
+      }
+    }
 
     return new ListVersionsResult(result.name(),
         result.prefix(),
@@ -191,12 +282,12 @@ public ListVersionsResult listVersions(String bucketName,
         result.commonPrefixes(),
         delimiter,
         result.encodingType(),
-        result.continuationToken(),
-        null,
-        result.nextContinuationToken(),
-        null,
-        versions,
-        null);
+        keyMarker,
+        versionIdMarker,
+        result.nextMarker(),
+        nextVersionIdMarker,
+        objectVersions,
+        deleteMarkers);
   }
 
   public ListBucketResultV2 listObjectsV2(String bucketName,
@@ -302,9 +393,12 @@ public ListBucketResult listObjectsV1(String bucketName, String prefix, String d
         returnCommonPrefixes.stream().map(Prefix::new).toList());
   }
 
-  public void verifyBucketExists(String bucketName) {
-    if (!bucketStore.doesBucketExist(bucketName)) {
+  public BucketMetadata verifyBucketExists(String bucketName) {
+    var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
+    if (bucketMetadata == null) {
       throw NO_SUCH_BUCKET;
+    } else {
+      return bucketMetadata;
     }
   }
 
@@ -324,7 +418,7 @@ public void verifyBucketNameIsAllowed(String bucketName) {
   }
 
   public void verifyBucketIsEmpty(String bucketName) {
-    if (!bucketStore.isBucketEmpty(bucketName)) {
+    if (!isBucketEmpty(bucketName)) {
       throw BUCKET_NOT_EMPTY;
     }
   }
@@ -339,13 +433,13 @@ public void verifyBucketDoesNotExist(String bucketName) {
 
   public void verifyMaxKeys(Integer maxKeys) {
     if (maxKeys < 0) {
-      throw INVALID_REQUEST_MAXKEYS;
+      throw INVALID_REQUEST_MAX_KEYS;
     }
   }
 
   public void verifyEncodingType(String encodingType) {
     if (isNotEmpty(encodingType) && !"url".equals(encodingType)) {
-      throw INVALID_REQUEST_ENCODINGTYPE;
+      throw INVALID_REQUEST_ENCODING_TYPE;
     }
   }
 
diff --git a/server/src/main/java/com/adobe/testing/s3mock/service/MultipartService.java b/server/src/main/java/com/adobe/testing/s3mock/service/MultipartService.java
index d05c741a3..45de7f3ac 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/service/MultipartService.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/service/MultipartService.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -105,7 +105,8 @@ public CopyPartResult copyPart(String bucketName,
       String destinationBucket,
       String destinationKey,
       String uploadId,
-      Map<String, String> encryptionHeaders) {
+      Map<String, String> encryptionHeaders,
+      String versionId) {
     var sourceBucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var destinationBucketMetadata = bucketStore.getBucketMetadata(destinationBucket);
     var sourceId = sourceBucketMetadata.getID(key);
@@ -117,7 +118,7 @@ public CopyPartResult copyPart(String bucketName,
     try {
       var partEtag =
           multipartStore.copyPart(sourceBucketMetadata, sourceId, copyRange, partNumber,
-              destinationBucketMetadata, destinationId, uploadId, encryptionHeaders);
+              destinationBucketMetadata, destinationId, uploadId, encryptionHeaders, versionId);
       return CopyPartResult.from(new Date(), "\"" + partEtag + "\"");
     } catch (Exception e) {
       //something went wrong with writing the destination file, clean up ID from BucketStore.
@@ -254,8 +255,7 @@ public InitiateMultipartUploadResult createMultipartUpload(String bucketName,
    */
   public ListMultipartUploadsResult listMultipartUploads(String bucketName, String prefix) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
-    var multipartUploads =
-        multipartStore.listMultipartUploads(bucketMetadata, prefix);
+    var multipartUploads = multipartStore.listMultipartUploads(bucketMetadata, prefix);
 
     // the result contains all uploads, use some common value as default
     var maxUploads = Math.max(1000, multipartUploads.size());
@@ -266,9 +266,8 @@ public ListMultipartUploadsResult listMultipartUploads(String bucketName, String
   }
 
   public void verifyPartNumberLimits(String partNumberString) {
-    int partNumber;
     try {
-      partNumber = Integer.parseInt(partNumberString);
+      var partNumber = Integer.parseInt(partNumberString);
       if (partNumber < 1 || partNumber > 10000) {
         LOG.error("Multipart part number invalid. partNumber={}", partNumberString);
         throw INVALID_PART_NUMBER;
diff --git a/server/src/main/java/com/adobe/testing/s3mock/service/ObjectService.java b/server/src/main/java/com/adobe/testing/s3mock/service/ObjectService.java
index 300dfebfa..74d3dc27e 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/service/ObjectService.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/service/ObjectService.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,17 +18,17 @@
 
 import static com.adobe.testing.s3mock.S3Exception.BAD_REQUEST_CONTENT;
 import static com.adobe.testing.s3mock.S3Exception.BAD_REQUEST_MD5;
-import static com.adobe.testing.s3mock.S3Exception.INVALID_REQUEST_RETAINDATE;
+import static com.adobe.testing.s3mock.S3Exception.INVALID_REQUEST_RETAIN_DATE;
 import static com.adobe.testing.s3mock.S3Exception.NOT_FOUND_OBJECT_LOCK;
 import static com.adobe.testing.s3mock.S3Exception.NOT_MODIFIED;
 import static com.adobe.testing.s3mock.S3Exception.NO_SUCH_KEY;
+import static com.adobe.testing.s3mock.S3Exception.NO_SUCH_KEY_DELETE_MARKER;
 import static com.adobe.testing.s3mock.S3Exception.PRECONDITION_FAILED;
 
 import com.adobe.testing.s3mock.S3Exception;
 import com.adobe.testing.s3mock.dto.AccessControlPolicy;
 import com.adobe.testing.s3mock.dto.Checksum;
 import com.adobe.testing.s3mock.dto.ChecksumAlgorithm;
-import com.adobe.testing.s3mock.dto.CopyObjectResult;
 import com.adobe.testing.s3mock.dto.Delete;
 import com.adobe.testing.s3mock.dto.DeleteResult;
 import com.adobe.testing.s3mock.dto.DeletedS3Object;
@@ -73,10 +73,11 @@ public ObjectService(BucketStore bucketStore, ObjectStore objectStore) {
    * @param destinationKey destination object key.
    * @param userMetadata User metadata to store for destination object
    *
-   * @return an {@link CopyObjectResult} or null if source couldn't be found.
+   * @return an {@link S3ObjectMetadata} or null if source couldn't be found.
    */
-  public CopyObjectResult copyS3Object(String sourceBucketName,
+  public S3ObjectMetadata copyS3Object(String sourceBucketName,
       String sourceKey,
+      String versionId,
       String destinationBucketName,
       String destinationKey,
       Map<String, String> encryptionHeaders,
@@ -94,6 +95,7 @@ public CopyObjectResult copyS3Object(String sourceBucketName,
     if (sourceKey.equals(destinationKey) && sourceBucketName.equals(destinationBucketName)) {
       return objectStore.pretendToCopyS3Object(sourceBucketMetadata,
           sourceId,
+          versionId,
           encryptionHeaders,
           storeHeaders,
           userMetadata,
@@ -103,7 +105,7 @@ public CopyObjectResult copyS3Object(String sourceBucketName,
     // source must be copied to destination
     var destinationId = bucketStore.addKeyToBucket(destinationKey, destinationBucketName);
     try {
-      return objectStore.copyS3Object(sourceBucketMetadata, sourceId,
+      return objectStore.copyS3Object(sourceBucketMetadata, sourceId, versionId,
           destinationBucketMetadata, destinationId, destinationKey,
           encryptionHeaders, storeHeaders, userMetadata, storageClass);
     } catch (Exception e) {
@@ -153,7 +155,7 @@ public DeleteResult deleteObjects(String bucketName, Delete delete) {
     for (var object : delete.objectsToDelete()) {
       try {
         // ignore result of delete object.
-        deleteObject(bucketName, object.key());
+        deleteObject(bucketName, object.key(), object.versionId());
         // add deleted object even if it does not exist S3 does the same.
         response.addDeletedObject(DeletedS3Object.from(object));
       } catch (IllegalStateException e) {
@@ -176,14 +178,14 @@ public DeleteResult deleteObjects(String bucketName, Delete delete) {
    *
    * @return true if deletion succeeded.
    */
-  public boolean deleteObject(String bucketName, String key) {
+  public boolean deleteObject(String bucketName, String key, String versionId) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var id = bucketMetadata.getID(key);
     if (id == null) {
       return false;
     }
 
-    if (objectStore.deleteObject(bucketMetadata, id)) {
+    if (objectStore.deleteObject(bucketMetadata, id, versionId)) {
       return bucketStore.removeFromBucket(key, bucketName);
     } else {
       return false;
@@ -197,10 +199,10 @@ public boolean deleteObject(String bucketName, String key) {
    * @param key object key to store tags for.
    * @param tags List of tagSet objects.
    */
-  public void setObjectTags(String bucketName, String key, List<Tag> tags) {
+  public void setObjectTags(String bucketName, String key, String versionId, List<Tag> tags) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var uuid = bucketMetadata.getID(key);
-    objectStore.storeObjectTags(bucketMetadata, uuid, tags);
+    objectStore.storeObjectTags(bucketMetadata, uuid, versionId, tags);
   }
 
   /**
@@ -210,10 +212,10 @@ public void setObjectTags(String bucketName, String key, List<Tag> tags) {
    * @param key object key to store tags for.
    * @param legalHold the legal hold.
    */
-  public void setLegalHold(String bucketName, String key, LegalHold legalHold) {
+  public void setLegalHold(String bucketName, String key, String versionId, LegalHold legalHold) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var uuid = bucketMetadata.getID(key);
-    objectStore.storeLegalHold(bucketMetadata, uuid, legalHold);
+    objectStore.storeLegalHold(bucketMetadata, uuid, versionId, legalHold);
   }
 
   /**
@@ -223,10 +225,10 @@ public void setLegalHold(String bucketName, String key, LegalHold legalHold) {
    * @param key object key to store tags for.
    * @param policy the ACL.
    */
-  public void setAcl(String bucketName, String key, AccessControlPolicy policy) {
+  public void setAcl(String bucketName, String key, String versionId, AccessControlPolicy policy) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var uuid = bucketMetadata.getID(key);
-    objectStore.storeAcl(bucketMetadata, uuid, policy);
+    objectStore.storeAcl(bucketMetadata, uuid, versionId, policy);
   }
 
   /**
@@ -235,10 +237,10 @@ public void setAcl(String bucketName, String key, AccessControlPolicy policy) {
    * @param bucketName Bucket the object is stored in.
    * @param key object key to store tags for.
    */
-  public AccessControlPolicy getAcl(String bucketName, String key) {
+  public AccessControlPolicy getAcl(String bucketName, String key, String versionId) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var uuid = bucketMetadata.getID(key);
-    return objectStore.readAcl(bucketMetadata, uuid);
+    return objectStore.readAcl(bucketMetadata, uuid, versionId);
   }
 
   /**
@@ -248,16 +250,16 @@ public AccessControlPolicy getAcl(String bucketName, String key) {
    * @param key object key to store tags for.
    * @param retention the retention.
    */
-  public void setRetention(String bucketName, String key, Retention retention) {
+  public void setRetention(String bucketName, String key, String versionId, Retention retention) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var uuid = bucketMetadata.getID(key);
-    objectStore.storeRetention(bucketMetadata, uuid, retention);
+    objectStore.storeRetention(bucketMetadata, uuid, versionId, retention);
   }
 
   public void verifyRetention(Retention retention) {
     var retainUntilDate = retention.retainUntilDate();
     if (Instant.now().isAfter(retainUntilDate)) {
-      throw INVALID_REQUEST_RETAINDATE;
+      throw INVALID_REQUEST_RETAIN_DATE;
     }
   }
 
@@ -337,21 +339,24 @@ public void verifyObjectMatching(List<String> match, List<String> noneMatch,
     }
   }
 
-  public S3ObjectMetadata verifyObjectExists(String bucketName, String key) {
+  public S3ObjectMetadata verifyObjectExists(String bucketName, String key, String versionId) {
     var bucketMetadata = bucketStore.getBucketMetadata(bucketName);
     var uuid = bucketMetadata.getID(key);
     if (uuid == null) {
       throw NO_SUCH_KEY;
     }
-    var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucketMetadata, uuid);
+    var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucketMetadata, uuid, versionId);
     if (s3ObjectMetadata == null) {
       throw NO_SUCH_KEY;
+    } else if (s3ObjectMetadata.deleteMarker()) {
+      throw NO_SUCH_KEY_DELETE_MARKER;
     }
     return s3ObjectMetadata;
   }
 
-  public S3ObjectMetadata verifyObjectLockConfiguration(String bucketName, String key) {
-    var s3ObjectMetadata = verifyObjectExists(bucketName, key);
+  public S3ObjectMetadata verifyObjectLockConfiguration(String bucketName, String key,
+      String versionId) {
+    var s3ObjectMetadata = verifyObjectExists(bucketName, key, versionId);
     var noLegalHold = s3ObjectMetadata.legalHold() == null;
     var noRetention = s3ObjectMetadata.retention() == null;
     if (noLegalHold && noRetention) {
@@ -361,7 +366,7 @@ public S3ObjectMetadata verifyObjectLockConfiguration(String bucketName, String
   }
 
   public static Checksum getChecksum(S3ObjectMetadata s3ObjectMetadata) {
-    ChecksumAlgorithm checksumAlgorithm = s3ObjectMetadata.checksumAlgorithm();
+    var checksumAlgorithm = s3ObjectMetadata.checksumAlgorithm();
     if (checksumAlgorithm != null) {
       return new Checksum(
               checksumAlgorithm == ChecksumAlgorithm.CRC32 ? s3ObjectMetadata.checksum() : null,
diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/BucketMetadata.java b/server/src/main/java/com/adobe/testing/s3mock/store/BucketMetadata.java
index b0b984bc6..148b119fa 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/store/BucketMetadata.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/store/BucketMetadata.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -16,8 +16,13 @@
 
 package com.adobe.testing.s3mock.store;
 
+import static com.adobe.testing.s3mock.dto.VersioningConfiguration.Status.ENABLED;
+import static com.adobe.testing.s3mock.dto.VersioningConfiguration.Status.SUSPENDED;
+
 import com.adobe.testing.s3mock.dto.BucketLifecycleConfiguration;
 import com.adobe.testing.s3mock.dto.ObjectLockConfiguration;
+import com.adobe.testing.s3mock.dto.VersioningConfiguration;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
@@ -30,6 +35,7 @@
 public record BucketMetadata(
     String name,
     String creationDate,
+    VersioningConfiguration versioningConfiguration,
     ObjectLockConfiguration objectLockConfiguration,
     BucketLifecycleConfiguration bucketLifecycleConfiguration,
     ObjectOwnership objectOwnership,
@@ -38,12 +44,14 @@ public record BucketMetadata(
 ) {
 
   public BucketMetadata(String name, String creationDate,
+      VersioningConfiguration versioningConfiguration,
       ObjectLockConfiguration objectLockConfiguration,
       BucketLifecycleConfiguration bucketLifecycleConfiguration,
       ObjectOwnership objectOwnership,
       Path path) {
     this(name,
         creationDate,
+        versioningConfiguration,
         objectLockConfiguration,
         bucketLifecycleConfiguration,
         objectOwnership,
@@ -51,9 +59,23 @@ public BucketMetadata(String name, String creationDate,
         new HashMap<>());
   }
 
+  public BucketMetadata withVersioningConfiguration(
+      VersioningConfiguration versioningConfiguration) {
+    return new BucketMetadata(name(),
+        creationDate(),
+        versioningConfiguration,
+        objectLockConfiguration(),
+        bucketLifecycleConfiguration(),
+        objectOwnership(),
+        path());
+  }
+
   public BucketMetadata withObjectLockConfiguration(
       ObjectLockConfiguration objectLockConfiguration) {
-    return new BucketMetadata(name(), creationDate(), objectLockConfiguration,
+    return new BucketMetadata(name(),
+        creationDate(),
+        versioningConfiguration(),
+        objectLockConfiguration,
         bucketLifecycleConfiguration(),
         objectOwnership(),
         path());
@@ -61,7 +83,10 @@ public BucketMetadata withObjectLockConfiguration(
 
   public BucketMetadata withBucketLifecycleConfiguration(
       BucketLifecycleConfiguration bucketLifecycleConfiguration) {
-    return new BucketMetadata(name(), creationDate(), objectLockConfiguration(),
+    return new BucketMetadata(name(),
+        creationDate(),
+        versioningConfiguration(),
+        objectLockConfiguration(),
         bucketLifecycleConfiguration,
         objectOwnership(),
         path());
@@ -89,4 +114,18 @@ public boolean removeKey(String key) {
   public UUID getID(String key) {
     return this.objects.get(key);
   }
+
+  @JsonIgnore
+  public boolean isVersioningEnabled() {
+    return this.versioningConfiguration() != null
+        && this.versioningConfiguration().status() != null
+        && this.versioningConfiguration().status() == ENABLED;
+  }
+
+  @JsonIgnore
+  public boolean isVersioningSuspended() {
+    return this.versioningConfiguration() != null
+        && this.versioningConfiguration().status() != null
+        && this.versioningConfiguration().status() == SUSPENDED;
+  }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/BucketStore.java b/server/src/main/java/com/adobe/testing/s3mock/store/BucketStore.java
index 5e2fc5ae8..3a0f0cfee 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/store/BucketStore.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/store/BucketStore.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import com.adobe.testing.s3mock.dto.BucketLifecycleConfiguration;
 import com.adobe.testing.s3mock.dto.ObjectLockConfiguration;
 import com.adobe.testing.s3mock.dto.ObjectLockEnabled;
+import com.adobe.testing.s3mock.dto.VersioningConfiguration;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.File;
 import java.io.IOException;
@@ -190,6 +191,7 @@ public BucketMetadata createBucket(String bucketName,
       var newBucketMetadata = new BucketMetadata(
           bucketName,
           s3ObjectDateFormat.format(LocalDateTime.now()),
+          new VersioningConfiguration(null, null, null),
           objectLockEnabled
               ? new ObjectLockConfiguration(ObjectLockEnabled.ENABLED, null) : null,
           null,
@@ -229,6 +231,13 @@ public void storeObjectLockConfiguration(BucketMetadata metadata,
     }
   }
 
+  public void storeVersioningConfiguration(BucketMetadata metadata,
+      VersioningConfiguration configuration) {
+    synchronized (lockStore.get(metadata.name())) {
+      writeToDisk(metadata.withVersioningConfiguration(configuration));
+    }
+  }
+
   public void storeBucketLifecycleConfiguration(BucketMetadata metadata,
       BucketLifecycleConfiguration configuration) {
     synchronized (lockStore.get(metadata.name())) {
@@ -266,9 +275,6 @@ public boolean deleteBucket(String bucketName) {
       synchronized (lockStore.get(bucketName)) {
         var bucketMetadata = getBucketMetadata(bucketName);
         if (bucketMetadata != null && bucketMetadata.objects().isEmpty()) {
-          //TODO: this currently does not work, since we store objects below their prefixes, which
-          // are not deleted when deleting the object, leaving empty directories in the S3Mock
-          // filesystem should be: return Files.deleteIfExists(bucket.getPath())
           FileUtils.deleteDirectory(bucketMetadata.path().toFile());
           lockStore.remove(bucketName);
           return true;
@@ -277,7 +283,7 @@ public boolean deleteBucket(String bucketName) {
         }
       }
     } catch (final IOException e) {
-      throw new IllegalStateException("Can't create bucket directory!", e);
+      throw new IllegalStateException("Can't delete bucket directory!", e);
     }
   }
 
diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java b/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java
index 3ca67a661..30224073e 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/store/MultipartStore.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -136,7 +136,7 @@ public MultipartUpload createMultipartUpload(BucketMetadata bucket,
    * @return the list of not-yet completed multipart uploads.
    */
   public List<MultipartUpload> listMultipartUploads(BucketMetadata bucketMetadata, String prefix) {
-    Path multipartsFolder = getMultipartsFolder(bucketMetadata);
+    var multipartsFolder = getMultipartsFolder(bucketMetadata);
     if (!multipartsFolder.toFile().exists()) {
       return Collections.emptyList();
     }
@@ -256,7 +256,7 @@ public CompleteMultipartUploadResult completeMultipartUpload(BucketMetadata buck
         is.transferTo(os);
         var checksumFor = checksumFor(partsPaths, uploadInfo);
         var etag = hexDigestMultipart(partsPaths);
-        objectStore.storeS3ObjectMetadata(bucket,
+        var s3ObjectMetadata = objectStore.storeS3ObjectMetadata(bucket,
             id,
             key,
             uploadInfo.contentType(),
@@ -272,8 +272,8 @@ public CompleteMultipartUploadResult completeMultipartUpload(BucketMetadata buck
             uploadInfo.storageClass()
         );
         FileUtils.deleteDirectory(partFolder.toFile());
-        return new CompleteMultipartUploadResult(location, uploadInfo.bucket(),
-            key, etag, uploadInfo, checksumFor);
+        return CompleteMultipartUploadResult.from(location, uploadInfo.bucket(),
+            key, etag, uploadInfo, checksumFor, s3ObjectMetadata.versionId());
       }
     } catch (IOException e) {
       throw new IllegalStateException(String.format(
@@ -343,12 +343,13 @@ public String copyPart(BucketMetadata bucket,
       BucketMetadata destinationBucket,
       UUID destinationId,
       String uploadId,
-      Map<String, String> encryptionHeaders) {
+      Map<String, String> encryptionHeaders,
+      String versionId) {
 
     verifyMultipartUploadPreparation(destinationBucket, destinationId, uploadId);
 
     return copyPartToFile(bucket, id, copyRange,
-        createPartFile(destinationBucket, destinationId, uploadId, partNumber));
+        createPartFile(destinationBucket, destinationId, uploadId, partNumber), versionId);
   }
 
   /**
@@ -371,9 +372,10 @@ private static InputStream toInputStream(List<Path> paths) {
   private String copyPartToFile(BucketMetadata bucket,
       UUID id,
       HttpRange copyRange,
-      File partFile) {
+      File partFile,
+      String versionId) {
     var from = 0L;
-    var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucket, id);
+    var s3ObjectMetadata = objectStore.getS3ObjectMetadata(bucket, id, versionId);
     var len = s3ObjectMetadata.dataPath().toFile().length();
     if (copyRange != null) {
       from = copyRange.getRangeStart(len);
diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/ObjectStore.java b/server/src/main/java/com/adobe/testing/s3mock/store/ObjectStore.java
index d2fe0db22..bce8764d0 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/store/ObjectStore.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/store/ObjectStore.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -19,11 +19,11 @@
 import static com.adobe.testing.s3mock.S3Exception.INVALID_COPY_REQUEST_SAME_KEY;
 import static com.adobe.testing.s3mock.util.AwsHttpHeaders.X_AMZ_SERVER_SIDE_ENCRYPTION_AWS_KMS_KEY_ID;
 import static com.adobe.testing.s3mock.util.DigestUtil.hexDigest;
+import static java.lang.String.format;
 
 import com.adobe.testing.s3mock.dto.AccessControlPolicy;
 import com.adobe.testing.s3mock.dto.CanonicalUser;
 import com.adobe.testing.s3mock.dto.ChecksumAlgorithm;
-import com.adobe.testing.s3mock.dto.CopyObjectResult;
 import com.adobe.testing.s3mock.dto.Grant;
 import com.adobe.testing.s3mock.dto.LegalHold;
 import com.adobe.testing.s3mock.dto.Owner;
@@ -32,7 +32,6 @@
 import com.adobe.testing.s3mock.dto.Tag;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.io.IOException;
-import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -54,8 +53,13 @@
 public class ObjectStore extends StoreBase {
   private static final Logger LOG = LoggerFactory.getLogger(ObjectStore.class);
   private static final String META_FILE = "objectMetadata.json";
-  private static final String ACL_FILE = "objectAcl.json";
   private static final String DATA_FILE = "binaryData";
+  private static final String VERSIONED_META_FILE = "%s-objectMetadata.json";
+  private static final String VERSIONED_DATA_FILE = "%s-binaryData";
+  private static final String VERSIONS_FILE = "versions.json";
+  //if a bucket isn't version enabled, some APIs return "null" as the versionId for objects.
+  //clients may also pass in "null" as a version, expecting the behaviour for non-versioned objects.
+  private static final String NULL_VERSION = "null";
 
   /**
    * This map stores one lock object per S3Object ID.
@@ -106,7 +110,19 @@ public S3ObjectMetadata storeS3ObjectMetadata(BucketMetadata bucket,
     lockStore.putIfAbsent(id, new Object());
     synchronized (lockStore.get(id)) {
       createObjectRootFolder(bucket, id);
-      var dataFile = inputPathToFile(path, getDataFilePath(bucket, id));
+      String versionId = null;
+      if (bucket.isVersioningEnabled()) {
+        var existingVersions = getS3ObjectVersions(bucket, id);
+        if (existingVersions != null) {
+          versionId = existingVersions.createVersion();
+          writeVersionsfile(bucket, id, existingVersions);
+        } else {
+          var newVersions = createS3ObjectVersions(bucket, id);
+          versionId = newVersions.createVersion();
+          writeVersionsfile(bucket, id, newVersions);
+        }
+      }
+      var dataFile = inputPathToFile(path, getDataFilePath(bucket, id, versionId));
       var now = Instant.now();
       var s3ObjectMetadata = new S3ObjectMetadata(
           id,
@@ -129,7 +145,10 @@ public S3ObjectMetadata storeS3ObjectMetadata(BucketMetadata bucket,
           encryptionHeaders,
           checksumAlgorithm,
           checksum,
-          storageClass
+          storageClass,
+          null,
+          versionId,
+          false
       );
       writeMetafile(bucket, s3ObjectMetadata);
       return s3ObjectMetadata;
@@ -149,9 +168,9 @@ private AccessControlPolicy privateCannedAcl(Owner owner) {
    * @param id object ID to store tags for.
    * @param tags List of tagSet objects.
    */
-  public void storeObjectTags(BucketMetadata bucket, UUID id, List<Tag> tags) {
+  public void storeObjectTags(BucketMetadata bucket, UUID id, String versionId, List<Tag> tags) {
     synchronized (lockStore.get(id)) {
-      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id);
+      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id, versionId);
       writeMetafile(bucket, new S3ObjectMetadata(
           s3ObjectMetadata.id(),
           s3ObjectMetadata.key(),
@@ -170,7 +189,10 @@ public void storeObjectTags(BucketMetadata bucket, UUID id, List<Tag> tags) {
           s3ObjectMetadata.encryptionHeaders(),
           s3ObjectMetadata.checksumAlgorithm(),
           s3ObjectMetadata.checksum(),
-          s3ObjectMetadata.storageClass()
+          s3ObjectMetadata.storageClass(),
+          s3ObjectMetadata.policy(),
+          s3ObjectMetadata.versionId(),
+          s3ObjectMetadata.deleteMarker()
       ));
     }
   }
@@ -182,9 +204,10 @@ public void storeObjectTags(BucketMetadata bucket, UUID id, List<Tag> tags) {
    * @param id object ID to store tags for.
    * @param legalHold the legal hold.
    */
-  public void storeLegalHold(BucketMetadata bucket, UUID id, LegalHold legalHold) {
+  public void storeLegalHold(BucketMetadata bucket, UUID id, String versionId,
+      LegalHold legalHold) {
     synchronized (lockStore.get(id)) {
-      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id);
+      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id, versionId);
       writeMetafile(bucket, new S3ObjectMetadata(
           s3ObjectMetadata.id(),
           s3ObjectMetadata.key(),
@@ -203,7 +226,10 @@ public void storeLegalHold(BucketMetadata bucket, UUID id, LegalHold legalHold)
           s3ObjectMetadata.encryptionHeaders(),
           s3ObjectMetadata.checksumAlgorithm(),
           s3ObjectMetadata.checksum(),
-          s3ObjectMetadata.storageClass()
+          s3ObjectMetadata.storageClass(),
+          s3ObjectMetadata.policy(),
+          s3ObjectMetadata.versionId(),
+          s3ObjectMetadata.deleteMarker()
       ));
     }
   }
@@ -215,17 +241,42 @@ public void storeLegalHold(BucketMetadata bucket, UUID id, LegalHold legalHold)
    * @param id object ID to store tags for.
    * @param policy the ACL.
    */
-  public void storeAcl(BucketMetadata bucket, UUID id, AccessControlPolicy policy) {
-    writeAclFile(bucket, id, policy);
+  public void storeAcl(BucketMetadata bucket, UUID id, String versionId,
+      AccessControlPolicy policy) {
+    synchronized (lockStore.get(id)) {
+      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id, versionId);
+      writeMetafile(bucket, new S3ObjectMetadata(
+              s3ObjectMetadata.id(),
+              s3ObjectMetadata.key(),
+              s3ObjectMetadata.size(),
+              s3ObjectMetadata.modificationDate(),
+              s3ObjectMetadata.etag(),
+              s3ObjectMetadata.contentType(),
+              s3ObjectMetadata.lastModified(),
+              s3ObjectMetadata.dataPath(),
+              s3ObjectMetadata.userMetadata(),
+              s3ObjectMetadata.tags(),
+              s3ObjectMetadata.legalHold(),
+              s3ObjectMetadata.retention(),
+              s3ObjectMetadata.owner(),
+              s3ObjectMetadata.storeHeaders(),
+              s3ObjectMetadata.encryptionHeaders(),
+              s3ObjectMetadata.checksumAlgorithm(),
+              s3ObjectMetadata.checksum(),
+              s3ObjectMetadata.storageClass(),
+              policy,
+              s3ObjectMetadata.versionId(),
+              s3ObjectMetadata.deleteMarker()
+          )
+      );
+    }
   }
 
-  public AccessControlPolicy readAcl(BucketMetadata bucket, UUID id) {
-    var policy = readAclFile(bucket, id);
-    if (policy == null) {
-      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id);
-      return privateCannedAcl(s3ObjectMetadata.owner());
-    }
-    return policy;
+  public AccessControlPolicy readAcl(BucketMetadata bucket, UUID id, String versionId) {
+    var s3ObjectMetadata = getS3ObjectMetadata(bucket, id, versionId);
+    return s3ObjectMetadata.policy() == null
+        ? privateCannedAcl(s3ObjectMetadata.owner())
+        : s3ObjectMetadata.policy();
   }
 
   /**
@@ -235,9 +286,10 @@ public AccessControlPolicy readAcl(BucketMetadata bucket, UUID id) {
    * @param id object ID to store tags for.
    * @param retention the retention.
    */
-  public void storeRetention(BucketMetadata bucket, UUID id, Retention retention) {
+  public void storeRetention(BucketMetadata bucket, UUID id, String versionId,
+      Retention retention) {
     synchronized (lockStore.get(id)) {
-      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id);
+      var s3ObjectMetadata = getS3ObjectMetadata(bucket, id, versionId);
       writeMetafile(bucket, new S3ObjectMetadata(
           s3ObjectMetadata.id(),
           s3ObjectMetadata.key(),
@@ -256,7 +308,10 @@ public void storeRetention(BucketMetadata bucket, UUID id, Retention retention)
           s3ObjectMetadata.encryptionHeaders(),
           s3ObjectMetadata.checksumAlgorithm(),
           s3ObjectMetadata.checksum(),
-          s3ObjectMetadata.storageClass()
+          s3ObjectMetadata.storageClass(),
+          s3ObjectMetadata.policy(),
+          s3ObjectMetadata.versionId(),
+          s3ObjectMetadata.deleteMarker()
       ));
     }
   }
@@ -269,8 +324,12 @@ public void storeRetention(BucketMetadata bucket, UUID id, Retention retention)
    *
    * @return S3ObjectMetadata or null if not found
    */
-  public S3ObjectMetadata getS3ObjectMetadata(BucketMetadata bucket, UUID id) {
-    var metaPath = getMetaFilePath(bucket, id);
+  public S3ObjectMetadata getS3ObjectMetadata(BucketMetadata bucket, UUID id, String versionId) {
+    if (bucket.isVersioningEnabled() && versionId == null) {
+      var s3ObjectVersions = getS3ObjectVersions(bucket, id);
+      versionId = s3ObjectVersions.getLatestVersion();
+    }
+    var metaPath = getMetaFilePath(bucket, id, versionId);
 
     if (Files.exists(metaPath)) {
       synchronized (lockStore.get(id)) {
@@ -284,6 +343,55 @@ public S3ObjectMetadata getS3ObjectMetadata(BucketMetadata bucket, UUID id) {
     return null;
   }
 
+  /**
+   * Retrieves S3ObjectVersions for a UUID of a key from a bucket.
+   *
+   * @param bucket Bucket from which to retrieve the object.
+   * @param id ID of the object key.
+   *
+   * @return S3ObjectVersions or null if not found
+   */
+  public S3ObjectVersions getS3ObjectVersions(BucketMetadata bucket, UUID id) {
+    var metaPath = getVersionFilePath(bucket, id);
+
+    if (Files.exists(metaPath)) {
+      synchronized (lockStore.get(id)) {
+        try {
+          return objectMapper.readValue(metaPath.toFile(), S3ObjectVersions.class);
+        } catch (IOException e) {
+          throw new IllegalArgumentException("Could not read object versions-file " + id, e);
+        }
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Creates S3ObjectVersions for a UUID of a key from a bucket.
+   *
+   * @param bucket Bucket from which to retrieve the object.
+   * @param id ID of the object key.
+   *
+   * @return S3ObjectVersions
+   */
+  public S3ObjectVersions createS3ObjectVersions(BucketMetadata bucket, UUID id) {
+    var metaPath = getVersionFilePath(bucket, id);
+
+    if (Files.exists(metaPath)) {
+      //gracefully handle duplicate version creation
+      return getS3ObjectVersions(bucket, id);
+    } else {
+      synchronized (lockStore.get(id)) {
+        try {
+          writeVersionsfile(bucket, id, new S3ObjectVersions(id));
+          return objectMapper.readValue(metaPath.toFile(), S3ObjectVersions.class);
+        } catch (java.io.IOException e) {
+          throw new IllegalArgumentException("Could not read object versions-file " + id, e);
+        }
+      }
+    }
+  }
+
   /**
    * Copies an object to another bucket and encrypted object.
    *
@@ -294,10 +402,11 @@ public S3ObjectMetadata getS3ObjectMetadata(BucketMetadata bucket, UUID id) {
    * @param destinationKey destination object key.
    * @param userMetadata User metadata to store for destination object
    *
-   * @return {@link CopyObjectResult} or null if source couldn't be found.
+   * @return {@link S3ObjectMetadata} or null if source couldn't be found.
    */
-  public CopyObjectResult copyS3Object(BucketMetadata sourceBucket,
+  public S3ObjectMetadata copyS3Object(BucketMetadata sourceBucket,
       UUID sourceId,
+      String versionId,
       BucketMetadata destinationBucket,
       UUID destinationId,
       String destinationKey,
@@ -305,12 +414,12 @@ public CopyObjectResult copyS3Object(BucketMetadata sourceBucket,
       Map<String, String> storeHeaders,
       Map<String, String> userMetadata,
       StorageClass storageClass) {
-    var sourceObject = getS3ObjectMetadata(sourceBucket, sourceId);
+    var sourceObject = getS3ObjectMetadata(sourceBucket, sourceId, versionId);
     if (sourceObject == null) {
       return null;
     }
     synchronized (lockStore.get(sourceId)) {
-      var copiedObject = storeS3ObjectMetadata(destinationBucket,
+      return storeS3ObjectMetadata(destinationBucket,
           destinationId,
           destinationKey,
           sourceObject.contentType(),
@@ -328,7 +437,6 @@ public CopyObjectResult copyS3Object(BucketMetadata sourceBucket,
           sourceObject.owner(),
           storageClass != null ? storageClass : sourceObject.storageClass()
       );
-      return new CopyObjectResult(copiedObject.modificationDate(), copiedObject.etag());
     }
   }
 
@@ -337,27 +445,28 @@ public CopyObjectResult copyS3Object(BucketMetadata sourceBucket,
    * This does not change the modificationDate.
    * Also, this would need to increment the version if/when we support versioning.
    */
-  public CopyObjectResult pretendToCopyS3Object(BucketMetadata sourceBucket,
+  public S3ObjectMetadata pretendToCopyS3Object(BucketMetadata sourceBucket,
       UUID sourceId,
+      String versionId,
       Map<String, String> encryptionHeaders,
       Map<String, String> storeHeaders,
       Map<String, String> userMetadata,
       StorageClass storageClass) {
-    var sourceObject = getS3ObjectMetadata(sourceBucket, sourceId);
+    var sourceObject = getS3ObjectMetadata(sourceBucket, sourceId, versionId);
     if (sourceObject == null) {
       return null;
     }
 
     verifyPretendCopy(sourceObject, userMetadata, encryptionHeaders, storeHeaders, storageClass);
 
-    writeMetafile(sourceBucket, new S3ObjectMetadata(
+    var s3ObjectMetadata = new S3ObjectMetadata(
         sourceObject.id(),
         sourceObject.key(),
         sourceObject.size(),
         sourceObject.modificationDate(),
         sourceObject.etag(),
         sourceObject.contentType(),
-        Instant.now().toEpochMilli(),
+        java.time.Instant.now().toEpochMilli(),
         sourceObject.dataPath(),
         userMetadata == null || userMetadata.isEmpty()
             ? sourceObject.userMetadata() : userMetadata,
@@ -371,9 +480,13 @@ public CopyObjectResult pretendToCopyS3Object(BucketMetadata sourceBucket,
             ? sourceObject.encryptionHeaders() : encryptionHeaders,
         sourceObject.checksumAlgorithm(),
         sourceObject.checksum(),
-        storageClass != null ? storageClass : sourceObject.storageClass()
-    ));
-    return new CopyObjectResult(sourceObject.modificationDate(), sourceObject.etag());
+        storageClass != null ? storageClass : sourceObject.storageClass(),
+        sourceObject.policy(),
+        sourceObject.versionId(),
+        sourceObject.deleteMarker()
+    );
+    writeMetafile(sourceBucket, s3ObjectMetadata);
+    return s3ObjectMetadata;
   }
 
   private void verifyPretendCopy(S3ObjectMetadata sourceObject,
@@ -401,23 +514,74 @@ private void verifyPretendCopy(S3ObjectMetadata sourceObject,
    *
    * @return true if deletion succeeded.
    */
-  public boolean deleteObject(BucketMetadata bucket, UUID id) {
-    var s3ObjectMetadata = getS3ObjectMetadata(bucket, id);
+  public boolean deleteObject(BucketMetadata bucket, UUID id, String versionId) {
+    var s3ObjectMetadata = getS3ObjectMetadata(bucket, id, versionId);
     if (s3ObjectMetadata != null) {
-      synchronized (lockStore.get(id)) {
-        try {
-          FileUtils.deleteDirectory(getObjectFolderPath(bucket, id).toFile());
-        } catch (IOException e) {
-          throw new IllegalStateException("Could not delete object-directory " + id, e);
+      if (bucket.isVersioningEnabled() && !"null".equals(versionId)) {
+        if (versionId != null) {
+          return doDeleteVersion(bucket, id, versionId);
+        } else {
+          return insertDeleteMarker(bucket, id, s3ObjectMetadata);
         }
-        lockStore.remove(id);
-        return true;
       }
+      return doDeleteObject(bucket, id);
     } else {
       return false;
     }
   }
 
+  private boolean doDeleteVersion(BucketMetadata bucket, UUID id, String versionId) {
+    synchronized (lockStore.get(id)) {
+      try {
+        var existingVersions = getS3ObjectVersions(bucket, id);
+        if (existingVersions.versions().size() <= 1) {
+          //this is the last version of an object, delete object completely.
+          return doDeleteObject(bucket, id);
+        } else {
+          //there is at least one version of an object left, delete only the version.
+          existingVersions.deleteVersion(versionId);
+          writeVersionsfile(bucket, id, existingVersions);
+        }
+      } catch (Exception e) {
+        throw new IllegalStateException("Could not delete object-version " + id, e);
+      }
+      return false;
+    }
+  }
+
+  public boolean doDeleteObject(BucketMetadata bucket, UUID id) {
+    synchronized (lockStore.get(id)) {
+      try {
+        FileUtils.deleteDirectory(getObjectFolderPath(bucket, id).toFile());
+      } catch (IOException e) {
+        throw new IllegalStateException("Could not delete object-directory " + id, e);
+      }
+      lockStore.remove(id);
+      return true;
+    }
+  }
+
+  /**
+   * See <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/DeleteMarker.html">API Reference</a>.
+   */
+  private boolean insertDeleteMarker(BucketMetadata bucket, UUID id,
+      S3ObjectMetadata s3ObjectMetadata) {
+    String versionId = null;
+    synchronized (lockStore.get(id)) {
+      try {
+        var existingVersions = getS3ObjectVersions(bucket, id);
+        if (existingVersions != null) {
+          versionId = existingVersions.createVersion();
+          writeVersionsfile(bucket, id, existingVersions);
+        }
+        writeMetafile(bucket, S3ObjectMetadata.deleteMarker(s3ObjectMetadata, versionId));
+      } catch (Exception e) {
+        throw new IllegalStateException("Could not insert object-deletemarker " + id, e);
+      }
+      return false;
+    }
+  }
+
   /**
    * Used to load metadata for all objects from a bucket when S3Mock starts.
    * @param bucketMetadata metadata of existing bucket.
@@ -427,14 +591,33 @@ void loadObjects(BucketMetadata bucketMetadata, Collection<UUID> ids) {
     var loaded = 0;
     for (var id : ids) {
       lockStore.putIfAbsent(id, new Object());
-      var s3ObjectMetadata = getS3ObjectMetadata(bucketMetadata, id);
-      if (s3ObjectMetadata != null) {
-        loaded++;
+      var s3ObjectVersions = getS3ObjectVersions(bucketMetadata, id);
+      if (s3ObjectVersions != null) {
+        if (loadVersions(bucketMetadata, s3ObjectVersions)) {
+          loaded++;
+        }
+      } else {
+        var s3ObjectMetadata = getS3ObjectMetadata(bucketMetadata, id, null);
+        if (s3ObjectMetadata != null) {
+          loaded++;
+        }
       }
     }
     LOG.info("Loaded {}/{} objects for bucket {}", loaded, ids.size(), bucketMetadata.name());
   }
 
+  private boolean loadVersions(BucketMetadata bucket, S3ObjectVersions versions) {
+    var loaded = false;
+    var s3ObjectVersions = getS3ObjectVersions(bucket, versions.id());
+    for (var version : s3ObjectVersions.versions()) {
+      var s3ObjectMetadata = getS3ObjectMetadata(bucket, versions.id(), version);
+      if (s3ObjectMetadata != null) {
+        loaded = true;
+      }
+    }
+    return loaded;
+  }
+
   /**
    * Creates the root folder in which to store data and meta file.
    *
@@ -449,53 +632,45 @@ private Path getObjectFolderPath(BucketMetadata bucket, UUID id) {
     return Paths.get(bucket.path().toString(), id.toString());
   }
 
-  private Path getMetaFilePath(BucketMetadata bucket, UUID id) {
-    return Paths.get(getObjectFolderPath(bucket, id).toString(), META_FILE);
+  private Path getMetaFilePath(BucketMetadata bucket, UUID id, String versionId) {
+    if (versionId != null && !NULL_VERSION.equals(versionId)) {
+      return getObjectFolderPath(bucket, id).resolve(format(VERSIONED_META_FILE, versionId));
+    }
+    return getObjectFolderPath(bucket, id).resolve(META_FILE);
   }
 
-  private Path getAclFilePath(BucketMetadata bucket, UUID id) {
-    return Paths.get(getObjectFolderPath(bucket, id).toString(), ACL_FILE);
+  private Path getDataFilePath(BucketMetadata bucket, UUID id, String versionId) {
+    if (versionId != null) {
+      return getObjectFolderPath(bucket, id).resolve(format(VERSIONED_DATA_FILE, versionId));
+    }
+    return getObjectFolderPath(bucket, id).resolve(DATA_FILE);
   }
 
-  private Path getDataFilePath(BucketMetadata bucket, UUID id) {
-    return Paths.get(getObjectFolderPath(bucket, id).toString(), DATA_FILE);
+  private Path getVersionFilePath(BucketMetadata bucket, UUID id) {
+    return getObjectFolderPath(bucket, id).resolve(VERSIONS_FILE);
   }
 
-  private void writeMetafile(BucketMetadata bucket, S3ObjectMetadata s3ObjectMetadata) {
-    var id = s3ObjectMetadata.id();
+  private void writeVersionsfile(BucketMetadata bucket, UUID id,
+                                 S3ObjectVersions s3ObjectVersions) {
     try {
       synchronized (lockStore.get(id)) {
-        var metaFile = getMetaFilePath(bucket, id).toFile();
-        objectMapper.writeValue(metaFile, s3ObjectMetadata);
+        var versionsFile = getVersionFilePath(bucket, id).toFile();
+        objectMapper.writeValue(versionsFile, s3ObjectVersions);
       }
     } catch (IOException e) {
-      throw new IllegalStateException("Could not write object metadata-file " + id, e);
+      throw new IllegalStateException("Could not write object versions-file " + id, e);
     }
   }
 
-  private AccessControlPolicy readAclFile(BucketMetadata bucket, UUID id) {
-    try {
-      synchronized (lockStore.get(id)) {
-        var aclFile = getAclFilePath(bucket, id).toFile();
-        if (!aclFile.exists()) {
-          return null;
-        }
-        var toDeserialize = FileUtils.readFileToString(aclFile, Charset.defaultCharset());
-        return objectMapper.readValue(toDeserialize, AccessControlPolicy.class);
-      }
-    } catch (IOException e) {
-      throw new IllegalStateException("Could not read object acl-file " + id, e);
-    }
-  }
-
-  private void writeAclFile(BucketMetadata bucket, UUID id, AccessControlPolicy policy) {
+  private void writeMetafile(BucketMetadata bucket, S3ObjectMetadata s3ObjectMetadata) {
+    var id = s3ObjectMetadata.id();
     try {
       synchronized (lockStore.get(id)) {
-        var aclFile = getAclFilePath(bucket, id).toFile();
-        FileUtils.write(aclFile, objectMapper.writeValueAsString(policy), Charset.defaultCharset());
+        var metaFile = getMetaFilePath(bucket, id, s3ObjectMetadata.versionId()).toFile();
+        objectMapper.writeValue(metaFile, s3ObjectMetadata);
       }
     } catch (IOException e) {
-      throw new IllegalStateException("Could not write object acl-file " + id, e);
+      throw new IllegalStateException("Could not write object metadata-file " + id, e);
     }
   }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/S3ObjectMetadata.java b/server/src/main/java/com/adobe/testing/s3mock/store/S3ObjectMetadata.java
index 354f8439e..c30edecbe 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/store/S3ObjectMetadata.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/store/S3ObjectMetadata.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import static com.adobe.testing.s3mock.util.EtagUtil.normalizeEtag;
 
+import com.adobe.testing.s3mock.dto.AccessControlPolicy;
 import com.adobe.testing.s3mock.dto.ChecksumAlgorithm;
 import com.adobe.testing.s3mock.dto.LegalHold;
 import com.adobe.testing.s3mock.dto.Owner;
@@ -55,7 +56,10 @@ public record S3ObjectMetadata(
     Map<String, String> encryptionHeaders,
     ChecksumAlgorithm checksumAlgorithm,
     String checksum,
-    StorageClass storageClass
+    StorageClass storageClass,
+    AccessControlPolicy policy,
+    String versionId,
+    boolean deleteMarker
 ) {
 
   public S3ObjectMetadata {
@@ -67,4 +71,29 @@ public record S3ObjectMetadata(
     encryptionHeaders = encryptionHeaders == null ? Collections.emptyMap() : encryptionHeaders;
     storageClass = storageClass == StorageClass.STANDARD ? null : storageClass;
   }
+
+  public static S3ObjectMetadata deleteMarker(S3ObjectMetadata metadata, String versionId) {
+    return new S3ObjectMetadata(metadata.id,
+        metadata.key(),
+        metadata.size(),
+        metadata.modificationDate(),
+        metadata.etag(),
+        metadata.contentType(),
+        metadata.lastModified(),
+        metadata.dataPath(),
+        metadata.userMetadata(),
+        metadata.tags(),
+        metadata.legalHold(),
+        metadata.retention(),
+        metadata.owner(),
+        metadata.storeHeaders(),
+        metadata.encryptionHeaders(),
+        metadata.checksumAlgorithm(),
+        metadata.checksum(),
+        metadata.storageClass(),
+        metadata.policy(),
+        versionId,
+        true
+    );
+  }
 }
diff --git a/server/src/main/java/com/adobe/testing/s3mock/store/S3ObjectVersions.java b/server/src/main/java/com/adobe/testing/s3mock/store/S3ObjectVersions.java
new file mode 100644
index 000000000..fc4617b7f
--- /dev/null
+++ b/server/src/main/java/com/adobe/testing/s3mock/store/S3ObjectVersions.java
@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2017-2025 Adobe.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.adobe.testing.s3mock.store;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/manage-objects-versioned-bucket.html">doc</a>.
+ */
+public record S3ObjectVersions(
+    UUID id,
+    List<String> versions
+) {
+
+  public S3ObjectVersions(UUID id) {
+    this(id, new ArrayList<>());
+  }
+
+  public String createVersion() {
+    var versionId = UUID.randomUUID().toString();
+    versions.add(versionId);
+    return versionId;
+  }
+
+  public String getLatestVersion() {
+    if (versions.isEmpty()) {
+      return null;
+    }
+    return versions.get(versions.size() - 1);
+  }
+
+  public void deleteVersion(String versionId) {
+    versions.remove(versionId);
+  }
+}
diff --git a/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpHeaders.java b/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpHeaders.java
index 4268fae0b..0403e202a 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpHeaders.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpHeaders.java
@@ -43,6 +43,7 @@ public final class AwsHttpHeaders {
       "x-amz-copy-source-if-unmodified-since";
   public static final String X_AMZ_COPY_SOURCE_IF_MODIFIED_SINCE =
       "x-amz-copy-source-if-modified-since";
+  public static final String X_AMZ_COPY_SOURCE_VERSION_ID = "x-amz-copy-source-version-id";
 
   public static final String X_AMZ_METADATA_DIRECTIVE = "x-amz-metadata-directive";
 
@@ -50,6 +51,7 @@ public final class AwsHttpHeaders {
   public static final String X_AMZ_TAGGING = "x-amz-tagging";
   public static final String CONTENT_MD5 = "Content-MD5";
 
+  public static final String X_AMZ_VERSION_ID = "x-amz-version-id";
   public static final String X_AMZ_DELETE_MARKER = "x-amz-delete-marker";
 
   public static final String X_AMZ_BUCKET_OBJECT_LOCK_ENABLED = "x-amz-bucket-object-lock-enabled";
diff --git a/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpParameters.java b/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpParameters.java
index b7a82908d..b21f482b0 100644
--- a/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpParameters.java
+++ b/server/src/main/java/com/adobe/testing/s3mock/util/AwsHttpParameters.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2023 Adobe.
+ *  Copyright 2017-2024 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -21,30 +21,30 @@
  */
 public class AwsHttpParameters {
 
-  private static final String NOT = "!";
-
-  public static final String ACL = "acl";
-  public static final String NOT_ACL = NOT + ACL;
   public static final String CONTINUATION_TOKEN = "continuation-token";
   public static final String DELETE = "delete";
   public static final String ENCODING_TYPE = "encoding-type";
   public static final String KEY_MARKER = "key-marker";
   public static final String VERSION_ID_MARKER = "version-id-marker";
   public static final String LIST_TYPE_V2 = "list-type=2";
-  public static final String VERSIONS = "versions";
-  public static final String NOT_VERSIONS = "!versions";
   public static final String NOT_LIST_TYPE = "!list-type";
   public static final String MAX_KEYS = "max-keys";
   public static final String PART_NUMBER = "partNumber";
   public static final String START_AFTER = "start-after";
+  public static final String VERSION_ID = "versionId";
+
+  private static final String NOT = "!";
+
+  public static final String ACL = "acl";
+  public static final String NOT_ACL = NOT + ACL;
+  public static final String VERSIONS = "versions";
+  public static final String NOT_VERSIONS = NOT + VERSIONS;
   public static final String TAGGING = "tagging";
   public static final String NOT_TAGGING = NOT + TAGGING;
   public static final String UPLOADS = "uploads";
   public static final String NOT_UPLOADS = NOT + UPLOADS;
-
   public static final String UPLOAD_ID = "uploadId";
   public static final String NOT_UPLOAD_ID = NOT + UPLOAD_ID;
-
   public static final String LEGAL_HOLD = "legal-hold";
   public static final String NOT_LEGAL_HOLD = NOT + LEGAL_HOLD;
   public static final String OBJECT_LOCK = "object-lock";
@@ -57,6 +57,9 @@ public class AwsHttpParameters {
   public static final String NOT_ATTRIBUTES = NOT + ATTRIBUTES;
   public static final String LOCATION = "location";
   public static final String NOT_LOCATION = NOT + LOCATION;
+  public static final String VERSIONING = "versioning";
+  public static final String NOT_VERSIONING = NOT + VERSIONING;
+
 
   private AwsHttpParameters() {
     // private constructor for utility classes
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/BucketControllerTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/BucketControllerTest.kt
index f576eed9f..854717709 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/BucketControllerTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/BucketControllerTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -279,9 +279,9 @@ internal class BucketControllerTest : BaseControllerTest() {
     givenBucket()
 
     val maxKeys = -1
-    doThrow(S3Exception.INVALID_REQUEST_MAXKEYS).whenever(bucketService).verifyMaxKeys(maxKeys)
+    doThrow(S3Exception.INVALID_REQUEST_MAX_KEYS).whenever(bucketService).verifyMaxKeys(maxKeys)
     val encodingtype = "not_valid"
-    doThrow(S3Exception.INVALID_REQUEST_ENCODINGTYPE).whenever(bucketService).verifyEncodingType(encodingtype)
+    doThrow(S3Exception.INVALID_REQUEST_ENCODING_TYPE).whenever(bucketService).verifyEncodingType(encodingtype)
 
     val headers = HttpHeaders().apply {
       this.accept = listOf(MediaType.APPLICATION_XML)
@@ -299,7 +299,7 @@ internal class BucketControllerTest : BaseControllerTest() {
       String::class.java
     )
     assertThat(maxKeysResponse.statusCode).isEqualTo(HttpStatus.BAD_REQUEST)
-    assertThat(maxKeysResponse.body).isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_MAXKEYS)))
+    assertThat(maxKeysResponse.body).isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_MAX_KEYS)))
 
     val encodingTypeUri = UriComponentsBuilder
       .fromUriString("/test-bucket")
@@ -314,7 +314,7 @@ internal class BucketControllerTest : BaseControllerTest() {
     )
     assertThat(encodingTypeResponse.statusCode).isEqualTo(HttpStatus.BAD_REQUEST)
     assertThat(encodingTypeResponse.body)
-      .isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_ENCODINGTYPE)))
+      .isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_ENCODING_TYPE)))
   }
 
   @Test
@@ -323,9 +323,9 @@ internal class BucketControllerTest : BaseControllerTest() {
     givenBucket()
 
     val maxKeys = -1
-    doThrow(S3Exception.INVALID_REQUEST_MAXKEYS).whenever(bucketService).verifyMaxKeys(maxKeys)
+    doThrow(S3Exception.INVALID_REQUEST_MAX_KEYS).whenever(bucketService).verifyMaxKeys(maxKeys)
     val encodingtype = "not_valid"
-    doThrow(S3Exception.INVALID_REQUEST_ENCODINGTYPE).whenever(bucketService).verifyEncodingType(encodingtype)
+    doThrow(S3Exception.INVALID_REQUEST_ENCODING_TYPE).whenever(bucketService).verifyEncodingType(encodingtype)
 
     val headers = HttpHeaders().apply {
       this.accept = listOf(MediaType.APPLICATION_XML)
@@ -344,7 +344,7 @@ internal class BucketControllerTest : BaseControllerTest() {
     )
     assertThat(maxKeysResponse.statusCode).isEqualTo(HttpStatus.BAD_REQUEST)
     assertThat(maxKeysResponse.body)
-      .isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_MAXKEYS)))
+      .isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_MAX_KEYS)))
 
     val encodingTypeUri = UriComponentsBuilder
       .fromUriString("/test-bucket")
@@ -359,7 +359,7 @@ internal class BucketControllerTest : BaseControllerTest() {
     )
     assertThat(encodingTypeResponse.statusCode).isEqualTo(HttpStatus.BAD_REQUEST)
     assertThat(encodingTypeResponse.body)
-      .isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_ENCODINGTYPE)))
+      .isEqualTo(MAPPER.writeValueAsString(from(S3Exception.INVALID_REQUEST_ENCODING_TYPE)))
   }
 
   @Test
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt
index 1444b53cd..c70d97d1c 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import com.adobe.testing.s3mock.dto.Tagging
 import com.adobe.testing.s3mock.service.BucketService
 import com.adobe.testing.s3mock.service.MultipartService
 import com.adobe.testing.s3mock.service.ObjectService
+import com.adobe.testing.s3mock.store.BucketMetadata
 import com.adobe.testing.s3mock.store.KmsKeyStore
 import com.adobe.testing.s3mock.store.S3ObjectMetadata
 import com.adobe.testing.s3mock.util.AwsHttpHeaders
@@ -315,7 +316,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
       encryption, encryptionKey
     )
 
-    whenever(objectService.verifyObjectExists(TEST_BUCKET_NAME, key))
+    whenever(objectService.verifyObjectExists(TEST_BUCKET_NAME, key, null))
       .thenReturn(expectedS3ObjectMetadata)
 
     val headers = HttpHeaders().apply {
@@ -345,8 +346,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
       key, "digest",
       encryption, encryptionKey
     )
-
-    whenever(objectService.verifyObjectExists("test-bucket", key))
+    whenever(objectService.verifyObjectExists("test-bucket", key, null))
       .thenReturn(expectedS3ObjectMetadata)
 
     val headers = HttpHeaders().apply {
@@ -400,7 +400,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
       listOf(Grant(grantee, Grant.Permission.FULL_CONTROL))
     )
 
-    whenever(objectService.getAcl("test-bucket", key)).thenReturn(policy)
+    whenever(objectService.getAcl("test-bucket", key, null)).thenReturn(policy)
 
     val headers = HttpHeaders().apply {
       this.accept = listOf(MediaType.APPLICATION_XML)
@@ -455,7 +455,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
     )
 
     assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
-    verify(objectService).setAcl("test-bucket", key, policy)
+    verify(objectService).setAcl("test-bucket", key, null, policy)
   }
 
   @Test
@@ -474,7 +474,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
       key, UUID.randomUUID().toString(),
       null, null, null, tagging.tagSet.tags
     )
-    whenever(objectService.verifyObjectExists("test-bucket", key))
+    whenever(objectService.verifyObjectExists("test-bucket", key, null))
       .thenReturn(s3ObjectMetadata)
 
     val headers = HttpHeaders().apply {
@@ -502,7 +502,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
     givenBucket()
     val key = "name"
     val s3ObjectMetadata = s3ObjectMetadata(key, UUID.randomUUID().toString())
-    whenever(objectService.verifyObjectExists("test-bucket", key))
+    whenever(objectService.verifyObjectExists("test-bucket", key, null))
       .thenReturn(s3ObjectMetadata)
     val tagging = Tagging(
       TagSet(
@@ -528,7 +528,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
       String::class.java
     )
 
-    verify(objectService).setObjectTags("test-bucket", key, tagging.tagSet.tags)
+    verify(objectService).setObjectTags("test-bucket", key, null, tagging.tagSet.tags)
     assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
   }
 
@@ -543,7 +543,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
       key, UUID.randomUUID().toString(),
       null, null, retention, null
     )
-    whenever(objectService.verifyObjectLockConfiguration("test-bucket", key))
+    whenever(objectService.verifyObjectLockConfiguration("test-bucket", key, null))
       .thenReturn(s3ObjectMetadata)
 
     val headers = HttpHeaders().apply {
@@ -589,18 +589,21 @@ internal class ObjectControllerTest : BaseControllerTest() {
       String::class.java
     )
 
-    verify(objectService).setRetention("test-bucket", key, retention)
+    verify(objectService).setRetention("test-bucket", key, null, retention)
     assertThat(response.statusCode).isEqualTo(HttpStatus.OK)
   }
 
   private fun givenBucket() {
     whenever(bucketService.getBucket(TEST_BUCKET_NAME)).thenReturn(TEST_BUCKET)
     whenever(bucketService.doesBucketExist(TEST_BUCKET_NAME)).thenReturn(true)
+    whenever(bucketService.verifyBucketExists("test-bucket")).thenReturn(TEST_BUCKETMETADATA)
   }
 
   companion object {
     private const val TEST_BUCKET_NAME = "test-bucket"
     private val TEST_BUCKET = Bucket(Paths.get("/tmp/foo/1"), TEST_BUCKET_NAME, Instant.now().toString())
+    private val TEST_BUCKETMETADATA = BucketMetadata(TEST_BUCKET_NAME, Instant.now().toString(),
+      null, null, null, null, Paths.get("/tmp/foo/1"))
     private const val UPLOAD_FILE_NAME = "src/test/resources/sampleFile.txt"
 
     fun s3ObjectEncrypted(
@@ -635,7 +638,10 @@ internal class ObjectControllerTest : BaseControllerTest() {
         encryptionHeaders(encryption, encryptionKey),
         null,
         null,
-        null
+        null,
+        null,
+        null,
+        false
       )
     }
 
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/TaggingHeaderConverterTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/TaggingHeaderConverterTest.kt
index 4089bb087..23ed26017 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/TaggingHeaderConverterTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/TaggingHeaderConverterTest.kt
@@ -57,6 +57,6 @@ internal class TaggingHeaderConverterTest {
   }
 
   private fun tag(i: Int): String {
-    return String.format("tag%d=value%d", i, i)
+    return "tag$i=value$i"
   }
 }
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResultTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResultTest.kt
index 75762ae8a..1ac18e2a6 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResultTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CompleteMultipartUploadResultTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package com.adobe.testing.s3mock.dto
 
+import com.adobe.testing.s3mock.store.MultipartUploadInfo
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInfo
@@ -24,7 +25,7 @@ internal class CompleteMultipartUploadResultTest {
   @Test
   @Throws(IOException::class)
   fun testSerialization(testInfo: TestInfo) {
-    val iut = CompleteMultipartUploadResult("location", "bucket", "key", "etag", null, null)
+    val iut = CompleteMultipartUploadResult.from("location", "bucket", "key", "etag", MultipartUploadInfo(null, null, null, null, null, null, null, "checksum", null), null, null)
     assertThat(iut).isNotNull()
     DtoTestUtil.serializeAndAssert(iut, testInfo)
   }
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CopySourceTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CopySourceTest.kt
index 1a0ca9908..e853ae5b6 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CopySourceTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/CopySourceTest.kt
@@ -17,6 +17,7 @@ package com.adobe.testing.s3mock.dto
 
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatThrownBy
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import java.util.UUID
 
@@ -26,7 +27,7 @@ import java.util.UUID
 internal class CopySourceTest {
   @Test
   fun fromPrefixedCopySourceString() {
-    val copySource = CopySource(CopySource.DELIMITER + VALID_COPY_SOURCE)
+    val copySource = CopySource.from("/$VALID_COPY_SOURCE")
 
     assertThat(copySource.bucket).isEqualTo(BUCKET)
     assertThat(copySource.key).isEqualTo(KEY)
@@ -34,7 +35,7 @@ internal class CopySourceTest {
 
   @Test
   fun fromCopySourceString() {
-    val copySource = CopySource(VALID_COPY_SOURCE)
+    val copySource = CopySource.from(VALID_COPY_SOURCE)
 
     assertThat(copySource.bucket).isEqualTo(BUCKET)
     assertThat(copySource.key).isEqualTo(KEY)
@@ -43,7 +44,7 @@ internal class CopySourceTest {
   @Test
   fun invalidCopySource() {
     assertThatThrownBy {
-      CopySource(UUID.randomUUID().toString())
+      CopySource.from(UUID.randomUUID().toString())
     }
       .isInstanceOf(IllegalArgumentException::class.java)
   }
@@ -51,14 +52,24 @@ internal class CopySourceTest {
   @Test
   fun nullCopySource() {
     assertThatThrownBy {
-      CopySource(null)
+      CopySource.from(null)
     }
       .isInstanceOf(NullPointerException::class.java)
   }
 
+  @Test
+  fun fromCopySourceWithVersion() {
+    val copySource = CopySource.from(COPY_SOURCE_WITH_VERSION)
+
+    assertThat(copySource.bucket).isEqualTo(BUCKET)
+    assertThat(copySource.key).isEqualTo(KEY)
+  }
+
   companion object {
     private val BUCKET = UUID.randomUUID().toString()
     private val KEY = UUID.randomUUID().toString()
-    private val VALID_COPY_SOURCE = BUCKET + CopySource.DELIMITER + KEY
+    private const val VERSION = "123"
+    private val VALID_COPY_SOURCE = "$BUCKET/$KEY"
+    private val COPY_SOURCE_WITH_VERSION = "$VALID_COPY_SOURCE?versionId=$VERSION"
   }
 }
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/DeleteResultTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/DeleteResultTest.kt
index c4eeda2a3..9ad4baa86 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/DeleteResultTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/DeleteResultTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -30,7 +30,10 @@ internal class DeleteResultTest {
     for (i in 0 until count) {
       val deletedObject = S3ObjectIdentifier(
         "key$i",
-        "versionId$i"
+        "versionId$i",
+        "lastModifiedTime$i",
+        "etag$i",
+        "size$i"
       )
       iut.addDeletedObject(DeletedS3Object.from(deletedObject))
     }
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/GetObjectAttributesOutputTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/GetObjectAttributesOutputTest.kt
index d99674881..095345a8f 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/GetObjectAttributesOutputTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/GetObjectAttributesOutputTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@ internal class GetObjectAttributesOutputTest {
       null,
       null,
       null,
+      null,
       1L,
       1
     )
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/dto/VersioningConfigurationTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/VersioningConfigurationTest.kt
new file mode 100644
index 000000000..e9caeeb2d
--- /dev/null
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/dto/VersioningConfigurationTest.kt
@@ -0,0 +1,44 @@
+/*
+ *  Copyright 2017-2024 Adobe.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package com.adobe.testing.s3mock.dto
+
+import com.adobe.testing.s3mock.dto.DtoTestUtil.deserialize
+import com.adobe.testing.s3mock.dto.DtoTestUtil.serializeAndAssert
+import com.adobe.testing.s3mock.dto.VersioningConfiguration.MFADelete
+import com.adobe.testing.s3mock.dto.VersioningConfiguration.Status
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInfo
+import java.io.IOException
+
+internal class VersioningConfigurationTest {
+
+  @Test
+  @Throws(IOException::class)
+  fun testSerialization(testInfo: TestInfo) {
+    val iut = VersioningConfiguration(null, Status.SUSPENDED, null)
+    serializeAndAssert(iut, testInfo)
+    }
+
+  @Test
+  @Throws(IOException::class)
+  fun testDeserialization(testInfo: TestInfo) {
+    val iut = deserialize(VersioningConfiguration::class.java, testInfo)
+    assertThat(iut.status).isEqualTo(Status.ENABLED)
+    assertThat(iut.mfaDelete).isEqualTo(MFADelete.ENABLED)
+  }
+}
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/service/BucketServiceTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/service/BucketServiceTest.kt
index d370b4c44..156dcad14 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/service/BucketServiceTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/service/BucketServiceTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@ package com.adobe.testing.s3mock.service
 
 import com.adobe.testing.s3mock.S3Exception
 import com.adobe.testing.s3mock.dto.S3Object
+import com.adobe.testing.s3mock.dto.VersioningConfiguration
+import com.adobe.testing.s3mock.dto.VersioningConfiguration.Status
+import com.adobe.testing.s3mock.store.BucketMetadata
 import com.adobe.testing.s3mock.store.MultipartStore
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy
@@ -28,6 +31,9 @@ import org.mockito.kotlin.whenever
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.mock.mockito.MockBean
+import software.amazon.awssdk.services.s3.model.ObjectOwnership.BUCKET_OWNER_ENFORCED
+import java.nio.file.Files
+import java.util.Date
 import java.util.UUID
 import java.util.stream.Collectors
 
@@ -72,7 +78,7 @@ internal class BucketServiceTest : ServiceTestBase() {
     whenever(bucketStore.lookupKeysInBucket(prefix, TEST_BUCKET_NAME)).thenReturn(listOf(id))
     val bucketMetadata = metadataFrom(TEST_BUCKET_NAME)
     whenever(bucketStore.getBucketMetadata(TEST_BUCKET_NAME)).thenReturn(bucketMetadata)
-    whenever(objectStore.getS3ObjectMetadata(bucketMetadata, id)).thenReturn(s3ObjectMetadata(id, key))
+    whenever(objectStore.getS3ObjectMetadata(bucketMetadata, id, null)).thenReturn(s3ObjectMetadata(id, key))
     val result = iut.getS3Objects(TEST_BUCKET_NAME, prefix)
     assertThat(result).hasSize(1)
     assertThat(result[0].key).isEqualTo(key)
@@ -190,7 +196,7 @@ internal class BucketServiceTest : ServiceTestBase() {
   @Test
   fun testVerifyBucketExists_success() {
     val bucketName = "bucket"
-    whenever(bucketStore.doesBucketExist(bucketName)).thenReturn(true)
+    whenever(bucketStore.getBucketMetadata(bucketName)).thenReturn(metadataFrom(TEST_BUCKET_NAME))
     iut.verifyBucketExists(bucketName)
   }
 
@@ -198,7 +204,7 @@ internal class BucketServiceTest : ServiceTestBase() {
   fun testVerifyBucketExists_failure() {
     val bucketName = "bucket"
     givenBucket(bucketName)
-    whenever(bucketStore.doesBucketExist(bucketName)).thenReturn(false)
+    whenever(bucketStore.getBucketMetadata(bucketName)).thenReturn(null)
     assertThatThrownBy { iut.verifyBucketExists(bucketName) }
       .isEqualTo(S3Exception.NO_SUCH_BUCKET)
   }
@@ -251,7 +257,7 @@ internal class BucketServiceTest : ServiceTestBase() {
   @Test
   fun testVerifyBucketIsEmpty_success() {
     val bucketName = "bucket"
-    whenever(bucketStore.isBucketEmpty(bucketName)).thenReturn(true)
+    whenever(bucketStore.getBucketMetadata(bucketName)).thenReturn(metadataFrom(TEST_BUCKET_NAME))
     iut.verifyBucketIsEmpty(bucketName)
   }
 
@@ -260,6 +266,21 @@ internal class BucketServiceTest : ServiceTestBase() {
     val bucketName = "bucket"
     givenBucket(bucketName)
     whenever(bucketStore.isBucketEmpty(bucketName)).thenReturn(false)
+    val bucketMetadata = BucketMetadata(
+      bucketName,
+      Date().toString(),
+      VersioningConfiguration(null, Status.ENABLED, null),
+      null,
+      null,
+      BUCKET_OWNER_ENFORCED,
+      Files.createTempDirectory(bucketName)
+    )
+
+    val key = "testKey"
+    val id = bucketMetadata.addKey(key)
+
+    whenever(bucketStore.getBucketMetadata(bucketName)).thenReturn(bucketMetadata)
+    whenever(objectStore.getS3ObjectMetadata(bucketMetadata, id, null)).thenReturn(s3ObjectMetadata(id, key))
     assertThatThrownBy { iut.verifyBucketIsEmpty(bucketName) }
       .isEqualTo(S3Exception.BUCKET_NOT_EMPTY)
   }
@@ -275,7 +296,7 @@ internal class BucketServiceTest : ServiceTestBase() {
     val keys = -1
     assertThatThrownBy {
       iut.verifyMaxKeys(keys)
-    }.isEqualTo(S3Exception.INVALID_REQUEST_MAXKEYS)
+    }.isEqualTo(S3Exception.INVALID_REQUEST_MAX_KEYS)
   }
 
   @Test
@@ -288,7 +309,7 @@ internal class BucketServiceTest : ServiceTestBase() {
   fun testVerifyEncodingType_failure() {
     val encodingType = "not-url"
     assertThatThrownBy { iut.verifyEncodingType(encodingType) }
-      .isEqualTo(S3Exception.INVALID_REQUEST_ENCODINGTYPE)
+      .isEqualTo(S3Exception.INVALID_REQUEST_ENCODING_TYPE)
   }
 
   internal class Param(val prefix: String?, val delimiter: String?) {
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/service/MultipartServiceTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/service/MultipartServiceTest.kt
index 8147432b2..812415c19 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/service/MultipartServiceTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/service/MultipartServiceTest.kt
@@ -158,7 +158,7 @@ internal class MultipartServiceTest : ServiceTestBase() {
     val uploadId = "uploadId"
     val bucketName = "bucketName"
     whenever(bucketStore.getBucketMetadata(bucketName))
-      .thenReturn(BucketMetadata(null, null, null, null, null, null))
+      .thenReturn(BucketMetadata(null, null,  null, null, null, null, null))
     whenever(
       multipartStore.getMultipartUpload(
         ArgumentMatchers.any(
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/service/ObjectServiceTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/service/ObjectServiceTest.kt
index 789b4beb0..c7b9120b9 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/service/ObjectServiceTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/service/ObjectServiceTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@ import com.adobe.testing.s3mock.util.DigestUtil
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy
 import org.junit.jupiter.api.Test
-import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.any
+import org.mockito.ArgumentMatchers.isNull
 import org.mockito.kotlin.whenever
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
@@ -45,7 +46,7 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.time.Instant
 import java.time.temporal.ChronoUnit
-import java.util.*
+import java.util.UUID
 
 @SpringBootTest(classes = [ServiceConfiguration::class], webEnvironment = SpringBootTest.WebEnvironment.NONE)
 @MockBean(classes = [BucketService::class, MultipartService::class, MultipartStore::class])
@@ -71,13 +72,7 @@ internal class ObjectServiceTest : ServiceTestBase() {
       )
     )
 
-    whenever(
-      objectStore.deleteObject(
-        ArgumentMatchers.any(BucketMetadata::class.java), ArgumentMatchers.any(
-          UUID::class.java
-        )
-      )
-    )
+    whenever(objectStore.deleteObject(any(BucketMetadata::class.java), any(UUID::class.java), isNull()))
       .thenReturn(true)
     whenever(bucketStore.removeFromBucket(key, bucketName)).thenReturn(true)
     whenever(bucketStore.removeFromBucket(key2, bucketName)).thenReturn(true)
@@ -86,7 +81,7 @@ internal class ObjectServiceTest : ServiceTestBase() {
   }
 
   private fun givenS3ObjectIdentifier(key: String?): S3ObjectIdentifier {
-    return S3ObjectIdentifier(key, null)
+    return S3ObjectIdentifier(key, null, null, null, null)
   }
 
   @Test
@@ -94,16 +89,10 @@ internal class ObjectServiceTest : ServiceTestBase() {
     val bucketName = "bucket"
     val key = "key"
     givenBucketWithContents(bucketName, "", listOf(givenS3Object(key)))
-    whenever(
-      objectStore.deleteObject(
-        ArgumentMatchers.any(BucketMetadata::class.java), ArgumentMatchers.any(
-          UUID::class.java
-        )
-      )
-    )
+    whenever(objectStore.deleteObject(any(BucketMetadata::class.java), any(UUID::class.java), isNull()))
       .thenReturn(true)
     whenever(bucketStore.removeFromBucket(key, bucketName)).thenReturn(true)
-    val deleted = iut.deleteObject(bucketName, key)
+    val deleted = iut.deleteObject(bucketName, key, null)
     assertThat(deleted).isTrue()
   }
 
@@ -118,7 +107,7 @@ internal class ObjectServiceTest : ServiceTestBase() {
   fun testVerifyRetention_failure() {
     val retention = Retention(Mode.COMPLIANCE, Instant.now().minus(1, ChronoUnit.MINUTES))
     assertThatThrownBy { iut.verifyRetention(retention) }
-      .isEqualTo(S3Exception.INVALID_REQUEST_RETAINDATE)
+      .isEqualTo(S3Exception.INVALID_REQUEST_RETAIN_DATE)
   }
 
   @Test
@@ -264,7 +253,7 @@ internal class ObjectServiceTest : ServiceTestBase() {
     val prefix = ""
     val key = "key"
     givenBucketWithContents(bucketName, prefix, listOf(givenS3Object(key)))
-    assertThatThrownBy { iut.verifyObjectLockConfiguration(bucketName, key) }
+    assertThatThrownBy { iut.verifyObjectLockConfiguration(bucketName, key, null) }
       .isEqualTo(S3Exception.NOT_FOUND_OBJECT_LOCK)
   }
 
@@ -274,7 +263,7 @@ internal class ObjectServiceTest : ServiceTestBase() {
     val prefix = ""
     val key = "key"
     givenBucketWithContents(bucketName, prefix, listOf(givenS3Object(key)))
-    val s3ObjectMetadata = iut.verifyObjectExists(bucketName, key)
+    val s3ObjectMetadata = iut.verifyObjectExists(bucketName, key, null)
     assertThat(s3ObjectMetadata.key).isEqualTo(key)
   }
 
@@ -283,7 +272,7 @@ internal class ObjectServiceTest : ServiceTestBase() {
     val bucketName = "bucket"
     val key = "key"
     givenBucket(bucketName)
-    assertThatThrownBy { iut.verifyObjectExists(bucketName, key) }
+    assertThatThrownBy { iut.verifyObjectExists(bucketName, key, null) }
       .isEqualTo(S3Exception.NO_SUCH_KEY)
   }
 
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/service/ServiceTestBase.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/service/ServiceTestBase.kt
index 35104d391..eb8b363c5 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/service/ServiceTestBase.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/service/ServiceTestBase.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,7 +29,8 @@ import org.springframework.boot.test.mock.mockito.MockBean
 import software.amazon.awssdk.services.s3.model.ObjectOwnership.BUCKET_OWNER_ENFORCED
 import java.nio.file.Files
 import java.time.Instant
-import java.util.*
+import java.util.Date
+import java.util.UUID
 
 internal abstract class ServiceTestBase {
   @MockBean
@@ -52,7 +53,7 @@ internal abstract class ServiceTestBase {
     for (s3Object in s3Objects) {
       val id = bucketMetadata.addKey(s3Object.key)
       ids.add(id)
-      whenever(objectStore.getS3ObjectMetadata(bucketMetadata, id))
+      whenever(objectStore.getS3ObjectMetadata(bucketMetadata, id, null))
         .thenReturn(s3ObjectMetadata(id, s3Object.key))
     }
     whenever(bucketStore.lookupKeysInBucket(prefix, name)).thenReturn(ids)
@@ -65,7 +66,7 @@ internal abstract class ServiceTestBase {
     for (s3Object in s3Objects) {
       val id = bucketMetadata.addKey(s3Object.key)
       ids.add(id)
-      whenever(objectStore.getS3ObjectMetadata(bucketMetadata, id))
+      whenever(objectStore.getS3ObjectMetadata(bucketMetadata, id, null))
         .thenReturn(s3ObjectMetadata(id, s3Object.key))
     }
     whenever(bucketStore.lookupKeysInBucket(prefix, name)).thenReturn(ids)
@@ -119,7 +120,10 @@ internal abstract class ServiceTestBase {
       null,
       null,
       null,
-      StorageClass.STANDARD
+      StorageClass.STANDARD,
+      null,
+      null,
+      false
     )
   }
 
@@ -129,6 +133,7 @@ internal abstract class ServiceTestBase {
       Date().toString(),
       null,
       null,
+      null,
       BUCKET_OWNER_ENFORCED,
       Files.createTempDirectory(bucketName)
     )
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/store/MultipartStoreTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/store/MultipartStoreTest.kt
index 194478174..43f803c5d 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/store/MultipartStoreTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/store/MultipartStoreTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -230,7 +230,7 @@ internal class MultipartStoreTest : StoreTestBase() {
       getParts(2), emptyMap(), multipartUploadInfo, "location"
     )
 
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it.size).isEqualTo("10")
       assertThat(it.contentType).isEqualTo(MediaType.APPLICATION_OCTET_STREAM.toString())
     }
@@ -494,7 +494,7 @@ internal class MultipartStoreTest : StoreTestBase() {
     val range = HttpRange.createByteRange(0, contentBytes.size.toLong())
     multipartStore.copyPart(
       metadataFrom(TEST_BUCKET_NAME), sourceId, range, partNumber,
-      metadataFrom(TEST_BUCKET_NAME), destinationId, uploadId, emptyMap()
+      metadataFrom(TEST_BUCKET_NAME), destinationId, uploadId, emptyMap(), null
     )
     assertThat(
       Paths.get(
@@ -537,7 +537,7 @@ internal class MultipartStoreTest : StoreTestBase() {
 
     multipartStore.copyPart(
       bucketMetadata, sourceId, null, partNumber,
-      bucketMetadata, destinationId, uploadId, emptyMap()
+      bucketMetadata, destinationId, uploadId, emptyMap(), null
     )
 
     assertThat(
@@ -563,7 +563,7 @@ internal class MultipartStoreTest : StoreTestBase() {
       multipartStore.copyPart(
         bucketMetadata, id, range, "1",
         bucketMetadata, destinationId, uploadId,
-        encryptionHeaders
+        encryptionHeaders, null
       )
     }.isInstanceOf(IllegalStateException::class.java)
       .hasMessageStartingWith("Multipart Request was not prepared.")
@@ -596,7 +596,7 @@ internal class MultipartStoreTest : StoreTestBase() {
       metadataFrom(TEST_BUCKET_NAME), filename, id, uploadId,
       getParts(10), emptyMap(), multipartUploadInfo, "location"
     )
-    val s = objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id)
+    val s = objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null)
       .dataPath
       .toFile()
       .readLines()
@@ -617,11 +617,11 @@ internal class MultipartStoreTest : StoreTestBase() {
   fun cleanupStores() {
     arrayListOf<UUID>().apply {
       for (id in idCache) {
-        objectStore.deleteObject(metadataFrom(TEST_BUCKET_NAME), id)
-        objectStore.deleteObject(metadataFrom("bucket1"), id)
-        objectStore.deleteObject(metadataFrom("bucket2"), id)
-        objectStore.deleteObject(metadataFrom("destinationBucket"), id)
-        objectStore.deleteObject(metadataFrom("sourceBucket"), id)
+        objectStore.deleteObject(metadataFrom(TEST_BUCKET_NAME), id, null)
+        objectStore.deleteObject(metadataFrom("bucket1"), id, null)
+        objectStore.deleteObject(metadataFrom("bucket2"), id, null)
+        objectStore.deleteObject(metadataFrom("destinationBucket"), id, null)
+        objectStore.deleteObject(metadataFrom("sourceBucket"), id, null)
         this.add(id)
       }
     }.also {
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/store/ObjectStoreTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/store/ObjectStoreTest.kt
index f35d1225c..c3d62ba16 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/store/ObjectStoreTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/store/ObjectStoreTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -100,7 +100,7 @@ internal class ObjectStoreTest : StoreTestBase() {
         StorageClass.DEEP_ARCHIVE
       )
 
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it.key).isEqualTo(name)
       assertThat(it.contentType).isEqualTo(TEXT_PLAIN)
       assertThat(it.storeHeaders).containsEntry(HttpHeaders.CONTENT_ENCODING, ENCODING_GZIP)
@@ -129,7 +129,7 @@ internal class ObjectStoreTest : StoreTestBase() {
         StorageClass.STANDARD
       )
 
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it.key).isEqualTo(name)
       assertThat(it.contentType).isEqualTo(TEXT_PLAIN)
       assertThat(it.storeHeaders).containsEntry(HttpHeaders.CONTENT_ENCODING, ENCODING_GZIP)
@@ -155,7 +155,7 @@ internal class ObjectStoreTest : StoreTestBase() {
       StorageClass.STANDARD
     )
 
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it.tags[0].key).isEqualTo("foo")
       assertThat(it.tags[0].value).isEqualTo("bar")
     }
@@ -174,8 +174,8 @@ internal class ObjectStoreTest : StoreTestBase() {
       StorageClass.STANDARD
     )
 
-    objectStore.storeObjectTags(metadataFrom(TEST_BUCKET_NAME), id, listOf(Tag("foo", "bar")))
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.storeObjectTags(metadataFrom(TEST_BUCKET_NAME), id, null, listOf(Tag("foo", "bar")))
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it.tags[0].key).isEqualTo("foo")
       assertThat(it.tags[0].value).isEqualTo("bar")
     }
@@ -197,9 +197,9 @@ internal class ObjectStoreTest : StoreTestBase() {
     //TODO: resolution of time seems to matter here. Is this a serialization problem?
     val now = Instant.now().truncatedTo(ChronoUnit.MILLIS)
     val retention = Retention(Mode.COMPLIANCE, now)
-    objectStore.storeRetention(metadataFrom(TEST_BUCKET_NAME), id, retention)
+    objectStore.storeRetention(metadataFrom(TEST_BUCKET_NAME), id, null, retention)
 
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it.retention).isNotNull()
       assertThat(it.retention.mode).isEqualTo(Mode.COMPLIANCE)
       assertThat(it.retention.retainUntilDate).isEqualTo(now)
@@ -221,8 +221,8 @@ internal class ObjectStoreTest : StoreTestBase() {
     )
 
     val legalHold = LegalHold(LegalHold.Status.ON)
-    objectStore.storeLegalHold(metadataFrom(TEST_BUCKET_NAME), id, legalHold)
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.storeLegalHold(metadataFrom(TEST_BUCKET_NAME), id, null, legalHold)
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it.legalHold).isNotNull()
       assertThat(it.legalHold.status).isEqualTo(LegalHold.Status.ON)
     }
@@ -248,12 +248,12 @@ internal class ObjectStoreTest : StoreTestBase() {
     )
 
     objectStore.copyS3Object(
-      metadataFrom(sourceBucketName), sourceId,
+      metadataFrom(sourceBucketName), sourceId, null,
       metadataFrom(destinationBucketName),
       destinationId, destinationObjectName, emptyMap(), emptyMap(), NO_USER_METADATA, StorageClass.STANDARD_IA
     )
 
-    objectStore.getS3ObjectMetadata(metadataFrom(destinationBucketName), destinationId).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(destinationBucketName), destinationId, null).also {
       assertThat(it.encryptionHeaders).isEmpty()
       assertThat(sourceFile).hasSameBinaryContentAs(it.dataPath.toFile())
       assertThat(it.storageClass).isEqualTo(StorageClass.STANDARD_IA)
@@ -284,6 +284,7 @@ internal class ObjectStoreTest : StoreTestBase() {
     objectStore.copyS3Object(
       metadataFrom(sourceBucketName),
       sourceId,
+      null,
       metadataFrom(destinationBucketName),
       destinationId,
       destinationObjectName,
@@ -292,7 +293,7 @@ internal class ObjectStoreTest : StoreTestBase() {
       NO_USER_METADATA,
       StorageClass.STANDARD_IA
     )
-    objectStore.getS3ObjectMetadata(metadataFrom(destinationBucketName), destinationId).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(destinationBucketName), destinationId, null).also {
       assertThat(it.encryptionHeaders).isEqualTo(encryptionHeaders())
       assertThat(it.size).isEqualTo(sourceFile.length().toString())
       assertThat(it.etag).isEqualTo("\"${DigestUtil.hexDigest(TEST_ENC_KEY, Files.newInputStream(path))}\"")
@@ -313,11 +314,11 @@ internal class ObjectStoreTest : StoreTestBase() {
         NO_USER_METADATA, emptyMap(), null, emptyList(), null, null, Owner.DEFAULT_OWNER,
         StorageClass.STANDARD
       )
-    objectStore.deleteObject(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.deleteObject(metadataFrom(TEST_BUCKET_NAME), id, null).also {
 
       assertThat(it).isTrue()
     }
-    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id).also {
+    objectStore.getS3ObjectMetadata(metadataFrom(TEST_BUCKET_NAME), id, null).also {
       assertThat(it).isNull()
     }
 
@@ -346,9 +347,9 @@ internal class ObjectStoreTest : StoreTestBase() {
         StorageClass.STANDARD
       )
     val bucket = metadataFrom(TEST_BUCKET_NAME)
-    objectStore.storeAcl(bucket, id, policy)
+    objectStore.storeAcl(bucket, id, null, policy)
 
-    val actual = objectStore.readAcl(bucket, id)
+    val actual = objectStore.readAcl(bucket, id, null)
 
     assertThat(actual).isEqualTo(policy)
   }
@@ -366,11 +367,11 @@ internal class ObjectStoreTest : StoreTestBase() {
   fun cleanupStores() {
     arrayListOf<UUID>().apply {
       for (id in idCache) {
-        objectStore.deleteObject(metadataFrom(TEST_BUCKET_NAME), id)
-        objectStore.deleteObject(metadataFrom("bucket1"), id)
-        objectStore.deleteObject(metadataFrom("bucket2"), id)
-        objectStore.deleteObject(metadataFrom("destinationBucket"), id)
-        objectStore.deleteObject(metadataFrom("sourceBucket"), id)
+        objectStore.deleteObject(metadataFrom(TEST_BUCKET_NAME), id, null)
+        objectStore.deleteObject(metadataFrom("bucket1"), id, null)
+        objectStore.deleteObject(metadataFrom("bucket2"), id, null)
+        objectStore.deleteObject(metadataFrom("destinationBucket"), id, null)
+        objectStore.deleteObject(metadataFrom("sourceBucket"), id, null)
         this.add(id)
       }
     }.also {
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/store/S3ObjectVersionsTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/store/S3ObjectVersionsTest.kt
new file mode 100644
index 000000000..d2d79a9e8
--- /dev/null
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/store/S3ObjectVersionsTest.kt
@@ -0,0 +1,55 @@
+/*
+ *  Copyright 2017-2025 Adobe.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.adobe.testing.s3mock.store
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+import java.util.UUID
+
+internal class S3ObjectVersionsTest {
+  @Test
+  fun testVersion_isNull() {
+    val iut = S3ObjectVersions(UUID.randomUUID())
+    assertThat(iut.latestVersion).isNull()
+
+    val version = iut.createVersion()
+    assertThat(version).isNotBlank()
+    assertThat(iut.latestVersion).isEqualTo(version)
+  }
+
+  @Test
+  fun testVersion_createVersion() {
+    val iut = S3ObjectVersions(UUID.randomUUID())
+
+    val version = iut.createVersion()
+    assertThat(version).isNotBlank()
+    assertThat(iut.latestVersion).isEqualTo(version)
+  }
+
+  @Test
+  fun testVersion_createVersionsDeleteVersion() {
+    val iut = S3ObjectVersions(UUID.randomUUID())
+
+    val version1 = iut.createVersion()
+    assertThat(version1).isNotBlank()
+    val version2 = iut.createVersion()
+    assertThat(version2).isNotBlank()
+    assertThat(iut.latestVersion).isEqualTo(version2)
+
+    iut.deleteVersion(version2)
+    assertThat(iut.latestVersion).isEqualTo(version1)
+  }
+}
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreConfigurationTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreConfigurationTest.kt
index bd938a9f5..0c966338a 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreConfigurationTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreConfigurationTest.kt
@@ -61,7 +61,7 @@ internal class StoreConfigurationTest {
     val bucketMetadata =
       BucketMetadata(
         existingBucketName, Instant.now().toString(),
-        null, null, ObjectOwnership.BUCKET_OWNER_ENFORCED, existingBucket
+        null, null, null, ObjectOwnership.BUCKET_OWNER_ENFORCED, existingBucket
       )
     val metaFile = Paths.get(existingBucket.toString(), BUCKET_META_FILE)
     OBJECT_MAPPER.writeValue(metaFile.toFile(), bucketMetadata)
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreTestBase.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreTestBase.kt
index 1e32619a4..9df530933 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreTestBase.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoreTestBase.kt
@@ -37,6 +37,7 @@ internal abstract class StoreTestBase {
       Date().toString(),
       null,
       null,
+      null,
       ObjectOwnership.BUCKET_OWNER_ENFORCED,
       Paths.get(rootFolder.toString(), bucketName),
       mapOf()
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoresWithExistingFileRootTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoresWithExistingFileRootTest.kt
index cedda2dc6..d49d3ebd5 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoresWithExistingFileRootTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/store/StoresWithExistingFileRootTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -77,15 +77,15 @@ internal class StoresWithExistingFileRootTest : StoreTestBase() {
         StorageClass.STANDARD
       )
 
-    assertThatThrownBy { testObjectStore.getS3ObjectMetadata(bucketMetadata, id) }
+    assertThatThrownBy { testObjectStore.getS3ObjectMetadata(bucketMetadata, id, null) }
       .isInstanceOf(
         NullPointerException::class.java
       )
 
-    objectStore.getS3ObjectMetadata(bucketMetadata, id).also {
+    objectStore.getS3ObjectMetadata(bucketMetadata, id, null).also {
       testObjectStore.loadObjects(bucketMetadata, listOf(it.id))
 
-      testObjectStore.getS3ObjectMetadata(bucketMetadata, id).also {
+      testObjectStore.getS3ObjectMetadata(bucketMetadata, id, null).also {
         assertThat(it.modificationDate).isEqualTo(it.modificationDate)
         assertThat(it.etag).isEqualTo(it.etag)
       }
diff --git a/server/src/test/kotlin/com/adobe/testing/s3mock/util/HeaderUtilTest.kt b/server/src/test/kotlin/com/adobe/testing/s3mock/util/HeaderUtilTest.kt
index 38284b403..82aed864b 100644
--- a/server/src/test/kotlin/com/adobe/testing/s3mock/util/HeaderUtilTest.kt
+++ b/server/src/test/kotlin/com/adobe/testing/s3mock/util/HeaderUtilTest.kt
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2024 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -77,7 +77,10 @@ internal class HeaderUtilTest {
       null,
       null,
       null,
-      StorageClass.STANDARD
+      StorageClass.STANDARD,
+      null,
+      null,
+      false
     )
   }
 
diff --git a/server/src/test/resources/com/adobe/testing/s3mock/dto/VersioningConfigurationTest_testDeserialization.xml b/server/src/test/resources/com/adobe/testing/s3mock/dto/VersioningConfigurationTest_testDeserialization.xml
new file mode 100644
index 000000000..70aac4f01
--- /dev/null
+++ b/server/src/test/resources/com/adobe/testing/s3mock/dto/VersioningConfigurationTest_testDeserialization.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+     Copyright 2017-2024 Adobe.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+             http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+-->
+<VersioningConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+  <Status>Enabled</Status>
+  <MfaDelete>Enabled</MfaDelete>
+</VersioningConfiguration>
diff --git a/server/src/test/resources/com/adobe/testing/s3mock/dto/VersioningConfigurationTest_testSerialization.xml b/server/src/test/resources/com/adobe/testing/s3mock/dto/VersioningConfigurationTest_testSerialization.xml
new file mode 100644
index 000000000..f0e725408
--- /dev/null
+++ b/server/src/test/resources/com/adobe/testing/s3mock/dto/VersioningConfigurationTest_testSerialization.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+     Copyright 2017-2024 Adobe.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+             http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+-->
+<VersioningConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+  <Status>Suspended</Status>
+</VersioningConfiguration>
diff --git a/testsupport/common/pom.xml b/testsupport/common/pom.xml
index 8034ffca7..b7b6d1e5d 100644
--- a/testsupport/common/pom.xml
+++ b/testsupport/common/pom.xml
@@ -31,13 +31,21 @@
   <name>S3Mock - Testsupport - Common</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.amazonaws</groupId>
+      <artifactId>aws-java-sdk-s3</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.adobe.testing</groupId>
       <artifactId>s3mock</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-java-sdk-s3</artifactId>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>s3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>url-connection-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
@@ -72,13 +80,5 @@
       <artifactId>aws-xml-protocol</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>url-connection-client</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/testsupport/common/src/main/java/com/adobe/testing/s3mock/testsupport/common/S3MockStarter.java b/testsupport/common/src/main/java/com/adobe/testing/s3mock/testsupport/common/S3MockStarter.java
index 5c589ff23..772ed66cb 100644
--- a/testsupport/common/src/main/java/com/adobe/testing/s3mock/testsupport/common/S3MockStarter.java
+++ b/testsupport/common/src/main/java/com/adobe/testing/s3mock/testsupport/common/S3MockStarter.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2017-2023 Adobe.
+ *  Copyright 2017-2025 Adobe.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -93,7 +93,9 @@ public S3Client createS3ClientV2() {
    * server using HTTPS.
    *
    * @return The {@link AmazonS3} instance.
+   * @deprecated The AWS SDK for Java 1.x entered maintenance mode starting July 31, 2024 and will reach end of support on December 31, 2025. For more information, see https://aws.amazon.com/blogs/developer/the-aws-sdk-for-java-1-x-is-in-maintenance-mode-effective-july-31-2024/
    */
+  @Deprecated(since = "4.0.0", forRemoval = true)
   public AmazonS3 createS3Client() {
     return createS3Client("us-east-1");
   }
@@ -105,7 +107,9 @@ public AmazonS3 createS3Client() {
    * @param region Region to define regional endpoint.
    *
    * @return The {@link AmazonS3} instance.
+   * @deprecated The AWS SDK for Java 1.x entered maintenance mode starting July 31, 2024 and will reach end of support on December 31, 2025. For more information, see https://aws.amazon.com/blogs/developer/the-aws-sdk-for-java-1-x-is-in-maintenance-mode-effective-july-31-2024/
    */
+  @Deprecated(since = "4.0.0", forRemoval = true)
   public AmazonS3 createS3Client(final String region) {
     var credentials = new BasicAWSCredentials("foo", "bar");
 
diff --git a/testsupport/junit4/pom.xml b/testsupport/junit4/pom.xml
index 72e9e338d..2dcd57748 100644
--- a/testsupport/junit4/pom.xml
+++ b/testsupport/junit4/pom.xml
@@ -48,6 +48,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
diff --git a/testsupport/junit5/pom.xml b/testsupport/junit5/pom.xml
index 620c4e35f..72f2a1318 100644
--- a/testsupport/junit5/pom.xml
+++ b/testsupport/junit5/pom.xml
@@ -36,15 +36,15 @@
       <artifactId>s3mock-testsupport-common</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/testsupport/testcontainers/pom.xml b/testsupport/testcontainers/pom.xml
index 714b95961..b28ded361 100644
--- a/testsupport/testcontainers/pom.xml
+++ b/testsupport/testcontainers/pom.xml
@@ -31,11 +31,6 @@
   <name>S3Mock - Testsupport - Testcontainers</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.adobe.testing</groupId>
-      <artifactId>s3mock</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <!-- only enforcing build order - all transitive dependencies are removed -->
       <groupId>com.adobe.testing</groupId>
@@ -48,6 +43,15 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.adobe.testing</groupId>
+      <artifactId>s3mock</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -63,10 +67,6 @@
       <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
-    </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>aws-query-protocol</artifactId>
diff --git a/testsupport/testng/pom.xml b/testsupport/testng/pom.xml
index d4f6e38ba..31404bd02 100644
--- a/testsupport/testng/pom.xml
+++ b/testsupport/testng/pom.xml
@@ -35,15 +35,15 @@
       <groupId>com.adobe.testing</groupId>
       <artifactId>s3mock-testsupport-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-    </dependency>
   </dependencies>
 
   <build>