diff --git a/tasks/main.yml b/tasks/main.yml
index 3180386a893688d9c5b59cd207d6871e8b15833a..b38c0209422031e9586ceda98bdf603e73adf1be 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -11,7 +11,7 @@
 
 - block:
 
-  - include: php.yml
+  - import_tasks: php.yml
 
   - name: "Link PhpEnMod for PHP 5.3"
     file:
diff --git a/tasks/php.yml b/tasks/php.yml
index 28edbbf20c89792550e6032fb24dea87f571e7dd..2a5f3da8c9a02d03e0efd2c0ee4afed79892c1f2 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -49,9 +49,8 @@
   notify:
     - "Apache | Restart Apache"
 
-- include_tasks: php53.yml
+- import_tasks: php53.yml
   when: php_version|default('5.5') == '5.3'
-  tags: 'always'
 
 - name: "PHP | Configuration file, fcgid.conf"
   template:
@@ -107,10 +106,10 @@
     owner=www-data
     group=www-data
 
-- include_tasks: oci-{{ php_version|default('5.5') }}.yml
+- import_tasks: oci-{{ php_version|default('5.5') }}.yml
   when: repository is defined and php_needs_oci8
 
-- include_tasks: msodbc.yml
+- import_tasks: msodbc.yml
   when: php_needs_msodbc
 
 - name: "PHP | Ensure ImageMagick config directory"