diff --git a/.env b/.env
index de005a1..5d73f95 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,5 @@
 PROD_URL=matrix.gmoker.com
+PUBLIC_URL=gmoker.com
 IMAGEAPP=ghcr.io/element-hq/synapse:v1.106.0
 
 TURN_URL=turn.test.gmoker.com
diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 70e6840..7cea4cc 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -15,6 +15,7 @@ jobs:
           fi
           cat <<EOF >> .env
           BASE_URL="$BASE_URL"
+          PUBLIC_URL="${PUBLIC_URL:-$BASE_URL}"
           EOF
           cat .env
 
diff --git a/homeserver.yaml b/homeserver.yaml
index 7e62fbb..629f670 100644
--- a/homeserver.yaml
+++ b/homeserver.yaml
@@ -1,4 +1,5 @@
 server_name: "$BASE_URL"
+public_baseurl: "$PUBLIC_URL"
 pid_file: /homeserver.pid
 web_client: false
 soft_file_limit: 0
diff --git a/manifests/prod/delegation.yaml b/manifests/prod/delegation.yaml
index a54adc8..fdab21c 100644
--- a/manifests/prod/delegation.yaml
+++ b/manifests/prod/delegation.yaml
@@ -10,9 +10,9 @@ spec:
   tls:
     - secretName: tls-delegation
       hosts:
-        - gmoker.com
+        - "$PUBLIC_URL"
   rules:
-    - host: gmoker.com
+    - host: "$PUBLIC_URL"
       http:
         paths:
           - path: /.well-known/matrix/server