diff --git a/apt/tasks/main.yml b/apt/tasks/main.yml
index b861f4ea53a6353f3755524e79935230cee56e8d..2b1e468a0ae7a445dd14f3a2245d88ac61687615 100644
--- a/apt/tasks/main.yml
+++ b/apt/tasks/main.yml
@@ -13,11 +13,11 @@
     - apt
     - repos
 
-- include: repositories.yml
+- import_tasks: repositories.yml
   vars:
     src: ''
 
-- include: repositories.yml
+- import_tasks: repositories.yml
   when: apt_src_enable
   vars:
     src: '-src'
diff --git a/basic-system/tasks/main.yml b/basic-system/tasks/main.yml
index 6b38272e797574a1eb95e3af7efa89c84a579a90..0781cb0fd57a2f2883a450e189d33c3dc4e34924 100644
--- a/basic-system/tasks/main.yml
+++ b/basic-system/tasks/main.yml
@@ -65,7 +65,7 @@
   tags:
     - fstrim
 
-- include: logging.yml
+- import_tasks: logging.yml
 - meta: flush_handlers
-- include: network.yml
+- import_tasks: network.yml
 - meta: flush_handlers
diff --git a/localization/tasks/main.yml b/localization/tasks/main.yml
index 41a1cc7abec9eacc2da9120adf0f24811ed40939..add72f5d27cb4ba52d27cbde353c0276d0505347 100644
--- a/localization/tasks/main.yml
+++ b/localization/tasks/main.yml
@@ -1,15 +1,15 @@
 ---
 
-- include: locale.yml
+- import_tasks: locale.yml
 - meta: flush_handlers
 
-- include: timezone.yml
+- import_tasks: timezone.yml
 - meta: flush_handlers
 
-- include: ntpd.yml
+- import_tasks: ntpd.yml
   when: not localization_prefer_timesyncd
 
-- include: timesyncd.yml
+- import_tasks: timesyncd.yml
   when: localization_prefer_timesyncd
 
 - meta: flush_handlers
diff --git a/shell/tasks/main.yml b/shell/tasks/main.yml
index 4ba3e3cddd2dea147966bb27c52081a4ac22b1e5..a587b73252820677d24e31af8d87de774407d0da 100644
--- a/shell/tasks/main.yml
+++ b/shell/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 
-- include: shell.yml
+- import_tasks: shell.yml
 - meta: flush_handlers
-- include: sudo.yml
+- import_tasks: sudo.yml
 - meta: flush_handlers