diff --git a/infrastructure_files/base.setup.env b/infrastructure_files/base.setup.env
index ccab2ae4d..2d74e3a66 100644
--- a/infrastructure_files/base.setup.env
+++ b/infrastructure_files/base.setup.env
@@ -12,7 +12,7 @@ NETBIRD_MGMT_API_CERT_FILE="/etc/letsencrypt/live/$NETBIRD_DOMAIN/fullchain.pem"
 NETBIRD_MGMT_API_CERT_KEY_FILE="/etc/letsencrypt/live/$NETBIRD_DOMAIN/privkey.pem"
 # By default Management single account mode is enabled and domain set to $NETBIRD_DOMAIN, you may want to set this to your user's email domain
 NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN=$NETBIRD_DOMAIN
-
+NETBIRD_MGMT_DNS_DOMAIN=${NETBIRD_MGMT_DNS_DOMAIN:-netbird.selfhosted}
 # Turn credentials
 
 # User
@@ -60,4 +60,5 @@ export MGMT_VOLUMESUFFIX
 export SIGNAL_VOLUMESUFFIX
 export LETSENCRYPT_VOLUMESUFFIX
 export NETBIRD_DISABLE_ANONYMOUS_METRICS
-export NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN
\ No newline at end of file
+export NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN
+export NETBIRD_MGMT_DNS_DOMAIN
\ No newline at end of file
diff --git a/infrastructure_files/docker-compose.yml.tmpl b/infrastructure_files/docker-compose.yml.tmpl
index fd14717db..5a78d2dd2 100644
--- a/infrastructure_files/docker-compose.yml.tmpl
+++ b/infrastructure_files/docker-compose.yml.tmpl
@@ -45,10 +45,9 @@ services:
       - ./management.json:/etc/netbird/management.json
     ports:
       - $NETBIRD_MGMT_API_PORT:443 #API port
-  #     # port and command for Let's Encrypt validation without dashboard container
-  #   - 443:443
+  #     # command for Let's Encrypt validation without dashboard container
   #    command: ["--letsencrypt-domain", "$NETBIRD_DOMAIN", "--log-file", "console"]
-    command: ["--port", "443", "--log-file", "console", "--disable-anonymous-metrics=$NETBIRD_DISABLE_ANONYMOUS_METRICS", "--single-account-mode-domain=$NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN"]
+    command: ["--port", "443", "--log-file", "console", "--disable-anonymous-metrics=$NETBIRD_DISABLE_ANONYMOUS_METRICS", "--single-account-mode-domain=$NETBIRD_MGMT_SINGLE_ACCOUNT_MODE_DOMAIN", "--dns-domain=$NETBIRD_MGMT_DNS_DOMAIN"]
   # Coturn
   coturn:
     image: coturn/coturn
diff --git a/infrastructure_files/setup.env.example b/infrastructure_files/setup.env.example
index 0d84a14f8..4afb322f9 100644
--- a/infrastructure_files/setup.env.example
+++ b/infrastructure_files/setup.env.example
@@ -19,4 +19,6 @@ NETBIRD_LETSENCRYPT_EMAIL=""
 # NETBIRD_AUTH_SILENT_REDIRECT_URI="/add-peers"
 
 # Disable anonymous metrics collection, see more information at https://netbird.io/docs/FAQ/metrics-collection
-NETBIRD_DISABLE_ANONYMOUS_METRICS=false
\ No newline at end of file
+NETBIRD_DISABLE_ANONYMOUS_METRICS=false
+# DNS DOMAIN configures the domain name used for peer resolution. By default it is netbird.selfhosted
+NETBIRD_MGMT_DNS_DOMAIN=netbird.selfhosted