diff --git a/docs/configuring-playbook-ngnix.md b/docs/configuring-playbook-ngnix.md
index e2a46a72..8b7e24e7 100644
--- a/docs/configuring-playbook-ngnix.md
+++ b/docs/configuring-playbook-ngnix.md
@@ -9,13 +9,15 @@ If that's alright, you can skip this.
 This will serve a statuspage to the hosting machine only. Useful for monitoring software like [longview](https://www.linode.com/docs/platform/longview/longview-app-for-nginx/)
 
 ```yaml
-matrix_nginx_proxy_nginx_status_enabled: true
+matrix_nginx_proxy_proxy_matrix_nginx_status_enabled: true
 ```
 
+This will serve the status page under ```matrix.DOMAIN/nginx_status``` 
+
 In default ```matrix_nginx_proxy_nginx_status_enabled``` will add the local ip adress. If you wish to listen to other ip-adresses provide a list:
 
 ```yaml
-matrix_nginx_proxy_nginx_status_allowed_addresses:
+matrix_nginx_proxy_proxy_matrix_nginx_status_allowed_addresses:
 - 8.8.8.8
 - 1.1.1.1
 ```
diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
index 27d2f297..0d234827 100644
--- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
@@ -5,27 +5,16 @@ server {
 
 	server_tokens off;
 
-{% if matrix_nginx_proxy_nginx_status_enabled %}
-	location /nginx_status {
-		stub_status on;
-		access_log off;
-{% for address in matrix_nginx_proxy_nginx_status_allowed_addresses %}
-		allow {{ address }};
-{% endfor %}
-		deny all;
-	}
-{% endif %}
-
 	location /.well-known/acme-challenge {
-{% if matrix_nginx_proxy_enabled %}
+		{% if matrix_nginx_proxy_enabled %}
 			{# Use the embedded DNS resolver in Docker containers to discover the service #}
 			resolver 127.0.0.11 valid=5s;
 			set $backend "matrix-certbot:8080";
 			proxy_pass http://$backend;
-{% else %}
+		{% else %}
 			{# Generic configuration for use outside of our container setup #}
 			proxy_pass http://127.0.0.1:{{ matrix_ssl_lets_encrypt_certbot_standalone_http_port }};
-{% endif %}
+		{% endif %}
 	}
 
 	location / {
diff --git a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
index eda0929b..356c9f3a 100644
--- a/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
@@ -17,6 +17,17 @@ server {
 		{% endif %}
 	}
 
+{% if matrix_nginx_proxy_proxy_matrix_nginx_status_enabled %}
+	location /nginx_status {
+		stub_status on;
+		access_log off;
+{% for address in matrix_nginx_proxy_proxy_matrix_nginx_status_allowed_addresses %}
+		allow {{ address }};
+{% endfor %}
+		deny all;
+	}
+{% endif %}
+
 	location / {
 		return 301 https://$http_host$request_uri;
 	}