diff --git a/roles/php_website/templates/fpm_site.conf.j2 b/roles/php_website/templates/fpm_site.conf.j2
index f584adcc7926ab9bd104202d298ec50607327842..566162f9d2827ed943f2a50758d50f657465d895 100644
--- a/roles/php_website/templates/fpm_site.conf.j2
+++ b/roles/php_website/templates/fpm_site.conf.j2
@@ -6,7 +6,7 @@ user = {{ user }}
 group = {{ user }}
 
 ; Listen on a dedicated UNIX socket.
-listen = /var/run/{{ php_fpm_service_name }}/{{ fqdn }}.sock
+listen = /run/php/{{ fqdn }}.sock
 
 ; Set-up UNIX socket permissions (allow web server to connect).
 listen.owner = www-data
diff --git a/roles/php_website/templates/nginx_site.j2 b/roles/php_website/templates/nginx_site.j2
index 4bee58e8710aca2cc7e7a10f16df72fc366d3131..dddef2f098f714bd41164cab5e7cc4c3d888d938 100644
--- a/roles/php_website/templates/nginx_site.j2
+++ b/roles/php_website/templates/nginx_site.j2
@@ -56,7 +56,7 @@ server {
     # Interpret PHP files via FastCGI.
     location ~ {{ php_file_regex }} {
         include snippets/fastcgi-php.conf;
-        fastcgi_pass unix:/var/run/{{ php_fpm_service_name }}/{{ fqdn }}.sock;
+        fastcgi_pass unix:/run/php/{{ fqdn }}.sock;
     }
 
     # Serve the files.