diff --git a/nomad_jobs/services/penpot/penpot.nomad.hcl b/nomad_jobs/services/penpot/penpot.nomad.hcl
index c173644..af507be 100644
--- a/nomad_jobs/services/penpot/penpot.nomad.hcl
+++ b/nomad_jobs/services/penpot/penpot.nomad.hcl
@@ -1,6 +1,8 @@
 # Listening Domain
 locals {
-  TRAEFIK_DOMAIN = "penpot.example.local"
+  SUBDOMAIN = "penpot." // End with dot or leave blamk for root domain
+  DOMAIN = "example.local"
+  TRAEFIK_DOMAIN = "${local.SUBDOMAIN}${local.DOMAIN}"
 }
 
 # Application routing environment variables
@@ -8,7 +10,7 @@ locals {
   PENPOT_PUBLIC_URI                     = "https://${local.TRAEFIK_DOMAIN}"
   PENPOT_BACKEND_URI                    = "http://127.0.0.1:6060"
   PENPOT_EXPORTER_URI                   = "http://127.0.0.1:6061"
-  PENPOT_FLAGS                          = "enable-smtp enable-registration enable-login-with-password enable-prepl-server enable-demo-users"
+  PENPOT_FLAGS                          = "enable-smtp enable-registration enable-login-with-password enable-demo-users"
   PENPOT_SECRET_KEY                     = "op://InfraSecrets/7hbsxng22unjqc4wkj62qniu2u/credential" # Try running `openssl rand -hex 32` to generate a random secret key
   PENPOT_DATABASE_URI                   = "postgresql://127.0.0.1:5432/penpot"
   PENPOT_DATABASE_USERNAME              = "op://InfraSecrets/Postgres - Penpot User/username"
@@ -31,8 +33,8 @@ locals {
 
 # SMTP environment variables
 locals {
-  PENPOT_SMTP_DEFAULT_FROM              = "no-reply+penpot@example.local"
-  PENPOT_SMTP_DEFAULT_REPLY_TO          = "no-reply+penpot@example.local"
+  PENPOT_SMTP_DEFAULT_FROM              = "no-reply+penpot@${local.DOMAIN}"
+  PENPOT_SMTP_DEFAULT_REPLY_TO          = "no-reply+penpot@${local.DOMAIN}"
   PENPOT_SMTP_HOST                      = "127.0.0.1"
   PENPOT_SMTP_PORT                      = "1025"
   PENPOT_SMTP_USERNAME                  = ""