diff --git a/back/src/Kyoo.Core/CoreModule.cs b/back/src/Kyoo.Core/CoreModule.cs
index abf7e5df..a8d61b96 100644
--- a/back/src/Kyoo.Core/CoreModule.cs
+++ b/back/src/Kyoo.Core/CoreModule.cs
@@ -86,7 +86,9 @@ public static class CoreModule
 		}
 
 		// Configuration (credentials, endpoint, etc.) are done via standard AWS env vars
-		builder.Services.AddScoped<IAmazonS3, AmazonS3Client>();
+		// See https://docs.aws.amazon.com/sdk-for-net/v3/developer-guide/net-dg-config-netcore.html
+		builder.Services.AddDefaultAWSOptions(builder.Configuration.GetAWSOptions());
+		builder.Services.AddAWSService<IAmazonS3>();
 		builder.Services.AddScoped<IStorage, S3Storage>();
 	}
 }
diff --git a/back/src/Kyoo.Core/Kyoo.Core.csproj b/back/src/Kyoo.Core/Kyoo.Core.csproj
index 74531deb..993e1b5d 100644
--- a/back/src/Kyoo.Core/Kyoo.Core.csproj
+++ b/back/src/Kyoo.Core/Kyoo.Core.csproj
@@ -11,6 +11,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="AspNetCore.Proxy" Version="4.5.0" />
+		<PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.400" />
 		<PackageReference Include="AWSSDK.S3" Version="3.7.416.15" />
 		<PackageReference Include="Blurhash.SkiaSharp" Version="2.0.0" />
 		<PackageReference Include="Dapper" Version="2.1.44" />