diff --git a/EnvelopeGenerator.Application/Dto/MappingProfile.cs b/EnvelopeGenerator.Application/Dto/MappingProfile.cs
index ed9fcdd5..e8dddc1b 100644
--- a/EnvelopeGenerator.Application/Dto/MappingProfile.cs
+++ b/EnvelopeGenerator.Application/Dto/MappingProfile.cs
@@ -35,8 +35,6 @@ public class MappingProfile : Profile
         CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverSecretDto>();
         CreateMap<EnvelopeType, EnvelopeTypeDto>();
         CreateMap<Domain.Entities.Receiver, ReceiverReadDto>();
-        CreateMap<Domain.Entities.Receiver, CreateReceiverCommand>();
-        CreateMap<Domain.Entities.Receiver, UpdateReceiverCommand>();
         CreateMap<Domain.Entities.EnvelopeReceiverReadOnly, EnvelopeReceiverReadOnlyDto>();
 
         // DTO to Entity mappings
@@ -51,8 +49,6 @@ public class MappingProfile : Profile
         CreateMap<EnvelopeReceiverDto, Domain.Entities.EnvelopeReceiver>();
         CreateMap<EnvelopeTypeDto, EnvelopeType>();
         CreateMap<ReceiverReadDto, Domain.Entities.Receiver>().ForMember(rcv => rcv.EnvelopeReceivers, rcvReadDto => rcvReadDto.Ignore());
-        CreateMap<CreateReceiverCommand, Domain.Entities.Receiver>();
-        CreateMap<UpdateReceiverCommand, Domain.Entities.Receiver>();
         CreateMap<Domain.Entities.EnvelopeReceiver, EnvelopeReceiverBasicDto>();
         CreateMap<EnvelopeReceiverReadOnlyCreateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
         CreateMap<EnvelopeReceiverReadOnlyUpdateDto, Domain.Entities.EnvelopeReceiverReadOnly>();
diff --git a/EnvelopeGenerator.Application/Receivers/MappingProfile.cs b/EnvelopeGenerator.Application/Receivers/MappingProfile.cs
new file mode 100644
index 00000000..ba9fce23
--- /dev/null
+++ b/EnvelopeGenerator.Application/Receivers/MappingProfile.cs
@@ -0,0 +1,23 @@
+using AutoMapper;
+using EnvelopeGenerator.Application.Receivers.Commands;
+using EnvelopeGenerator.Domain.Entities;
+
+namespace EnvelopeGenerator.Application.Receivers;
+
+/// <summary>
+/// 
+/// </summary>
+public class MappingProfile : Profile
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public MappingProfile()
+    {
+        CreateMap<Receiver, UpdateReceiverCommand>();
+        CreateMap<UpdateReceiverCommand, Receiver>();
+
+        CreateMap<Receiver, CreateReceiverCommand>();
+        CreateMap<CreateReceiverCommand, Receiver>();
+    }
+}