diff --git a/roles/web_server/tasks/main.yml b/roles/web_server/tasks/main.yml
index f74c1629498239cafd7c6e5a1166e5b6c012cdba..2966ad4f7e69296e320aa5123ee29f7910aaf69b 100644
--- a/roles/web_server/tasks/main.yml
+++ b/roles/web_server/tasks/main.yml
@@ -138,25 +138,27 @@
 
 - name: Create directories for storing per-site socket files
   file:
-    path: "{{ item }}"
+    path: "/run/{{ item }}"
     state: directory
     owner: root
     group: www-data
     mode: 0750
   with_items:
-    - "/run/wsgi/"
-    - "/run/{{ php_fpm_service_name }}/"
+    - wsgi
+    - php
 
 - name: Create directories for storing per-site socket files on boot
   copy:
-    content: "d /run/{{ item }}/ 0750 root www-data - -"
-    dest: "/etc/tmpfiles.d/{{ item }}.conf"
+    content: "d /run/{{ item.socket_dir }}/ 0750 root www-data - -"
+    dest: "/etc/tmpfiles.d/{{ item.tmpfiles_d }}"
     owner: root
     group: root
     mode: 0644
   with_items:
-    - wsgi
-    - "{{ php_fpm_service_name }}"
+    - socket_dir: wsgi
+      tmpfiles_d: "wsgi.conf"
+    - socket_dir: php
+      tmpfiles_d: "{{ php_fpm_service_name }}.conf"
 
 - name: Install base packages for PHP web applications
   apt: