diff --git a/src/core/Deal.Infrastructure/Integrations/Services/AiClassifierFactory.cs b/src/core/Deal.Infrastructure/Integrations/Services/AiClassifierFactory.cs
index fc0f698..6f8dce4 100644
--- a/src/core/Deal.Infrastructure/Integrations/Services/AiClassifierFactory.cs
+++ b/src/core/Deal.Infrastructure/Integrations/Services/AiClassifierFactory.cs
@@ -45,6 +45,6 @@ public sealed class AiClassifierFactory : IAiClassifierFactory
     }
 
     /// <inheritdoc />
-    public IAiClassifier Create() =>
+    IAiClassifier IAiClassifierFactory.Create() =>
         new BudgetedAiClassifier(_paidClassifier, _localClassifier, _tenantLimits, _tenantContext, _logger);
 }
diff --git a/src/core/Deal.Infrastructure/Integrations/Services/AiToolsFactory.cs b/src/core/Deal.Infrastructure/Integrations/Services/AiToolsFactory.cs
index 3815c42..538c5e9 100644
--- a/src/core/Deal.Infrastructure/Integrations/Services/AiToolsFactory.cs
+++ b/src/core/Deal.Infrastructure/Integrations/Services/AiToolsFactory.cs
@@ -40,5 +40,5 @@ public sealed class AiToolsFactory : IAiToolsFactory
     }
 
     /// <inheritdoc />
-    public IAiTools Create() => new BudgetedAiTools(_paidTools, _tenantLimits, _tenantContext, _logger);
+    IAiTools IAiToolsFactory.Create() => new BudgetedAiTools(_paidTools, _tenantLimits, _tenantContext, _logger);
 }
diff --git a/src/core/Deal.Infrastructure/Integrations/Storage/Services/FileStorageFactory.cs b/src/core/Deal.Infrastructure/Integrations/Storage/Services/FileStorageFactory.cs
index 42f73cd..14d4617 100644
--- a/src/core/Deal.Infrastructure/Integrations/Storage/Services/FileStorageFactory.cs
+++ b/src/core/Deal.Infrastructure/Integrations/Storage/Services/FileStorageFactory.cs
@@ -35,7 +35,7 @@ public sealed class FileStorageFactory : IFileStorageFactory
     }
 
     /// <inheritdoc />
-    public IFileStorage Create() =>
+    IFileStorage IFileStorageFactory.Create() =>
         _options.Minio.IsConfigured()
             ? new MinioFileStorage(_options.Minio, _minioLogger)
             : new LocalFileStorage(_localRoot.Path);
diff --git a/src/core/Deal.Infrastructure/Persistence/Services/TenantLimitStoreFactory.cs b/src/core/Deal.Infrastructure/Persistence/Services/TenantLimitStoreFactory.cs
index f6a9cd3..f8f2e79 100644
--- a/src/core/Deal.Infrastructure/Persistence/Services/TenantLimitStoreFactory.cs
+++ b/src/core/Deal.Infrastructure/Persistence/Services/TenantLimitStoreFactory.cs
@@ -27,5 +27,5 @@ public sealed class TenantLimitStoreFactory : ITenantLimitStoreFactory
     }
 
     /// <inheritdoc />
-    public ITenantLimitStore Create() => new TenantLimitStore(_dbContext, _defaults);
+    ITenantLimitStore ITenantLimitStoreFactory.Create() => new TenantLimitStore(_dbContext, _defaults);
 }
diff --git a/src/core/Deal.Infrastructure/Security/Services/SecretCipherFactory.cs b/src/core/Deal.Infrastructure/Security/Services/SecretCipherFactory.cs
index b6aeaad..8e92292 100644
--- a/src/core/Deal.Infrastructure/Security/Services/SecretCipherFactory.cs
+++ b/src/core/Deal.Infrastructure/Security/Services/SecretCipherFactory.cs
@@ -21,5 +21,5 @@ public sealed class SecretCipherFactory : ISecretCipherFactory
     }
 
     /// <inheritdoc />
-    public ISecretCipher Create() => new AesGcmSecretCipher(_keyProvider.GetKey());
+    ISecretCipher ISecretCipherFactory.Create() => new AesGcmSecretCipher(_keyProvider.GetKey());
 }
diff --git a/src/core/tests/Deal.Tests.Unit/Support/FileStorageFactoryTests.cs b/src/core/tests/Deal.Tests.Unit/Support/FileStorageFactoryTests.cs
index 094310b..3f7068a 100644
--- a/src/core/tests/Deal.Tests.Unit/Support/FileStorageFactoryTests.cs
+++ b/src/core/tests/Deal.Tests.Unit/Support/FileStorageFactoryTests.cs
@@ -1,4 +1,5 @@
 using Deal.Contracts.Integrations.Abstractions;
+using Deal.Infrastructure.Integrations.Storage.Abstractions;
 using Deal.Infrastructure.Integrations.Storage.Options;
 using Deal.Infrastructure.Integrations.Storage.Services;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -14,7 +15,7 @@ public sealed class FileStorageFactoryTests
     [Fact]
     public void Create_MinioNotConfigured_ReturnsLocalFileStorage()
     {
-        var factory = new FileStorageFactory(
+        IFileStorageFactory factory = new FileStorageFactory(
             new StorageOptions(),
             new LocalStorageRoot("/tmp/deal-attachments"),
             NullLogger<MinioFileStorage>.Instance);
@@ -37,7 +38,7 @@ public sealed class FileStorageFactoryTests
                 SecretKey = "deal-secret",
             },
         };
-        var factory = new FileStorageFactory(
+        IFileStorageFactory factory = new FileStorageFactory(
             options,
             new LocalStorageRoot("/tmp/deal-attachments"),
             NullLogger<MinioFileStorage>.Instance);