diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml
index b6625a98c..c174390ba 100644
--- a/roles/nginx/tasks/install.yml
+++ b/roles/nginx/tasks/install.yml
@@ -91,6 +91,9 @@
 #    - { regexp: '^ExecStart=/usr/sbin/nginx', line: 'ExecStart=/usr/sbin/nginx -c {{ nginx_dir }}/nginx.conf'  }
 #    - { regexp: '^ExecReload=/usr/sbin/nginx', line: 'ExecReload=/usr/sbin/nginx -c {{ nginx_dir }}/nginx.conf' }
 
+  - name: Alter PIDFile= to match {{ systemd_unit_name }} in unit file.
+    command: sed -i 's|PIDFile=/run/nginx.pid|PIDFile=/run/{{ systemd_unit_name }}.pid|' /etc/systemd/system/{{ systemd_unit_name }}.service
+
 # end block
   when: systemd_unit_name != "nginx" or nginx_dir != "/etc/nginx"
 
diff --git a/roles/nginx/templates/nginx.conf.j2 b/roles/nginx/templates/nginx.conf.j2
index 8f94b7426..f7659bed0 100644
--- a/roles/nginx/templates/nginx.conf.j2
+++ b/roles/nginx/templates/nginx.conf.j2
@@ -4,7 +4,7 @@
 
 user www-data;
 worker_processes auto;
-pid /run/nginx.pid;
+pid /run/{{ systemd_unit_name }}.pid;
 include {{ nginx_dir }}/modules-enabled/*.conf;
 
 events {