diff --git a/meta/main.yml b/meta/main.yml
index 4c382fc4..e8e7ff6d 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
   description: Installation and setup of nova
   company: Rackspace
   license: Apache2
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   platforms:
     - name: Ubuntu
       versions:
diff --git a/tasks/consoles/nova_console_novnc_install.yml b/tasks/consoles/nova_console_novnc_install.yml
index ee5b8120..3a9c6543 100644
--- a/tasks/consoles/nova_console_novnc_install.yml
+++ b/tasks/consoles/nova_console_novnc_install.yml
@@ -79,8 +79,7 @@
   tags:
     - nova-pip-packages
 
-- include: consoles/nova_console_novnc_ssl.yml
-  static: no
+- include_tasks: consoles/nova_console_novnc_ssl.yml
   when:
     - nova_console_user_ssl_cert is defined
     - nova_console_user_ssl_key is defined
diff --git a/tasks/drivers/kvm/nova_compute_kvm.yml b/tasks/drivers/kvm/nova_compute_kvm.yml
index fdc2e685..c8992637 100644
--- a/tasks/drivers/kvm/nova_compute_kvm.yml
+++ b/tasks/drivers/kvm/nova_compute_kvm.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: nova_compute_kvm_install.yml
+- include_tasks: nova_compute_kvm_install.yml
   tags:
     - nova-install
 
@@ -34,7 +34,7 @@
     - nova-kvm
 
 - name: Set kernel permissions to enable libguestfs features (Ubuntu)
-  include: nova_kernel_permissions.yml
+  include_tasks: nova_kernel_permissions.yml
   when:
     - ansible_distribution == 'Ubuntu'
     - nova_libvirt_inject_key | bool or nova_libvirt_inject_password | bool
@@ -127,19 +127,19 @@
     - nova-kvm
     - nova-libvirt
 
-- include: nova_disable_smt.yml
+- include_tasks: nova_disable_smt.yml
   when:
     - ansible_architecture == 'ppc64le'
   tags:
     - nova-config
 
-- include: nova_enable_ksm.yml
+- include_tasks: nova_enable_ksm.yml
   when:
     - nova_compute_ksm_enabled | bool
   tags:
     - nova-config
 
-- include: nova_compute_kvm_virsh_net_remove.yml
+- include_tasks: nova_compute_kvm_virsh_net_remove.yml
   tags:
     - nova-config
     - nova-kvm
diff --git a/tasks/main.yml b/tasks/main.yml
index 729f2047..7080fb8d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -53,17 +53,16 @@
   tags:
     - always
 
-- include: nova_virt_detect.yml
-  static: no
+- include_tasks: nova_virt_detect.yml
   tags:
     - always
     - nova-config
 
-- include: nova_pre_install.yml
+- include_tasks: nova_pre_install.yml
   tags:
     - nova-install
 
-- include: nova_install.yml
+- include_tasks: nova_install.yml
   tags:
     - nova-install
 
@@ -74,36 +73,33 @@
   tags:
     - nova-config
 
-- include: nova_post_install.yml
+- include_tasks: nova_post_install.yml
   tags:
     - nova-config
 
-- include: nova_db_setup.yml
-  static: no
+- include_tasks: nova_db_setup.yml
   when:
     - "nova_services['nova-conductor']['group'] in group_names"
     - "inventory_hostname == ((groups['nova_conductor'] | intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - nova-config
 
-- include: nova_uwsgi.yml
+- include_tasks: nova_uwsgi.yml
   tags:
     - nova-config
 
-- include: "nova_init_{{ ansible_service_mgr}}.yml"
+- include_tasks: "nova_init_{{ ansible_service_mgr}}.yml"
   tags:
     - nova-config
 
-- include: nova_service_setup.yml
-  static: no
+- include_tasks: nova_service_setup.yml
   when:
     - "nova_services['nova-conductor']['group'] in group_names"
     - "inventory_hostname == ((groups['nova_conductor'] | intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - nova-config
 
-- include: nova_compute.yml
-  static: no
+- include_tasks: nova_compute.yml
   when:
     - "nova_services['nova-compute']['group'] in group_names"
   tags:
@@ -132,7 +128,7 @@
 # Also, we delegate this to a random host in the
 # conductor group in order to spread the load of
 # multiple forks across the group members.
-- include: nova_db_post_setup.yml
+- include_tasks: nova_db_post_setup.yml
   delegate_to: "{{ conductor_host }}"
   with_random_choice: "{{ groups['nova_conductor'] }}"
   loop_control:
diff --git a/tasks/nova_compute.yml b/tasks/nova_compute.yml
index adfa793d..c0bf7f5a 100644
--- a/tasks/nova_compute.yml
+++ b/tasks/nova_compute.yml
@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: "drivers/{{ nova_virt_type }}/nova_compute_{{ nova_virt_type }}.yml"
+- include_tasks: "drivers/{{ nova_virt_type }}/nova_compute_{{ nova_virt_type }}.yml"
   tags:
     - nova-install
 
-- include: nova_compute_key_populate.yml
+- include_tasks: nova_compute_key_populate.yml
   tags:
     - nova-config
 
-- include: nova_compute_key_distribute.yml
+- include_tasks: nova_compute_key_distribute.yml
   tags:
     - nova-config
diff --git a/tasks/nova_install.yml b/tasks/nova_install.yml
index b7ed3902..e0ce55c1 100644
--- a/tasks/nova_install.yml
+++ b/tasks/nova_install.yml
@@ -14,8 +14,7 @@
 # limitations under the License.
 
 - name: Setup powervm repository
-  include: nova_install_apt_powervm.yml
-  static: no
+  include_tasks: nova_install_apt_powervm.yml
   when:
     - "nova_services['nova-compute']['group'] in group_names"
     - "nova_virt_type == 'powervm'"
@@ -167,7 +166,7 @@
     - skip_ansible_lint
     - nova-pip-packages
 
-- include: "consoles/nova_console_{{ nova_console_type }}_install.yml"
+- include_tasks: "consoles/nova_console_{{ nova_console_type }}_install.yml"
   when:
     - "nova_services['nova-novncproxy']['group'] in group_names or
         nova_services['nova-spicehtml5proxy']['group'] in group_names or
diff --git a/tasks/nova_post_install.yml b/tasks/nova_post_install.yml
index 49ffa2cc..394f649c 100644
--- a/tasks/nova_post_install.yml
+++ b/tasks/nova_post_install.yml
@@ -84,7 +84,7 @@
     - sudoers
     - nova-sudoers
 
-- include: nova_selinux.yml
+- include_tasks: nova_selinux.yml
   when:
     - ansible_selinux.status is defined
     - ansible_selinux.status == "enabled"