diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java
index 61ced9d27..f089d15c0 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java
@@ -61,7 +61,7 @@ public class ConfirmationEmailServiceImpl implements ConfirmationEmailService {
 	}
 
 	private String createContent(UUID confirmationToken, MailService mailService) {
-		String content = mailService.getMailTemplateContent("classpath:templates/email/emailConfirmation.html");
+		String content = mailService.getMailTemplateContent(this.environment.getProperty("email.confirmation"));
 		content = content.replace("{confirmationToken}", confirmationToken.toString());
 		content = content.replace("{expiration_time}", secondsToTime(Integer.parseInt(this.environment.getProperty("conf_email.expiration_time_seconds"))));
 		content = content.replace("{host}", this.environment.getProperty("dmp.domain"));
@@ -85,7 +85,7 @@ public class ConfirmationEmailServiceImpl implements ConfirmationEmailService {
 	}
 
 	private String createMergeContent(UUID confirmationToken, MailService mailService, String userName) {
-		String content = mailService.getMailTemplateContent("classpath:templates/email/emailMergeConfirmation.html");
+		String content = mailService.getMailTemplateContent(this.environment.getProperty("email.merge"));
 		content = content.replace("{userName}", userName);
 		content = content.replace("{confirmationToken}", confirmationToken.toString());
 		content = content.replace("{expiration_time}", secondsToTime(Integer.parseInt(this.environment.getProperty("conf_email.expiration_time_seconds"))));
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java
index d2d893470..1fdca59fb 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java
@@ -80,7 +80,7 @@ public class InvitationServiceImpl implements InvitationService {
         return CompletableFuture.runAsync(() -> {
             SimpleMail mail = new SimpleMail();
             mail.setSubject(createSubject(dmp, mailService.getMailTemplateSubject()));
-            mail.setContent(createContent(invitation.getId(), dmp, recipient, mailService.getMailTemplateContent("classpath:templates/email/email.html"), role));
+            mail.setContent(createContent(invitation.getId(), dmp, recipient, mailService.getMailTemplateContent(this.environment.getProperty("email.invite")), role));
             mail.setTo(invitation.getInvitationEmail());
             try {
                 mailService.sendSimpleMail(mail);
diff --git a/dmp-backend/web/src/main/resources/config/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties
index 599d404c3..9b70fe237 100644
--- a/dmp-backend/web/src/main/resources/config/application-devel.properties
+++ b/dmp-backend/web/src/main/resources/config/application-devel.properties
@@ -27,6 +27,11 @@ configuration.rda=RDACommonStandards.txt
 configuration.h2020template=documents/h2020.docx
 configuration.configurable_login_providers=configurableLoginProviders.json
 
+####################EMAIL FILE TEMPLATES OVERRIDES CONFIGURATIONS##########
+email.invite=classpath:templates/email/email.html
+email.confirmation=classpath:templates/email/emailConfirmation.html
+email.merge=classpath:templates/email/emailMergeConfirmation.html
+
 #############FACEBOOK LOGIN CONFIGURATIONS#########
 facebook.login.clientId=
 facebook.login.clientSecret=
diff --git a/dmp-backend/web/src/main/resources/config/application.properties b/dmp-backend/web/src/main/resources/config/application.properties
index 1103dca16..7eda52fd3 100644
--- a/dmp-backend/web/src/main/resources/config/application.properties
+++ b/dmp-backend/web/src/main/resources/config/application.properties
@@ -39,6 +39,11 @@ configuration.rda=RDACommonStandards.txt
 configuration.h2020template=documents/h2020.docx
 configuration.configurable_login_providers=ConfigurableLoginProviders.json
 
+####################EMAIL FILE TEMPLATES OVERRIDES CONFIGURATIONS##########
+email.invite=file:templates/email/email.html
+email.confirmation=file:templates/email/emailConfirmation.html
+email.merge=file:templates/email/emailMergeConfirmation.html
+
 #############LOGIN CONFIGURATIONS#########
 #############GENERIC LOGIN CONFIGURATIONS#########
 autouser.root.email=