diff --git a/extras/os-monasca-agent-install.yml b/extras/os-monasca-agent-install.yml
index 7d2ced9..becaa8c 100644
--- a/extras/os-monasca-agent-install.yml
+++ b/extras/os-monasca-agent-install.yml
@@ -16,14 +16,13 @@
   gather_facts: "{{ gather_facts | default(True) }}"
   user: root
   pre_tasks:
-    - include: common-tasks/os-lxc-container-setup.yml
-      static: no
-    - include: common-tasks/os-log-dir-setup.yml
+    - include_tasks: common-tasks/os-lxc-container-setup.yml
+    - include_tasks: common-tasks/os-log-dir-setup.yml
       vars:
         log_dirs:
           - src: "/openstack/log/{{ inventory_hostname }}-monasca"
             dest: "/var/log/monasca"
-    - include: common-tasks/package-cache-proxy.yml
+    - include_tasks: common-tasks/package-cache-proxy.yml
   roles:
     - role: "os_monasca-agent"
     - role: "openstack_openrc"
diff --git a/tasks/main.yml b/tasks/main.yml
index 22ee293..3bc7c22 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -23,19 +23,19 @@
   tags:
     - always
 
-- include: monasca_agent_pre_install.yml
+- include_tasks: monasca_agent_pre_install.yml
   tags:
     - monasca-agent-install
 
-- include: monasca_agent_install.yml
+- include_tasks: monasca_agent_install.yml
   tags:
     - monasca-agent-install
 
-- include: monasca_agent_post_install.yml
+- include_tasks: monasca_agent_post_install.yml
   tags:
     - monasca-agent-config
 
-- include: monasca_agent_init_{{ ansible_service_mgr }}.yml
+- include_tasks: monasca_agent_init_{{ ansible_service_mgr }}.yml
   tags:
     - monasca-agent-config
 
diff --git a/tests/test.yml b/tests/test.yml
index 55956f0..1b5d6d9 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 # Setup the host
-- include: common/test-setup-host.yml
+- import_playbook: common/test-setup-host.yml
 
 # Install monasca-agent
-- include: test-install-monasca-agent.yml
+- import_playbook: test-install-monasca-agent.yml