diff --git a/tasks/main.yml b/tasks/main.yml
index 13356e8a..410d2300 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -67,22 +67,22 @@
     - common-mq
     - glance-config
 
-- include_tasks: glance_db_setup.yml
+- import_tasks: glance_db_setup.yml
   when:
     - "glance_services['glance-api']['group'] in group_names"
     - "inventory_hostname == ((groups[glance_services['glance-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - glance-config
 
-- include_tasks: glance_service_setup.yml
+- import_tasks: glance_service_setup.yml
   when:
     - "glance_services['glance-api']['group'] in group_names"
     - "inventory_hostname == ((groups[glance_services['glance-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
   tags:
     - glance-config
 
-- name: Include ceph_client role
-  include_role:
+- name: Import ceph_client role
+  import_role:
     name: ceph_client
   vars:
     openstack_service_system_user: "{{ glance_system_user_name }}"