diff --git a/library/roles/nextcloud/vars/main.yml b/library/roles/nextcloud/vars/main.yml
index 3e98d2e..f131d0f 100644
--- a/library/roles/nextcloud/vars/main.yml
+++ b/library/roles/nextcloud/vars/main.yml
@@ -7,11 +7,8 @@ http_port: 80
 https_port: 443
 
 php_version: 7.2
-phpfpm_base_dir: '/etc/php/{{ php_version }}/fpm'
-phpfpm_cli_dir: '/etc/php/{{ php_version }}/cli'
 
-php_fpm_packages:
-  - 'php{{ php_version }}-fpm'
+php_additional_packages:
   - 'php{{ php_version }}-gd'
   - 'php{{ php_version }}-json'
   - 'php{{ php_version }}-ldap'
diff --git a/library/roles/php-fpm/defaults/main.yml b/library/roles/php-fpm/defaults/main.yml
index 02ca077..44896d2 100644
--- a/library/roles/php-fpm/defaults/main.yml
+++ b/library/roles/php-fpm/defaults/main.yml
@@ -9,13 +9,13 @@ php_from_ppa: False
 php_ppa: ppa:ondrej/php
 php_version: 7.2
 
-phpfpm_base_dir: '/etc/php{{ php_version }}/fpm'
-phpfpm_cli_dir: '/etc/php{{ php_version }}/cli'
-# Change to when using the PPA
-# phpfpm_base_dir: '/etc/php/{{ php_version }}/fpm'
+phpfpm_root_dir: '/etc/php/{{ php_version }}'
+phpfpm_base_dir: '{{ phpfpm_root_dir }}/fpm'
+phpfpm_cli_dir: '{{ phpfpm_root_dir }}/cli'
 
 php_fpm_packages:
   - 'php{{ php_version }}-fpm'
+  - 'php{{ php_version }}-cli'
 
 #php_global_settings:
 #  - { option: '', value: '', state: '' }