diff --git a/roles/ldap_server/molecule/default/prepare.yml b/roles/ldap_server/molecule/default/prepare.yml
index a55be1d1c533968da81c2bc5f5c2c8460b825d5d..b1642b31658ef77bcd2317a4415ac6aa5429eb43 100644
--- a/roles/ldap_server/molecule/default/prepare.yml
+++ b/roles/ldap_server/molecule/default/prepare.yml
@@ -7,13 +7,13 @@
   tasks:
 
     - name: Initialise CA hierarchy
-      command: "gimmecert init"
+      ansible.builtin.command: "gimmecert init"
       args:
         creates: ".gimmecert/ca/level1.cert.pem"
         chdir: "tests/data/"
 
     - name: Generate server private keys and certificates
-      command:
+      ansible.builtin.command:
       args:
         chdir: "tests/data/"
         creates: ".gimmecert/server/{{ item.name }}.cert.pem"
@@ -29,7 +29,7 @@
           fqdn: parameters-optional
 
     - name: Set-up link to generated X.509 material
-      file:
+      ansible.builtin.file:
         src: ".gimmecert"
         dest: "tests/data/x509"
         state: link
@@ -41,16 +41,16 @@
   tasks:
 
     - name: Install python for Ansible
-      raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal)
+      ansible.builtin.raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal)
       changed_when: false
 
     - name: Update all caches to avoid errors due to missing remote archives
-      apt:
+      ansible.builtin.apt:
         update_cache: true
       changed_when: false
 
     - name: Deploy CA certificate
-      copy:
+      ansible.builtin.copy:
         src: tests/data/x509/ca/level1.cert.pem
         dest: /etc/ssl/certs/testca.cert.pem
         owner: root
@@ -58,12 +58,12 @@
         mode: "0644"
 
     - name: Remove the ss utility (see https://github.com/philpep/testinfra/pull/320)
-      file:
+      ansible.builtin.file:
         path: "/bin/ss"
         state: absent
 
     - name: Install tools for testing
-      apt:
+      ansible.builtin.apt:
         name:
           - net-tools
           - nmap
@@ -76,12 +76,12 @@
   tasks:
 
     - name: Install tool for teting TCP connectivity
-      apt:
+      ansible.builtin.apt:
         name: hping3
         state: present
 
     - name: Set-up /etc/hosts with entries for all servers
-      lineinfile:
+      ansible.builtin.lineinfile:
         path: /etc/hosts
         regexp: "^{{ item.key }}"
         line: "{{ item.key }} {{ item.value }}"
@@ -99,7 +99,7 @@
   tasks:
 
     - name: Set-up the hosts file
-      lineinfile:
+      ansible.builtin.lineinfile:
         path: /etc/hosts
         regexp: "^{{ item.key }}"
         line: "{{ item.key }} {{ item.value }}"
@@ -116,7 +116,7 @@
   tasks:
 
     - name: Set-up the hosts file
-      lineinfile:
+      ansible.builtin.lineinfile:
         path: /etc/hosts
         regexp: "^{{ item.key }}"
         line: "{{ item.key }} {{ item.value }}"