diff --git a/tasks/jailkit.yml b/tasks/jailkit.yml
index 3cd115af83fe90720613a439ece2d082b3d73519..41bdf926893468ff58e06cf6cdd7b5b8c6197418 100644
--- a/tasks/jailkit.yml
+++ b/tasks/jailkit.yml
@@ -3,12 +3,7 @@
 ---
 # file: roles/jailkit/tasks/jailkit.yml
 
-- block:
-  - set_fact: phpFpmService='php5-fpm'
-  - set_fact: phpFpmService='php-fpm'
-    when: php_version_main|default('7') == '5'
-  - set_fact: phpFpmService='php7.0-fpm'
-    when: php_version_main|default('7') == '7'
+- include_tasks: '../../php/tasks/variables.yml'
   tags: 'always'
 
 - name: "Reset Permissions in User Homes"
diff --git a/templates/jk_init.ini b/templates/jk_init.ini
index 1adb996af4f5d203abc05f7301fabe11e166b41c..c380387631f62983c231acf81040fbc320784ef0 100644
--- a/templates/jk_init.ini
+++ b/templates/jk_init.ini
@@ -170,7 +170,7 @@ executables = /usr/local/bin/php
 directories = /usr/lib/php5, /usr/share/php, /usr/share/php5, /etc/php5, /usr/share/zoneinfo, /usr/local/lib/php/extensions
 {% elif php_version_main|default('7') == '7' %}
 executables = /usr/bin/php
-directories = /usr/lib/php, /usr/share/php, /usr/share/php7.0-*, /etc/php, /usr/share/zoneinfo
+directories = /usr/lib/php, /usr/share/php, /usr/share/php{{php_version|default("7.0")}}-*, /etc/php, /usr/share/zoneinfo
 {% else %}
 executables = /usr/bin/php5
 directories = /usr/lib/php5, /usr/share/php, /usr/share/php5, /etc/php5, /usr/share/zoneinfo