diff --git a/Marco.Pms.Services/Marco.Pms.Services.csproj b/Marco.Pms.Services/Marco.Pms.Services.csproj
index e65edaf..6482198 100644
--- a/Marco.Pms.Services/Marco.Pms.Services.csproj
+++ b/Marco.Pms.Services/Marco.Pms.Services.csproj
@@ -44,5 +44,10 @@
     <ProjectReference Include="..\Marco.Pms.Model\Marco.Pms.Model.csproj" />
     <ProjectReference Include="..\Marco.Pms.Utility\Marco.Pms.Utility.csproj" />
   </ItemGroup>
+	<ItemGroup>
+		<Content Include="EmailTemplates\**\*.html">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 
 </Project>
diff --git a/Marco.Pms.Services/Service/EmailSender.cs b/Marco.Pms.Services/Service/EmailSender.cs
index 1baac55..59f5a11 100644
--- a/Marco.Pms.Services/Service/EmailSender.cs
+++ b/Marco.Pms.Services/Service/EmailSender.cs
@@ -10,16 +10,18 @@ namespace MarcoBMS.Services.Service
     {
         private readonly SmtpSettings _smtpSettings;
         private readonly IConfiguration _configuration;
+        private readonly IWebHostEnvironment _env;
 
-        public EmailSender(IOptions<SmtpSettings> emailSettings, IConfiguration configuration)
+        public EmailSender(IOptions<SmtpSettings> emailSettings, IConfiguration configuration, IWebHostEnvironment env)
         {
             _smtpSettings = emailSettings.Value;
             _configuration = configuration;
+            _env = env;
         }
 
         public async Task<string> GetEmailTemplate(string templateName, Dictionary<string, string> replacements)
         {
-            string path = Path.Combine(Directory.GetCurrentDirectory(), "EmailTemplates", $"{templateName}.html");
+            string path = Path.Combine(_env.ContentRootPath, "EmailTemplates", $"{templateName}.html");
 
             if (!File.Exists(path))
                 throw new FileNotFoundException("Template file not found");
@@ -52,7 +54,7 @@ namespace MarcoBMS.Services.Service
             await SendEmailAsync(toEmails, "New user registration, Reset Your Password", emailBody);
         }
         public async Task SendResetPasswordEmail(string toEmail, string userName, string resetLink)
-        {            
+        {
             var replacements = new Dictionary<string, string>
             {
                 { "MAIL_TITLE", "Reset Your Password" },