diff --git a/tests/servicedelegationrule/test_servicedelegationrule_client_context.yml b/tests/servicedelegationrule/test_servicedelegationrule_client_context.yml
index 03546ffc179fd831eeaaaca9be320810c84ac268..4e633728e77ed9e143a2ece5c0ffca105e5b1e85 100644
--- a/tests/servicedelegationrule/test_servicedelegationrule_client_context.yml
+++ b/tests/servicedelegationrule/test_servicedelegationrule_client_context.yml
@@ -8,7 +8,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.
@@ -29,11 +29,11 @@
 # in upstream CI.
 
 - name: Test servicedelegationrule using client context, in client host.
-  import_playbook: test_servicedelegationrule.yml
+  ansible.builtin.import_playbook: test_servicedelegationrule.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test servicedelegationrule using client context, in server host.
-  import_playbook: test_servicedelegationrule.yml
+  ansible.builtin.import_playbook: test_servicedelegationrule.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
diff --git a/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml b/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml
index f0f79a76e69278b885fb9657895aa06473571ece..4d0bd7641454f2efe33b2fde154677b398e90e03 100644
--- a/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml
+++ b/tests/servicedelegationrule/test_servicedelegationrule_hostprincipal.yml
@@ -6,7 +6,7 @@
 
   tasks:
   # setup
-  - include_tasks: ../env_freeipa_facts.yml
+  - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   # host principals are only possible with IPA 4.9.0+
   - block:
@@ -14,17 +14,17 @@
     # SET FACTS
 
     - name: Get Domain from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Get REALM from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_realm: "{{ ipaserver_domain | upper }}"
       when: ipaserver_realm is not defined
 
     - name: Set test-host fqdn
-      set_fact:
+      ansible.builtin.set_fact:
         test_host_fqdn: "{{ 'test-host.' + ipaserver_domain }}"
         test_host_fqdn_realm: "{{ 'test-host.' + ipaserver_domain + '@' + ipaserver_realm }}"
 
diff --git a/tests/servicedelegationtarget/test_servicedelegationtarget_client_context.yml b/tests/servicedelegationtarget/test_servicedelegationtarget_client_context.yml
index 04927b93d064517fafe81a73f996cd12c560c950..cf1a9d9e9d135c3392c4e3aef8afa7f850841b39 100644
--- a/tests/servicedelegationtarget/test_servicedelegationtarget_client_context.yml
+++ b/tests/servicedelegationtarget/test_servicedelegationtarget_client_context.yml
@@ -8,7 +8,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.
@@ -29,11 +29,11 @@
 # in upstream CI.
 
 - name: Test servicedelegationtarget using client context, in client host.
-  import_playbook: test_servicedelegationtarget.yml
+  ansible.builtin.import_playbook: test_servicedelegationtarget.yml
   when: groups['ipaclients']
   vars:
     ipa_test_host: ipaclients
 
 - name: Test servicedelegationtarget using client context, in server host.
-  import_playbook: test_servicedelegationtarget.yml
+  ansible.builtin.import_playbook: test_servicedelegationtarget.yml
   when: groups['ipaclients'] is not defined or not groups['ipaclients']
diff --git a/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml b/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml
index f59d0c45136585f393039377219369c342347562..aedfc69728ecc48dd4e680d3028b9bc4b3f10ab9 100644
--- a/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml
+++ b/tests/servicedelegationtarget/test_servicedelegationtarget_hostprincipal.yml
@@ -6,7 +6,7 @@
 
   tasks:
   # setup
-  - include_tasks: ../env_freeipa_facts.yml
+  - ansible.builtin.include_tasks: ../env_freeipa_facts.yml
 
   # host principals are only possible with IPA 4.9.0+
   - block:
@@ -14,17 +14,17 @@
     # SET FACTS
 
     - name: Get Domain from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_domain: "{{ ansible_facts['fqdn'].split('.')[1:] | join ('.') }}"
       when: ipaserver_domain is not defined
 
     - name: Get REALM from server name
-      set_fact:
+      ansible.builtin.set_fact:
         ipaserver_realm: "{{ ipaserver_domain | upper }}"
       when: ipaserver_realm is not defined
 
     - name: Set test-host fqdn
-      set_fact:
+      ansible.builtin.set_fact:
         test_host_fqdn: "{{ 'test-host.' + ipaserver_domain }}"
         test_host_fqdn_realm: "{{ 'test-host.' + ipaserver_domain + '@' + ipaserver_realm }}"