diff --git a/roles/web_server/tasks/main.yml b/roles/web_server/tasks/main.yml
index 1c9e57cb2c9b972818b99eaf37168c3a4c2fe045..1f596b8c03bdef06beea28bca0019c8aa067276f 100644
--- a/roles/web_server/tasks/main.yml
+++ b/roles/web_server/tasks/main.yml
@@ -55,17 +55,20 @@
 - name: Install base packages for Python web applications
   apt: name="{{ item }}" state=installed
   with_items:
-    - supervisor
     - virtualenv
     - virtualenvwrapper
 
+- name: Create directory where WSGI will store per-site socket files
+  file: path="/run/wsgi/" state="directory"
+        owner="root" group="www-data" mode="771"
+
 - name: Install base packages for PHP web applications
   apt: name="{{ item }}" state=installed
   with_items:
     - php5-fpm
 
 - name: Create directory where PHP FPM will store per-site socket files
-  file: path="/var/run/php5-fpm/" state="directory"
+  file: path="/run/php5-fpm/" state="directory"
         owner="root" group="www-data" mode="770"
 
 - name: Create directory for storing PHP FPM service configuration overrides
@@ -78,11 +81,8 @@
   notify:
     - Restart php5-fpm
 
-- name: Enable services used for running web applications
-  service: name="{{ item }}" enabled=yes state=started
-  with_items:
-    - php5-fpm
-    - supervisor
+- name: Enable service used for running PHP web applications
+  service: name="php5-fpm" enabled=yes state=started
 
 - name: Read timezone on server
   slurp: src=/etc/timezone