diff --git a/stacks/dawarich-stack.yaml b/stacks/dawarich-stack.yaml
index 63d8577..20702a0 100644
--- a/stacks/dawarich-stack.yaml
+++ b/stacks/dawarich-stack.yaml
@@ -71,13 +71,13 @@ services:
       PHOTON_API_HOST: ${PHOTON_API_HOST}
       PHOTON_API_KEY: ${PHOTON_API_KEY}
       SELF_HOSTED: "true"
-      DOMAIN: ${DOMAIN}
-      SMTP_SERVER: ${SMTP_SERVER}
-      SMTP_PORT: ${SMTP_PORT}
-      SMTP_FROM: ${SMTP_FROM}
-      SMTP_USERNAME: ${SMTP_USERNAME}
-      SMTP_PASSWORD: ${SMTP_PASSWORD}
-      SMTP_STARTTLS: ${SMTP_STARTTLS:true}
+      DOMAIN: ${DOMAIN:-}
+      SMTP_SERVER: ${SMTP_SERVER:-}
+      SMTP_PORT: ${SMTP_PORT:-}
+      SMTP_FROM: ${SMTP_FROM:-}
+      SMTP_USERNAME: ${SMTP_USERNAME:-}
+      SMTP_PASSWORD: ${SMTP_PASSWORD:-}
+      SMTP_STARTTLS: ${SMTP_STARTTLS:-true}
     logging:
       driver: "json-file"
       options:
@@ -141,13 +141,13 @@ services:
       PHOTON_API_HOST: ${PHOTON_API_HOST}
       PHOTON_API_KEY: ${PHOTON_API_KEY}
       SELF_HOSTED: "true"
-      DOMAIN: ${DOMAIN}
-      SMTP_SERVER: ${SMTP_SERVER}
-      SMTP_PORT: ${SMTP_PORT}
-      SMTP_FROM: ${SMTP_FROM}
-      SMTP_USERNAME: ${SMTP_USERNAME}
-      SMTP_PASSWORD: ${SMTP_PASSWORD}
-      SMTP_STARTTLS: ${SMTP_STARTTLS:true}
+      DOMAIN: ${DOMAIN:-}
+      SMTP_SERVER: ${SMTP_SERVER:-}
+      SMTP_PORT: ${SMTP_PORT:-}
+      SMTP_FROM: ${SMTP_FROM:-}
+      SMTP_USERNAME: ${SMTP_USERNAME:-}
+      SMTP_PASSWORD: ${SMTP_PASSWORD:-}
+      SMTP_STARTTLS: ${SMTP_STARTTLS:-true}
     logging:
       driver: "json-file"
       options: