diff --git a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2 b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2
index 51aa8a006..3db5a40c8 100644
--- a/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2
+++ b/roles/matrix-nginx-proxy/templates/nginx/nginx.conf.j2
@@ -8,7 +8,7 @@
 # - various temp paths are changed to `/tmp`, so that a non-root user can write to them
 # - the `user` directive was removed, as we don't want nginx to switch users
 
-worker_processes 1;
+worker_processes auto;
 
 error_log /var/log/nginx/error.log warn;
 pid /tmp/nginx.pid;
@@ -18,6 +18,8 @@ events {
 	worker_connections 1024;
 }
 
+# "PCRE JIT can speed up processing of regular expressions significantly."
+pcre_jit on;
 
 http {
 	proxy_temp_path /tmp/proxy_temp;
diff --git a/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2 b/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2
index 5b4dfb2af..fa0571efa 100644
--- a/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2
+++ b/roles/matrix-nginx-proxy/templates/systemd/matrix-nginx-proxy.service.j2
@@ -11,8 +11,8 @@ Wants={{ service }}
 
 [Service]
 Type=simple
-ExecStartPre=-/usr/bin/docker kill matrix-nginx-proxy
-ExecStartPre=-/usr/bin/docker rm matrix-nginx-proxy
+#ExecStartPre=-/usr/bin/docker kill matrix-nginx-proxy
+#ExecStartPre=-/usr/bin/docker rm matrix-nginx-proxy
 
 ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \
 			--log-driver=none \
@@ -43,11 +43,11 @@ ExecStart=/usr/bin/docker run --rm --name matrix-nginx-proxy \
 			{% endfor %}
 			{{ matrix_nginx_proxy_docker_image }}
 
-ExecStop=-/usr/bin/docker kill matrix-nginx-proxy
-ExecStop=-/usr/bin/docker rm matrix-nginx-proxy
+#ExecStop=-/usr/bin/docker kill matrix-nginx-proxy
+#ExecStop=-/usr/bin/docker rm matrix-nginx-proxy
 ExecReload=/usr/bin/docker exec matrix-nginx-proxy /usr/sbin/nginx -s reload
 Restart=always
-RestartSec=30
+RestartSec=15
 SyslogIdentifier=matrix-nginx-proxy
 
 [Install]