diff --git a/tasks/main.yml b/tasks/main.yml
index be234c2..b3c08d4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -30,19 +30,19 @@
     - always
 
 # TODO (jrosser) Remove this task for the Z release
-- include: repo_sync_cleanup.yml
+- ansible.builtin.include_tasks: repo_sync_cleanup.yml
   tags:
     - repo_server-install
 
-- include: repo_pre_install.yml
+- ansible.builtin.include_tasks: repo_pre_install.yml
   tags:
     - repo_server-install
 
-- include: repo_install.yml
+- ansible.builtin.include_tasks: repo_install.yml
   tags:
     - repo_server-install
 
-- include: repo_post_install.yml
+- ansible.builtin.include_tasks: repo_post_install.yml
   tags:
     - repo_server-config
 
@@ -52,7 +52,7 @@
     path: "{{ repo_service_home_folder }}/.ssh/authorized_keys"
     state: absent
 
-- include: repo_install_constraints.yml
+- ansible.builtin.include_tasks: repo_install_constraints.yml
   when: inventory_hostname == groups['repo_all'][0]
   tags: repo_server-config
 
diff --git a/tests/test.yml b/tests/test.yml
index ae3921a..665015a 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -14,10 +14,10 @@
 # limitations under the License.
 
 # Prepare the host
-- include: common/test-setup-host.yml
+- ansible.builtin.include_tasks: common/test-setup-host.yml
 
 # Install repo server
-- include: test-install-repo-server.yml
+- ansible.builtin.include_tasks: test-install-repo-server.yml
 
 # Test repo server
-- include: test-repo-server-functional.yml
+- ansible.builtin.include_tasks: test-repo-server-functional.yml