diff --git a/rootfs/etc/confd/templates/server.yaml.tmpl b/rootfs/etc/confd/templates/server.yaml.tmpl
index aa8a8eb..105d022 100644
--- a/rootfs/etc/confd/templates/server.yaml.tmpl
+++ b/rootfs/etc/confd/templates/server.yaml.tmpl
@@ -8,7 +8,7 @@ server_name: "{{getenv "SERVER_NAME"}}"
 pid_file: /var/lib/synapse/homeserver.pid
 
 web_client: True
-public_baseurl: https://{{getenv "SERVER_NAME"}}/
+public_baseurl: {{getenv "PUBLIC_BASE_URL"}}
 
 soft_file_limit: 0