diff --git a/abra.sh b/abra.sh
index 91bf8a1..07a930e 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,6 +1,6 @@
 export DISCORD_BRIDGE_YAML_VERSION=v2
 export ENTRYPOINT_CONF_VERSION=v1
-export HOMESERVER_YAML_VERSION=v21
+export HOMESERVER_YAML_VERSION=v22
 export LOG_CONFIG_VERSION=v2
 export SHARED_SECRET_AUTH_VERSION=v1
 export SIGNAL_BRIDGE_YAML_VERSION=v4
diff --git a/homeserver.yaml.tmpl b/homeserver.yaml.tmpl
index 522f643..5f3d7ae 100644
--- a/homeserver.yaml.tmpl
+++ b/homeserver.yaml.tmpl
@@ -38,7 +38,7 @@ modules:
 # lowercase and may contain an explicit port.
 # Examples: matrix.org, localhost:8080
 #
-server_name: {{ env "DOMAIN" }}
+server_name: {{ or (env "SERVER_NAME") (env "DOMAIN") }}
 
 # The public-facing base URL that clients use to access this Homeserver (not
 # including _matrix/...). This is the same URL a user might enter into the