diff --git a/playbooks/dnszone/dnszone-reverse-from-ip.yml b/playbooks/dnszone/dnszone-reverse-from-ip.yml
index 218a31895d285096eb0a1ce75b18e304b77cccae..a8259c9be91a4f932d33b00212d681ede28671ef 100644
--- a/playbooks/dnszone/dnszone-reverse-from-ip.yml
+++ b/playbooks/dnszone/dnszone-reverse-from-ip.yml
@@ -11,5 +11,5 @@
     register: result
 
   - name: Zone name inferred from `name_from_ip`
-    debug:
+    ansible.builtin.debug:
       msg: "Zone created: {{ result.dnszone.name }}"
diff --git a/tests/dnszone/env_setup.yml b/tests/dnszone/env_setup.yml
index ce4378111367260b8d52a7c6a60ccc01b638355a..1518c506bc0caa80410323072714cb2ea574063d 100644
--- a/tests/dnszone/env_setup.yml
+++ b/tests/dnszone/env_setup.yml
@@ -1,3 +1,3 @@
 ---
 - name: Cleanup test environment.
-  include_tasks: env_cleanup.yml
+  ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/dnszone/env_teardown.yml b/tests/dnszone/env_teardown.yml
index ce4378111367260b8d52a7c6a60ccc01b638355a..1518c506bc0caa80410323072714cb2ea574063d 100644
--- a/tests/dnszone/env_teardown.yml
+++ b/tests/dnszone/env_teardown.yml
@@ -1,3 +1,3 @@
 ---
 - name: Cleanup test environment.
-  include_tasks: env_cleanup.yml
+  ansible.builtin.include_tasks: env_cleanup.yml
diff --git a/tests/dnszone/test_dnszone.yml b/tests/dnszone/test_dnszone.yml
index b7e01d4c669cc8d4b3ca0abbab40a00f8541a4fb..ef0f2d236c23acd962a863335e076461bcf879ce 100644
--- a/tests/dnszone/test_dnszone.yml
+++ b/tests/dnszone/test_dnszone.yml
@@ -8,7 +8,7 @@
 
   # Setup
   - name: Setup testing environment
-    include_tasks: env_setup.yml
+    ansible.builtin.include_tasks: env_setup.yml
 
   # Tests
   - name: Check if zone is present, when in shouldn't be.
@@ -267,4 +267,4 @@
 
   # Teardown
   - name: Teardown testing environment
-    include_tasks: env_teardown.yml
+    ansible.builtin.include_tasks: env_teardown.yml
diff --git a/tests/dnszone/test_dnszone_client_context.yml b/tests/dnszone/test_dnszone_client_context.yml
index 79a00ff11a4d311a575fd4079042d4f151a8a223..a2cf652b930fd4edf361d9740fb4126c4c8da94f 100644
--- a/tests/dnszone/test_dnszone_client_context.yml
+++ b/tests/dnszone/test_dnszone_client_context.yml
@@ -6,7 +6,7 @@
 
   tasks:
   - name: Include FreeIPA facts.
-    include_tasks: ../env_freeipa_facts.yml
+    ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   # Test will only be executed if host is not a server.
   - name: Execute with server context in the client.
@@ -27,13 +27,13 @@
 # in upstream CI.
 
 - name: Test dnszone using client context, in client host.
-  import_playbook: test_dnszone.yml
+  ansible.builtin.import_playbook: test_dnszone.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test dnszone using client context, in server host.
-  import_playbook: test_dnszone.yml
+  ansible.builtin.import_playbook: test_dnszone.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
   vars:
     ipa_context: client
diff --git a/tests/dnszone/test_dnszone_mod.yml b/tests/dnszone/test_dnszone_mod.yml
index 5bb33d683dea6e0c6e5cab5f040eca8f28007d49..5dbbe9e38b93d45c76b2e301aa6de3c17d13236f 100644
--- a/tests/dnszone/test_dnszone_mod.yml
+++ b/tests/dnszone/test_dnszone_mod.yml
@@ -8,7 +8,7 @@
 
   # Setup
   - name: Setup testing environment
-    include_tasks: env_setup.yml
+    ansible.builtin.include_tasks: env_setup.yml
 
   - name: Ensure zone is present.
     ipadnszone:
@@ -291,4 +291,4 @@
 
   # Teardown
   - name: Teardown testing environment
-    include_tasks: env_teardown.yml
+    ansible.builtin.include_tasks: env_teardown.yml
diff --git a/tests/dnszone/test_dnszone_name_from_ip.yml b/tests/dnszone/test_dnszone_name_from_ip.yml
index 62295742106f69d4fffb83437d044f770f7c7920..53afe23bbbbc283994752d075639e61719dfca4c 100644
--- a/tests/dnszone/test_dnszone_name_from_ip.yml
+++ b/tests/dnszone/test_dnszone_name_from_ip.yml
@@ -8,7 +8,7 @@
 
   # Setup
   - name: Setup testing environment
-    include_tasks: env_setup.yml
+    ansible.builtin.include_tasks: env_setup.yml
 
   # Tests
   - name: Ensure zone exists for reverse IP.
@@ -55,7 +55,7 @@
     register: ipv6_zone
     failed_when: not ipv6_zone.changed or ipv6_zone.failed
 
-  # - debug:
+  # - ansible.builtin.debug:
   #     msg: "{{ipv6_zone}}"
 
   - name: Ensure ipv6 zone was created.
@@ -95,4 +95,4 @@
 
   # Teardown
   - name: Teardown testing environment
-    include_tasks: env_teardown.yml
+    ansible.builtin.include_tasks: env_teardown.yml