diff --git a/util/Nginx/entrypoint.sh b/util/Nginx/entrypoint.sh
index af491a7e5e..56dd12c9e7 100644
--- a/util/Nginx/entrypoint.sh
+++ b/util/Nginx/entrypoint.sh
@@ -35,8 +35,9 @@ mkdir -p /etc/letsencrypt
 chown -R $USERNAME:$GROUPNAME /etc/letsencrypt
 mkdir -p /etc/ssl
 chown -R $USERNAME:$GROUPNAME /etc/ssl
-touch /var/run/nginx.pid
-chown -R $USERNAME:$GROUPNAME /var/run/nginx.pid
+mkdir -p /var/run/nginx
+touch /var/run/nginx/nginx.pid
+chown -R $USERNAME:$GROUPNAME /var/run/nginx
 chown -R $USERNAME:$GROUPNAME /var/cache/nginx
 chown -R $USERNAME:$GROUPNAME /var/log/nginx
 
diff --git a/util/Nginx/nginx.conf b/util/Nginx/nginx.conf
index 12183d0488..ac7e5c3fb1 100644
--- a/util/Nginx/nginx.conf
+++ b/util/Nginx/nginx.conf
@@ -27,7 +27,7 @@ events {
 # Default error log file
 # (this is only used when you don't override error_log on a server{} level)
 error_log  /var/log/nginx/error.log warn;
-pid        /var/run/nginx.pid;
+pid        /var/run/nginx/nginx.pid;
 
 http {
   include       proxy.conf;