diff --git a/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs b/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs
index 01fd9a7f9..01ef7d45d 100644
--- a/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs
+++ b/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs
@@ -19,11 +19,11 @@ namespace Squidex.Infrastructure.Assets
     public sealed class AmazonS3AssetStore : DisposableObjectBase, IAssetStore, IInitializable
     {
         private const int BufferSize = 81920;
-        private readonly MyAmazonS3Options options;
+        private readonly AmazonS3Options options;
         private TransferUtility transferUtility;
         private IAmazonS3 s3Client;
 
-        public AmazonS3AssetStore(MyAmazonS3Options options)
+        public AmazonS3AssetStore(AmazonS3Options options)
         {
             Guard.NotNullOrEmpty(options.Bucket);
             Guard.NotNullOrEmpty(options.AccessKey);
diff --git a/backend/src/Squidex.Infrastructure.Amazon/MyAmazonS3Options.cs b/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3Options.cs
similarity index 89%
rename from backend/src/Squidex.Infrastructure.Amazon/MyAmazonS3Options.cs
rename to backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3Options.cs
index 2bcf824f6..1a18ac766 100644
--- a/backend/src/Squidex.Infrastructure.Amazon/MyAmazonS3Options.cs
+++ b/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3Options.cs
@@ -5,9 +5,9 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
-namespace Squidex.Infrastructure
+namespace Squidex.Infrastructure.Assets
 {
-    public class MyAmazonS3Options
+    public sealed class AmazonS3Options
     {
         public string? ServiceUrl { get; set; }
 
diff --git a/backend/src/Squidex/Config/Domain/AssetServices.cs b/backend/src/Squidex/Config/Domain/AssetServices.cs
index 1cd6f6338..1a19f5759 100644
--- a/backend/src/Squidex/Config/Domain/AssetServices.cs
+++ b/backend/src/Squidex/Config/Domain/AssetServices.cs
@@ -88,7 +88,7 @@ namespace Squidex.Config.Domain
                 },
                 ["AmazonS3"] = () =>
                 {
-                    var amazonS3Options = config.GetOptionalValue<MyAmazonS3Options>("assetStore:amazonS3");
+                    var amazonS3Options = config.GetOptionalValue<AmazonS3Options>("assetStore:amazonS3");
 
                     services.AddSingletonAs(c => new AmazonS3AssetStore(amazonS3Options))
                         .As<IAssetStore>();
diff --git a/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreFixture.cs b/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreFixture.cs
index fa6decb81..d5aca5065 100644
--- a/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreFixture.cs
+++ b/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreFixture.cs
@@ -13,15 +13,15 @@ namespace Squidex.Infrastructure.Assets
 
         public AmazonS3AssetStoreFixture()
         {
-            AssetStore = new AmazonS3AssetStore(new MyAmazonS3Options
+            AssetStore = new AmazonS3AssetStore(new AmazonS3Options
             {
-                ServiceUrl = null,
-                RegionName = "eu-central-1",
+                AccessKey = "secret",
                 Bucket = "squidex-test",
                 BucketFolder = "squidex-assets",
-                AccessKey = "secret",
+                ForcePathStyle = false,
+                RegionName = "eu-central-1",
                 SecretKey = "secret",
-                ForcePathStyle = false
+                ServiceUrl = null
             });
             AssetStore.InitializeAsync().Wait();
         }
diff --git a/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreTests.cs b/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreTests.cs
index 0b81f8df8..40f6f045b 100644
--- a/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreTests.cs
+++ b/backend/tests/Squidex.Infrastructure.Tests/Assets/AmazonS3AssetStoreTests.cs
@@ -28,7 +28,7 @@ namespace Squidex.Infrastructure.Assets
         [Fact]
         public async Task Should_throw_exception_for_invalid_config()
         {
-            var sut = new AmazonS3AssetStore(new MyAmazonS3Options
+            var sut = new AmazonS3AssetStore(new AmazonS3Options
             {
                 ServiceUrl = null,
                 RegionName = "invalid",