diff --git a/tasks/main.yml b/tasks/main.yml
index 6e693b77..08f2c7d3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -40,60 +40,60 @@
     - always
 
 # Check the swift_hash_path_* variables haven't changed
-- include_tasks: swift_check_hashes.yml
+- import_tasks: swift_check_hashes.yml
   when:
     - "not swift_force_change_hashes | bool"
   tags:
     - swift-config
 
-- include_tasks: swift_pre_install.yml
+- import_tasks: swift_pre_install.yml
   when:
     - "swift_do_setup | bool"
     - "'swift_all' in group_names"
   tags:
     - swift-install
 
-- include_tasks: swift_install.yml
+- import_tasks: swift_install.yml
   when:
     - "swift_do_setup | bool"
     - "'swift_all' in group_names"
   tags:
     - swift-install
 
-- include_tasks: swift_post_install.yml
+- import_tasks: swift_post_install.yml
   when:
     - "swift_do_setup | bool"
     - "'swift_all' in group_names"
   tags:
     - swift-config
 
-- include_tasks: swift_calculate_addresses.yml
+- import_tasks: swift_calculate_addresses.yml
   when:
     - "'swift_hosts' in group_names"
   tags:
     - always
 
-- include_tasks: swift_storage_hosts.yml
+- import_tasks: swift_storage_hosts.yml
   when:
     - "swift_do_setup | bool"
     - "'swift_hosts' in group_names"
   tags:
     - swift-config
 
-- include_tasks: swift_proxy_hosts.yml
+- import_tasks: swift_proxy_hosts.yml
   when:
     - "swift_do_setup | bool"
     - "'swift_proxy' in group_names"
   tags:
     - swift-config
 
-- include_tasks: swift_key_setup.yml
+- import_tasks: swift_key_setup.yml
   when:
     - "swift_do_sync | bool"
   tags:
     - swift-config
 
-- include_tasks: swift_rings.yml
+- import_tasks: swift_rings.yml
   when:
     - "swift_do_sync | bool"
   tags:
@@ -101,7 +101,7 @@
     - swift-rings
 
 - name: Run the systemd service role
-  include_role:
+  import_role:
     name: systemd_service
   vars:
     systemd_user_name: "{{ swift_system_user_name }}"
@@ -148,7 +148,7 @@
     - common-mq
     - swift-config
 
-- include_tasks: swift_service_setup.yml
+- import_tasks: swift_service_setup.yml
   when:
     - "swift_do_setup | bool"
     - '"keystoneauth" in swift_middleware_list'