diff --git a/defaults/main.yml b/defaults/main.yml
index fdf31ee81d6a45a39a94cc9f8593d4d3dd6f1cba..892ccdf640b9ab713d33ee691b83cd81be8ea6de 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,3 +1,6 @@
+php_version: '7.0'
+php_version_main: '7'
+
 php_install_redis: true
 php_hold_version: false
 php_repositories: []
diff --git a/tasks/oci-7.yml b/tasks/oci-7.0.yml
similarity index 100%
rename from tasks/oci-7.yml
rename to tasks/oci-7.0.yml
diff --git a/tasks/php.yml b/tasks/php.yml
index a5c981f2f8c523b9ea6ab1071f56e4ee3cdffcc7..57de4ca08460cdadea5597720e8779be7c5c416f 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -23,12 +23,12 @@
 
 - name: "PHP | Install PECL packages"
   shell: 'pecl install --soft imagick-3.3.0'
-  when: php_version|default('5.5') != '7'
+  when: php_version_main|default('7') != '7'
   ignore_errors: true
 
 - name: "PHP | Install PECL packages"
   shell: 'pecl install --soft oauth'
-  when: php_version|default('5.5') == '7'
+  when: php_version_main|default('7') == '7'
   ignore_errors: true
 
 - name: "PHP | Ensure Apache config directory"
@@ -134,17 +134,17 @@
     owner=root
     group=root
     mode='644'
-  when: (php_version|default('5.5') == '7') and (jailkit is not defined or not jailkit)
+  when: (php_version_main|default('7') == '7') and (jailkit is not defined or not jailkit)
 
 - block:
   - set_fact:
       phpLogRotatePrefix='7.0'
       phpLibPrefix=''
-    when: php_version|default('5.5') == '7'
+    when: php_version_main|default('7') == '7'
   - set_fact:
       phpLogRotatePrefix='5'
       phpLibPrefix='5'
-    when: php_version|default('5.5') != '7'
+    when: php_version_main|default('7') != '7'
 
   - name: "Install logrotate script"
     template:
diff --git a/templates/etc-php5-apache2-php.ini b/templates/etc-php5-apache2-php.ini
index ac69b8fbcb3537325e40bd347d2f8be1343f5c53..ae9ade35d7ea31be2aebcf2bde7db30fa1fc40fc 100644
--- a/templates/etc-php5-apache2-php.ini
+++ b/templates/etc-php5-apache2-php.ini
@@ -1988,7 +1988,7 @@ extension=imagick.so
 extension=xmlrpc.so
 {% endif %}
 
-{% if php_version|default('5.5') == '7' %}
+{% if php_version_main|default('7') == '7' %}
 [oauth]
 extension=oauth.so
 {% endif %}