diff --git a/tests/ca-less/clean_up_certificates.yml b/tests/ca-less/clean_up_certificates.yml
index 23c025b381bfa97e74285a0ac0a6050c9793d871..2f499dc5f479c6dd3d1542fe57af46f99d6d3bde 100644
--- a/tests/ca-less/clean_up_certificates.yml
+++ b/tests/ca-less/clean_up_certificates.yml
@@ -5,7 +5,7 @@
 
   tasks:
   - name: Run generate-certificates.sh
-    command: >
+    ansible.builtin.command: >
       /bin/bash
       generate-certificates.sh delete "{{ item }}"
     args:
diff --git a/tests/ca-less/install_replica_without_ca.yml b/tests/ca-less/install_replica_without_ca.yml
index dc026220d66cf2a04e3f03551121209c40918063..676083129a5643ff1f69b3555ecacd26a6bd8ad7 100644
--- a/tests/ca-less/install_replica_without_ca.yml
+++ b/tests/ca-less/install_replica_without_ca.yml
@@ -5,7 +5,7 @@
 
   tasks:
   - name: Run generate-certificates.sh
-    command: >
+    ansible.builtin.command: >
       /bin/bash
       generate-certificates.sh create
       "{{ groups.ipareplicas[0] }}"
@@ -40,18 +40,18 @@
 
   pre_tasks:
     - name: Remove "/root/ca-less-test"
-      file:
+      ansible.builtin.file:
         path: "/root/ca-less-test"
         state: absent
 
     - name: Generate "/root/ca-less-test"
-      file:
+      ansible.builtin.file:
         path: "/root/ca-less-test"
         state: directory
         mode: 0775
 
     - name: Copy CA certificate
-      copy:
+      ansible.builtin.copy:
         src: "{{ playbook_dir }}/certificates/root-ca/cert.pem"
         dest: "/root/ca-less-test/ca.crt"
         owner: root
@@ -59,7 +59,7 @@
         mode: "0644"
 
     - name: Copy p12 certificates
-      copy:
+      ansible.builtin.copy:
         src: "{{ playbook_dir }}/certificates/{{ item }}/{{ groups.ipareplicas[0] }}/cert.p12"
         dest: "/root/ca-less-test/{{ item }}.p12"
         owner: root
@@ -76,7 +76,7 @@
 
   post_tasks:
     - name: Fix KDC certificate permissions
-      file:
+      ansible.builtin.file:
         path: /var/kerberos/krb5kdc/kdc.crt
         owner: root
         group: root
diff --git a/tests/ca-less/install_server_without_ca.yml b/tests/ca-less/install_server_without_ca.yml
index add0f622ecf3f37aca092c115a39ac2f66085ccf..a29cb0c231d078c08f156eb0c17f64c6b3308e69 100644
--- a/tests/ca-less/install_server_without_ca.yml
+++ b/tests/ca-less/install_server_without_ca.yml
@@ -5,7 +5,7 @@
 
   tasks:
   - name: Run generate-certificates.sh
-    command: >
+    ansible.builtin.command: >
       /bin/bash
       generate-certificates.sh create
       "{{ groups.ipaserver[0] }}"
@@ -40,18 +40,18 @@
 
   pre_tasks:
     - name: Remove "/root/ca-less-test"
-      file:
+      ansible.builtin.file:
         path: "/root/ca-less-test"
         state: absent
 
     - name: Generate "/root/ca-less-test"
-      file:
+      ansible.builtin.file:
         path: "/root/ca-less-test"
         state: directory
         mode: 0775
 
     - name: Copy CA certificate
-      copy:
+      ansible.builtin.copy:
         src: "{{ playbook_dir }}/certificates/root-ca/cert.pem"
         dest: "/root/ca-less-test/ca.crt"
         owner: root
@@ -59,7 +59,7 @@
         mode: "0644"
 
     - name: Copy p12 certificates
-      copy:
+      ansible.builtin.copy:
         src: "{{ playbook_dir }}/certificates/{{ item }}/{{ groups.ipaserver[0] }}/cert.p12"
         dest: "/root/ca-less-test/{{ item }}.p12"
         owner: root