diff --git a/scripts/upgrade b/scripts/upgrade
index 9acf346..327bac1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -247,18 +247,18 @@ fi
 
 # Create .well-known redirection for access by federation if it doesn't exist
 if [[ $server_name != $domain ]]; then
-if [[ ! -e /var/www/.well-known/${domain}/server_name.json ]]; then
-    cat > /var/www/.well-known/${domain}/server_name.json <<EOF
+if [[ ! -e /var/www/.well-known/${server_nameserver_name}/server_name.json ]]; then
+    cat > /var/www/.well-known/${server_name}/server_name.json <<EOF
    {
           "m.server": "$domain"
    }
 EOF
 fi
 
-if [[ ! -e /etc/nginx/conf.d/${domain}.d/server_name.conf ]]
-  cat > /etc/nginx/conf.d/${domain}.d/server_name.conf <<EOF
+if [[ ! -e /etc/nginx/conf.d/${server_name}.d/server_name.conf ]]
+  cat > /etc/nginx/conf.d/${server_name}.d/server_name.conf <<EOF
     location /.well-known/matrix/server {
-        alias /var/www/.well-known/${domain}/server_name.json;
+        alias /var/www/.well-known/${server_name}/server_name.json;
         }
 EOF
 fi