diff --git a/roles/web_server/tasks/main.yml b/roles/web_server/tasks/main.yml
index eef960fbd6586b5ba16e458de73175d366be3f32..f653362f7cf0fb4870a67edd5d893ca35e1f2821 100644
--- a/roles/web_server/tasks/main.yml
+++ b/roles/web_server/tasks/main.yml
@@ -144,7 +144,7 @@
     mode: 0750
   with_items:
     - "/run/wsgi/"
-    - "/run/php5-fpm/"
+    - "/run/{{ php_fpm_service_name }}/"
 
 - name: Create directories for storing per-site socket files on boot
   copy:
@@ -155,36 +155,36 @@
     mode: 0644
   with_items:
     - wsgi
-    - php5-fpm
+    - "{{ php_fpm_service_name }}"
 
 - name: Install base packages for PHP web applications
   apt:
     name: "{{ item }}"
     state: present
   with_items:
-    - php5-fpm
+    - "{{ php_fpm_package_name }}"
 
-- name: Create directory for storing PHP FPM service configuration overrides
+- name: Create directory for storing PHP-FPM service configuration overrides
   file:
-    path: "/etc/systemd/system/php5-fpm.service.d/"
+    path: "/etc/systemd/system/{{ php_fpm_service_name }}.service.d/"
     state: directory
     owner: root
     group: root
     mode: 0755
 
-- name: Configure php5-fpm service to run with umask 0007
+- name: Configure PHP-FPM service to run with umask 0007
   copy:
-    src: "php5_fpm_umask.conf"
-    dest: "/etc/systemd/system/php5-fpm.service.d/umask.conf"
+    src: "php_fpm_umask.conf"
+    dest: "/etc/systemd/system/{{ php_fpm_service_name }}.service.d/umask.conf"
     owner: root
     group: root
     mode: 0644
   notify:
-    - Restart php5-fpm
+    - Restart PHP-FPM
 
 - name: Enable service used for running PHP web applications
   service:
-    name: "php5-fpm"
+    name: "{{ php_fpm_service_name }}"
     enabled: true
     state: started
 
@@ -201,10 +201,10 @@
     group: root
     mode: 0644
   with_items:
-    - /etc/php5/cli/conf.d/
-    - /etc/php5/fpm/conf.d/
+    - "{{ php_base_config_dir }}/cli/conf.d/"
+    - "{{ php_base_config_dir }}/fpm/conf.d/"
   notify:
-    - Restart php5-fpm
+    - Restart PHP-FPM
 
 - name: Explicitly run all handlers
   include: ../handlers/main.yml