diff --git a/roles/matrix-bot-maubot/tasks/main.yml b/roles/matrix-bot-maubot/tasks/main.yml
index c67e25ee7..773f4b9fa 100644
--- a/roles/matrix-bot-maubot/tasks/main.yml
+++ b/roles/matrix-bot-maubot/tasks/main.yml
@@ -1,22 +1,22 @@
 ---
 
-- import_tasks: "{{ role_path }}/tasks/init.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always
 
-- import_tasks: "{{ role_path }}/tasks/validate_config.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/validate_config.yml"
   when: "run_setup|bool and matrix_bot_maubot_enabled|bool"
   tags:
     - setup-all
     - setup-bot-maubot
 
-- import_tasks: "{{ role_path }}/tasks/setup_install.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_install.yml"
   when: "run_setup|bool and matrix_bot_maubot_enabled|bool"
   tags:
     - setup-all
     - setup-bot-maubot
 
-- import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"
   when: "run_setup|bool and not matrix_bot_maubot_enabled|bool"
   tags:
     - setup-all
diff --git a/roles/matrix-conduit/tasks/conduit/setup.yml b/roles/matrix-conduit/tasks/conduit/setup.yml
index fa095f669..425d0f7e9 100644
--- a/roles/matrix-conduit/tasks/conduit/setup.yml
+++ b/roles/matrix-conduit/tasks/conduit/setup.yml
@@ -1,7 +1,7 @@
 ---
 
-- import_tasks: "{{ role_path }}/tasks/conduit/setup_install.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/conduit/setup_install.yml"
   when: "matrix_conduit_enabled | bool"
 
-- import_tasks: "{{ role_path }}/tasks/conduit/setup_uninstall.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/conduit/setup_uninstall.yml"
   when: "not matrix_conduit_enabled | bool"
diff --git a/roles/matrix-conduit/tasks/main.yml b/roles/matrix-conduit/tasks/main.yml
index c8862bd77..623d04582 100644
--- a/roles/matrix-conduit/tasks/main.yml
+++ b/roles/matrix-conduit/tasks/main.yml
@@ -1,10 +1,10 @@
 ---
 
-- import_tasks: "{{ role_path }}/tasks/init.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/init.yml"
   tags:
     - always
 
-- import_tasks: "{{ role_path }}/tasks/conduit/setup.yml"
+- ansible.builtin.import_tasks: "{{ role_path }}/tasks/conduit/setup.yml"
   when: run_setup | bool
   tags:
     - setup-all