diff --git a/meta/main.yml b/meta/main.yml
index 9db8c759..a499d63f 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -18,7 +18,7 @@ galaxy_info:
   description: Base host setup for a OpenStack Private Cloud host
   company: Rackspace
   license: Apache2
-  min_ansible_version: 1.6.6
+  min_ansible_version: 2.4
   platforms:
     - name: Ubuntu
       versions:
diff --git a/tasks/configure_metal_hosts.yml b/tasks/configure_metal_hosts.yml
index de2227e8..8262e84d 100644
--- a/tasks/configure_metal_hosts.yml
+++ b/tasks/configure_metal_hosts.yml
@@ -83,7 +83,7 @@
   failed_when: false
 
 - name: Configure sysstat
-  include: openstack_sysstat.yml
+  include_tasks: openstack_sysstat.yml
   when: openstack_host_sysstat_enabled | bool
 
 - name: Create a directory to hold systemd journals on disk
diff --git a/tasks/main.yml b/tasks/main.yml
index 3d6d5fb9..4cc4b409 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -32,7 +32,7 @@
     - openstack_hosts-install
 
 # Drop the release file everywhere
-- include: openstack_release.yml
+- include_tasks: openstack_release.yml
   tags:
     - openstack_hosts-install
 
@@ -49,7 +49,7 @@
 
 # Configure host files should apply to all nodes
 - name: Configure etc hosts files
-  include: openstack_update_hosts_file.yml
+  include_tasks: openstack_update_hosts_file.yml
   when: openstack_host_manage_hosts_file | bool
   tags:
     - openstack_hosts-config
@@ -59,10 +59,10 @@
 # It is also used for installing common packages to
 # all nodes
 - name: Apply package management distro specific configuration
-  include: "openstack_hosts_configure_{{ ansible_pkg_mgr | lower }}.yml"
+  include_tasks: "openstack_hosts_configure_{{ ansible_pkg_mgr | lower }}.yml"
 
 # Configure bare metal nodes: Kernel, sysctl, sysstat, hosts files, metal packages
-- include: configure_metal_hosts.yml
+- include_tasks: configure_metal_hosts.yml
   when:
     - not is_container
   tags:
@@ -77,6 +77,6 @@
   tags:
     - openstack_hosts-install
 
-- include: openstack_authorized_keys.yml
+- include_tasks: openstack_authorized_keys.yml
   tags:
-    - openstack_hosts-config
\ No newline at end of file
+    - openstack_hosts-config