diff --git a/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs b/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs
index 2cb0921..96bab09 100644
--- a/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs
+++ b/DigitalData.Core.Infrastructure.AutoMapper/DependencyInjection.cs
@@ -1,5 +1,4 @@
-using AutoMapper;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace DigitalData.Core.Infrastructure.AutoMapper;
 
@@ -7,22 +6,21 @@ public static class DependencyInjection
 {
     public static EntityConfigurationOptions<TEntity> UseAutoMapper<TEntity>(this EntityConfigurationOptions<TEntity> options, params Type[] typeOfDtos)
     {
-        IMapper? customRootMapper = null;
-
-        if (typeOfDtos.Length != 0)
+        options.AddCustomMapper<EntityAutoMapper<TEntity>>(services =>
         {
-            MapperConfigurationExpression AutoMapperConfiguration = new();
-
-            foreach (var typeOfDto in typeOfDtos)
+            if (typeOfDtos.Length != 0)
             {
-                AutoMapperConfiguration.CreateMap(typeof(TEntity), typeOfDto);
-                AutoMapperConfiguration.CreateMap(typeOfDto, typeof(TEntity));
+                services.AddAutoMapper(cnf =>
+                {
+                    foreach (var typeOfDto in typeOfDtos)
+                    {
+                        cnf.CreateMap(typeof(TEntity), typeOfDto);
+                        cnf.CreateMap(typeOfDto, typeof(TEntity));
+                    }
+                });
+
             }
-
-            customRootMapper = new MapperConfiguration(AutoMapperConfiguration).CreateMapper();
-        }
-
-        options.AddCustomMapper(provider => new EntityAutoMapper<TEntity>(customRootMapper ?? provider.GetRequiredService<IMapper>()));
+        });
         return options;
     }
 }
diff --git a/DigitalData.Core.Infrastructure/EntityConfigurationOptions.cs b/DigitalData.Core.Infrastructure/EntityConfigurationOptions.cs
index 852907d..c3ab1bb 100644
--- a/DigitalData.Core.Infrastructure/EntityConfigurationOptions.cs
+++ b/DigitalData.Core.Infrastructure/EntityConfigurationOptions.cs
@@ -12,9 +12,16 @@ public class EntityConfigurationOptions<TEntity>
         _services = services;
     }
 
-    public EntityConfigurationOptions<TEntity> AddCustomMapper(Func<IServiceProvider, IEntityMapper<TEntity>> factory)
+    public EntityConfigurationOptions<TEntity> AddCustomMapper<TEntityMapper>(Action<IServiceCollection> configure, Func<IServiceProvider, TEntityMapper>? factory = null)
+        where TEntityMapper : class, IEntityMapper<TEntity>
     {
-        _services.AddSingleton(factory);
+        configure(_services);
+
+        if (factory is null)
+            _services.AddSingleton<IEntityMapper<TEntity>, TEntityMapper>();
+        else
+            _services.AddSingleton(factory);
+        
         return this;
     }
 }