diff --git a/tasks/install.yml b/tasks/install.yml
index 1cba920..fee19d0 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -41,9 +41,9 @@
       when: matrix_ldap_auth_enabled
 
     - name: Create signing key
-      shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_server_url | urlsplit('hostname')  }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
+      shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_server_url }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
       args:
-        creates: "{{ matrix_conf_dir }}/{{ matrix_server_url | urlsplit('hostname') }}.signing.key"
+        creates: "{{ matrix_conf_dir }}/{{ matrix_server_url }}.signing.key"
       notify: __matrix_restart
 
     - name: Deploy global config files
diff --git a/templates/nginx/vhost.j2 b/templates/nginx/vhost.j2
index 23d14f3..497e644 100644
--- a/templates/nginx/vhost.j2
+++ b/templates/nginx/vhost.j2
@@ -6,7 +6,7 @@ upstream backend_matrix {
 
 server {
     listen 80;
-    server_name {{ matrix_server_url | urlsplit('hostname') }};
+    server_name {{ matrix_client_url | urlsplit('hostname') }};
 
     client_max_body_size 200M;
 
@@ -23,7 +23,7 @@ server {
 {% if matrix_nginx_tls_enabled %}
 server {
     listen 443 ssl;
-    server_name {{ matrix_server_url | urlsplit('hostname') }};
+    server_name {{ matrix_client_url | urlsplit('hostname') }};
 
     client_max_body_size 200M;