diff --git a/caddy/caddy.sh b/caddy/caddy.sh
index 792d5a5dc3..0392a16c94 100644
--- a/caddy/caddy.sh
+++ b/caddy/caddy.sh
@@ -1,4 +1,11 @@
 #!/bin/sh
 
-export SITE_ADDRESS=$(if [ "$SSL" = "true" ]; then echo "${APP_DOMAIN}"; else echo "http://${APP_DOMAIN}"; fi)
+if [ "$APP_DOMAIN" == "localhost" ]; then
+    export SITE_ADDRESS=":${LISTEN_HTTP_PORT}"
+elif [ "$SSL" == "true" ]; then
+    export SITE_ADDRESS="${APP_DOMAIN}:${LISTEN_HTTPS_PORT}"
+else
+    export SITE_ADDRESS="http://${APP_DOMAIN}:${LISTEN_HTTP_PORT}"
+fi
+
 exec caddy run --config /etc/caddy/Caddyfile
diff --git a/deploy/selfhost/docker-compose.yml b/deploy/selfhost/docker-compose.yml
index e4931c80eb..32a379fa52 100644
--- a/deploy/selfhost/docker-compose.yml
+++ b/deploy/selfhost/docker-compose.yml
@@ -26,12 +26,11 @@ x-data-store-env: &data-store-env
 x-proxy-env: &proxy-env
   SSL: ${SSL:-false}
   APP_DOMAIN: ${APP_DOMAIN:-localhost}
-  NGINX_PORT: ${NGINX_PORT:-80}
   FILE_SIZE_LIMIT: ${FILE_SIZE_LIMIT:-5242880}
   CERT_EMAIL: ${CERT_EMAIL:-akshatjain9782@gmail.com}
   CERT_ACME_CA: ${CERT_ACME_CA:-}
-  LISTEN_HTTP_PORT: ${LISTEN_HTTP_PORT:-80}
-  LISTEN_HTTPS_PORT: ${LISTEN_HTTPS_PORT:-443}
+  LISTEN_HTTP_PORT: ${LISTEN_PORT:-80}
+  LISTEN_HTTPS_PORT: ${LISTEN_SSL_PORT}
 
 x-app-env: &app-env
   WEB_URL: ${WEB_URL:-http://localhost}
diff --git a/deploy/selfhost/variables.env b/deploy/selfhost/variables.env
index 63d4b10c6d..1591586b77 100644
--- a/deploy/selfhost/variables.env
+++ b/deploy/selfhost/variables.env
@@ -7,7 +7,8 @@ SPACE_REPLICAS=1
 ADMIN_REPLICAS=1
 API_REPLICAS=1
 
-NGINX_PORT=80
+LISTEN_PORT=80
+LISTEN_SSL_PORT=443
 WEB_URL=http://${APP_DOMAIN}
 DEBUG=0
 SENTRY_DSN=
@@ -30,7 +31,7 @@ REDIS_PORT=6379
 REDIS_URL=
 
 # If SSL Cert to be generated, set CERT_EMAIL and APP_PROTOCOL to https
-CERT_EMAIL=akshatjain9782@gmail.com
+CERT_EMAIL=demo@example.com
 CERT_ACME_CA=https://acme-v02.api.letsencrypt.org/directory
 TRUSTED_PROXIES=0.0.0.0/0