diff --git a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2
index 8dc8c8ec5..2561529c8 100644
--- a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2
@@ -43,10 +43,10 @@ http {
 	access_log off;
 	{% endif %}
 	
-	proxy_connect_timeout       {{ matrix_nginx_proxy_request_timeout }};
-	proxy_send_timeout          {{ matrix_nginx_proxy_request_timeout }};
-	proxy_read_timeout          {{ matrix_nginx_proxy_request_timeout }};
-	send_timeout                {{ matrix_nginx_proxy_request_timeout }};
+	proxy_connect_timeout       {{ matrix_nginx_proxy_connect_timeout }};
+	proxy_send_timeout          {{  matrix_nginx_proxy_send_timeout: 60 }};
+	proxy_read_timeout          {{ matrix_nginx_proxy_read_timeout }};
+	send_timeout                {{ matrix_nginx_send_timeout }};
 
 	sendfile on;
 	#tcp_nopush on;