diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props
index 4cf73ff5c86..ec37e256c61 100644
--- a/src/OrchardCore.Build/Dependencies.props
+++ b/src/OrchardCore.Build/Dependencies.props
@@ -70,6 +70,7 @@
     <PackageManagement Include="OpenIddict.Validation.SystemNetHttp" Version="5.6.0" />
     <PackageManagement Include="OrchardCore.Translations.All" Version="1.8.0" />
     <PackageManagement Include="PdfPig" Version="0.1.8" />
+    <PackageManagement Include="Riok.Mapperly" Version="3.4.0" />
     <PackageManagement Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageManagement Include="Shortcodes" Version="1.3.3" />
     <PackageManagement Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj
index c80c6b4672c..8d0f96dc977 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj
+++ b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/OrchardCore.Email.Smtp.csproj
@@ -22,6 +22,7 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.DisplayManagement\OrchardCore.DisplayManagement.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Email.Abstractions\OrchardCore.Email.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Email.Core\OrchardCore.Email.Core.csproj" />
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore.Infrastructure\OrchardCore.Infrastructure.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Navigation.Core\OrchardCore.Navigation.Core.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Module.Targets\OrchardCore.Module.Targets.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.ResourceManagement\OrchardCore.ResourceManagement.csproj" />
@@ -29,6 +30,7 @@
 
   <ItemGroup>
     <PackageReference Include="MailKit" />
+    <PackageReference Include="Riok.Mapperly" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpOptionsConfiguration.cs b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpOptionsConfiguration.cs
index 0ac92e3870f..6d5b2d24384 100644
--- a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpOptionsConfiguration.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpOptionsConfiguration.cs
@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using OrchardCore.Mappings;
 using OrchardCore.Settings;
 
 namespace OrchardCore.Email.Smtp.Services;
@@ -29,20 +30,7 @@ public void Configure(SmtpOptions options)
             .GetAwaiter().GetResult()
             .As<SmtpSettings>();
 
-        options.DefaultSender = settings.DefaultSender;
-        options.DeliveryMethod = settings.DeliveryMethod;
-        options.PickupDirectoryLocation = settings.PickupDirectoryLocation;
-        options.Host = settings.Host;
-        options.Port = settings.Port;
-        options.ProxyHost = settings.ProxyHost;
-        options.ProxyPort = settings.ProxyPort;
-        options.EncryptionMethod = settings.EncryptionMethod;
-        options.AutoSelectEncryption = settings.AutoSelectEncryption;
-        options.RequireCredentials = settings.RequireCredentials;
-        options.UseDefaultCredentials = settings.UseDefaultCredentials;
-        options.UserName = settings.UserName;
-        options.Password = settings.Password;
-        options.IgnoreInvalidSslCertificate = settings.IgnoreInvalidSslCertificate;
+        options = SmtpSettingsMapper.Map(settings);
 
         if (!string.IsNullOrWhiteSpace(settings.Password))
         {
diff --git a/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpSettingsMapper.cs b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpSettingsMapper.cs
new file mode 100644
index 00000000000..fba02b98457
--- /dev/null
+++ b/src/OrchardCore.Modules/OrchardCore.Email.Smtp/Services/SmtpSettingsMapper.cs
@@ -0,0 +1,9 @@
+using Riok.Mapperly.Abstractions;
+
+namespace OrchardCore.Email.Smtp.Services;
+
+[Mapper]
+public static partial class SmtpSettingsMapper
+{
+    public static partial SmtpOptions Map(SmtpSettings source);
+}
diff --git a/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Mappings/IMapper.cs b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Mappings/IMapper.cs
new file mode 100644
index 00000000000..1e0100f3a05
--- /dev/null
+++ b/src/OrchardCore/OrchardCore.Infrastructure.Abstractions/Mappings/IMapper.cs
@@ -0,0 +1,24 @@
+namespace OrchardCore.Mappings;
+
+/// <summary>
+/// Represents a contract for mapping objects.
+/// </summary>
+public interface IMapper
+{
+    /// <summary>
+    /// Maps the specified source object to a new object of the specified destination type.
+    /// </summary>
+    /// <typeparam name="TDestination">The type of object to map to.</typeparam>
+    /// <param name="source">The object to be mapped.</param>
+    TDestination Map<TDestination>(object source);
+
+    /// <summary>
+    /// Maps the specified source object to the specified destination object.
+    /// </summary>
+    /// <typeparam name="TSource"></typeparam>
+    /// <typeparam name="TDestination"></typeparam>
+    /// <param name="source">The object to be mapped.</param>
+    /// <param name="destination">The object to map to.</param>
+    /// <returns></returns>
+    TDestination Map<TSource, TDestination>(TSource source, TDestination destination);
+}
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/Mappings/ObjectMapper.cs b/src/OrchardCore/OrchardCore.Infrastructure/Mappings/ObjectMapper.cs
new file mode 100644
index 00000000000..fcc7c5ee005
--- /dev/null
+++ b/src/OrchardCore/OrchardCore.Infrastructure/Mappings/ObjectMapper.cs
@@ -0,0 +1,12 @@
+using Riok.Mapperly.Abstractions;
+
+namespace OrchardCore.Mappings;
+
+/// <summary>
+/// Represents a service for mapping objects.
+/// </summary>
+[Mapper]
+public static partial class ObjectMapper
+{
+    public static partial TTarget Map<TSource, TTarget>(TSource source);
+}
diff --git a/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj b/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj
index d0701e3871d..9448012b1d1 100644
--- a/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj
+++ b/src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" />
     <PackageReference Include="MimeKit" />
+    <PackageReference Include="Riok.Mapperly" />
   </ItemGroup>
 
   <ItemGroup>