diff --git a/roles/docker-matrix-compose/tasks/main.yml b/roles/docker-matrix-compose/tasks/main.yml
index 775184a4..3a136b15 100644
--- a/roles/docker-matrix-compose/tasks/main.yml
+++ b/roles/docker-matrix-compose/tasks/main.yml
@@ -24,7 +24,7 @@
     src:  "templates/nginx.conf.j2" 
     dest: "{{nginx.directories.http.servers}}{{domains.matrix_synapse}}.conf"
   vars:
-    domain:     "{{domains.matrix_synapse}}"
+    # domain:     "{{domains.matrix_synapse}}" This does not seem to work @todo Check how to solve without declaring set_fact, seems a bug at templates
     http_port:  "{{ports.localhost.http_ports.matrix_synapse}}"
   notify: restart nginx
         
diff --git a/roles/docker-matrix-compose/templates/nginx.conf.j2 b/roles/docker-matrix-compose/templates/nginx.conf.j2
index c309d005..08876f58 100644
--- a/roles/docker-matrix-compose/templates/nginx.conf.j2
+++ b/roles/docker-matrix-compose/templates/nginx.conf.j2
@@ -1,5 +1,8 @@
 server {
-    server_name {{domains.matrix_synapse}};
+    # Somehow .j2 doesn't interpretate the passed variable right. For this reasons this redeclaration is necessary
+    {% set domain = domains.matrix_synapse %}
+
+    server_name {{domain}};
     {% include 'roles/letsencrypt/templates/ssl_header.j2' %}
     
     # For the federation port