diff --git a/tasks/install.yml b/tasks/install.yml
index 587619637667bf6815efaa3ae96add449a97b9d9..ebb34e2abbd66245574ee98e830f42d4dcada67c 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -24,7 +24,7 @@
   tags: always
 
 - name: "Configure Apache"
-  include: apache.yml
+  include_tasks: apache.yml
   with_items: '{{ drupal.domains }}'
   loop_control:
     loop_var: drupal_domain
@@ -58,17 +58,17 @@
     when: drupal_install_drupal and drupal_available is defined and drupal_available.stdout != [drupalRoot, '/index.php']|join('')
   tags: always
 
-- include: install/{{ installSource.mode|default("none") }}.yml
+- include_tasks: install/{{ installSource.mode|default("none") }}.yml
   when: drupal_first_installation
 
-- include: install/{{ drupal.version|default("d7") }}.yml
+- include_tasks: install/{{ drupal.version|default("d7") }}.yml
   when: drupal_first_installation
 
-- include: deploy/{{ installSource.mode|default("none") }}.yml
+- include_tasks: deploy/{{ installSource.mode|default("none") }}.yml
   when: drupal_install_drupal
   tags: 'deploy'
 
-- include: deploy/{{ drupal.version|default("d7") }}.yml
+- include_tasks: deploy/{{ drupal.version|default("d7") }}.yml
   when: drupal_install_drupal
   tags: 'deploy'
 
@@ -80,13 +80,13 @@
   with_items: '{{ drupal.links|default([]) }}'
   tags: 'deploy'
 
-- include: scss.yml
+- include_tasks: scss.yml
   with_items: '{{ drupal.scss_dir|default([]) }}'
   loop_control:
     loop_var: scss_dir
   tags: 'deploy'
 
-- include: users/{{ installSource.mode|default("none") }}.yml
+- include_tasks: users/{{ installSource.mode|default("none") }}.yml
   when: drupal_install_drupal and drupal.src is defined and drupal.src.name is defined
   tags: 'SetPermissions'
 
@@ -115,7 +115,7 @@
   with_items: '{{ drupal.domains }}'
   when: item.install|default(true)
 
-- include: files.yml
+- include_tasks: files.yml
   with_nested:
     - '{{ drupal.domains }}'
     - ['files', 'private']
@@ -152,7 +152,7 @@
   with_items: '{{ drupal.domains }}'
   when: item.install|default(true)
 
-- include: deploy/finalize_{{ drupal.version|default("d7") }}.yml
+- include_tasks: deploy/finalize_{{ drupal.version|default("d7") }}.yml
   when: drupal_install_drupal
   tags: 'deploy'
 
@@ -201,7 +201,7 @@
   tags: 'deploy'
 
 - name: "Install Drupal Databases and Users"
-  include: mysql.yml
+  include_tasks: mysql.yml
   with_items: '{{ drupal.domains }}'
   loop_control:
     loop_var: drupal_domain
diff --git a/tasks/main.yml b/tasks/main.yml
index 5acd0ac02a96b20fc4d8e81c1c779a589aa0e257..676b0c67c9ec3c3aa094285540ff9e7df1afefd2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - block:
   - name: "Install Certs"
-    include: '../../letsencrypt/tasks/cert.yml'
+    include_tasks: '../../letsencrypt/tasks/cert.yml'
     with_subelements:
       - '{{ drupal_settings }}'
       - domains
@@ -20,7 +20,7 @@
 
 - block:
   - name: "Install Drupal"
-    include: install.yml
+    include_tasks: install.yml
     with_items: '{{ drupal_settings }}'
     loop_control:
       loop_var: drupal