diff --git a/Accounts/Dockerfile.tpl b/Accounts/Dockerfile.tpl
index d858970d52..2fc5be0aba 100755
--- a/Accounts/Dockerfile.tpl
+++ b/Accounts/Dockerfile.tpl
@@ -73,6 +73,7 @@ EXPOSE 3003
 
 
 {{ if eq .Env.ENVIRONMENT "development" }}
+RUN mkdir /usr/src/app/dev-env
 RUN touch /usr/src/app/dev-env/.env
 RUN printenv > /usr/src/app/dev-env/.env
 #Run the app
diff --git a/Dashboard/Dockerfile.tpl b/Dashboard/Dockerfile.tpl
index 52d395f38f..a36460e500 100755
--- a/Dashboard/Dockerfile.tpl
+++ b/Dashboard/Dockerfile.tpl
@@ -70,6 +70,7 @@ EXPOSE 3009
 
 {{ if eq .Env.ENVIRONMENT "development" }}
 #Run the app
+RUN mkdir /usr/src/app/dev-env
 RUN touch /usr/src/app/dev-env/.env
 RUN printenv > /usr/src/app/dev-env/.env
 CMD [ "npm", "run", "dev" ]
diff --git a/Notification/Services/MailService.ts b/Notification/Services/MailService.ts
index 70e1309c0c..e032c46292 100755
--- a/Notification/Services/MailService.ts
+++ b/Notification/Services/MailService.ts
@@ -125,7 +125,7 @@ export default class MailService {
             await UserOnCallLogTimelineService.updateOneById({
                 data: {
                     status: UserNotificationStatus.Sent,
-                    statusMessage: 'Email sent successfully',
+                    statusMessage: 'Email sent successfully. This does not mean the email was delivered. We do not track email delivery. If the email was not delivered - it is likely due to the email address being invalid, user has blocked sending domain, or it could have landed in spam.',
                 },
                 id: timelineId,
                 props: {
@@ -265,7 +265,7 @@ export default class MailService {
 
                 if (emailLog) {
                     emailLog.status = MailStatus.Success;
-                    emailLog.statusMessage = 'Email sent successfully';
+                    emailLog.statusMessage = 'Email sent successfully. This does not mean the email was delivered. We do not track email delivery. If the email was not delivered - it is likely due to the email address being invalid, user has blocked sending domain, or it could have landed in spam.';
 
                     await EmailLogService.create({
                         data: emailLog,
@@ -301,7 +301,7 @@ export default class MailService {
 
             if (emailLog) {
                 emailLog.status = MailStatus.Success;
-                emailLog.statusMessage = 'Email sent successfully';
+                emailLog.statusMessage = 'Email sent successfully. This does not mean the email was delivered. We do not track email delivery. If the email was not delivered - it is likely due to the email address being invalid, user has blocked sending domain, or it could have landed in spam.';
 
                 await EmailLogService.create({
                     data: emailLog,
diff --git a/StatusPage/Dockerfile.tpl b/StatusPage/Dockerfile.tpl
index d2a4dcf9ff..4b67c8bf6b 100755
--- a/StatusPage/Dockerfile.tpl
+++ b/StatusPage/Dockerfile.tpl
@@ -71,6 +71,7 @@ EXPOSE 3105
 EXPOSE 3106
 
 {{ if eq .Env.ENVIRONMENT "development" }}
+RUN mkdir /usr/src/app/dev-env
 RUN touch /usr/src/app/dev-env/.env
 RUN printenv > /usr/src/app/dev-env/.env
 #Run the app