diff --git a/roles/common/molecule/default/prepare.yml b/roles/common/molecule/default/prepare.yml
index 58d895c7482b2afb250d8b8f398a2e85a4e579a6..266cf5c2e4d66351659808367726a05672cfcac0 100644
--- a/roles/common/molecule/default/prepare.yml
+++ b/roles/common/molecule/default/prepare.yml
@@ -7,13 +7,13 @@
   tasks:
 
     - name: Initialise CA hierarchy
-      command: "gimmecert init --ca-hierarchy-depth 2"
+      ansible.builtin.command: "gimmecert init --ca-hierarchy-depth 2"
       args:
         creates: ".gimmecert/ca/level1.cert.pem"
         chdir: "tests/data/"
 
     - name: Set-up link to generated X.509 material
-      file:
+      ansible.builtin.file:
         src: ".gimmecert"
         dest: "tests/data/x509"
         state: link
@@ -25,21 +25,21 @@
   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: Install net-tools for running Testinfra host.socket tests
-      apt:
+      ansible.builtin.apt:
         name: net-tools
         state: present
 
     - name: Remove the ss utility (see https://github.com/philpep/testinfra/pull/320)
-      file:
+      ansible.builtin.file:
         path: "/bin/ss"
         state: absent
 
@@ -49,7 +49,7 @@
   tasks:
 
     - name: Install apt-cacher-ng
-      apt:
+      ansible.builtin.apt:
         name: apt-cacher-ng
         state: present
 
@@ -59,12 +59,12 @@
   tasks:
 
     - name: Install tool for testing TCP connectivity
-      apt:
+      ansible.builtin.apt:
         name: nmap
         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 }}"
@@ -84,7 +84,7 @@
   tasks:
 
     - 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 }}"
@@ -97,7 +97,7 @@
         192.168.56.4: client2
 
     - name: Load legacy iptables to test their removal
-      modprobe:
+      community.general.modprobe:
         name: "{{ item }}"
         state: present
       with_items:
@@ -115,7 +115,7 @@
     - name: Create some custom legacy iptables chains for testing their removal (max chain name length is 29)  # noqa no-changed-when
       # [no-changed-when] Commands should not change things if nothing needs doing
       #   Does not matter in test prepare stage.
-      command: "iptables-legacy -t '{{ item }}' -N '{{ (ansible_date_time.iso8601_micro | to_uuid)[:28] }}'"
+      ansible.builtin.command: "iptables-legacy -t '{{ item }}' -N '{{ (ansible_date_time.iso8601_micro | to_uuid)[:28] }}'"
       with_items:
         - filter
         - nat
@@ -126,7 +126,7 @@
     - name: Create some custom legacy ip6tables chains for testing their removal (max chain name length is 29)  # noqa no-changed-when
       # [no-changed-when] Commands should not change things if nothing needs doing
       #   Does not matter in test prepare stage.
-      command: "ip6tables-legacy -t '{{ item }}' -N '{{ (ansible_date_time.iso8601_micro | to_uuid)[:28] }}'"
+      ansible.builtin.command: "ip6tables-legacy -t '{{ item }}' -N '{{ (ansible_date_time.iso8601_micro | to_uuid)[:28] }}'"
       with_items:
         - filter
         - nat
@@ -135,7 +135,7 @@
         - raw
 
     - name: Create deprecated directory for storing requirements files created using Python 3 (pip requirements upgrade checks)
-      file:
+      ansible.builtin.file:
         path: "/etc/pip_check_requirements_upgrades-py3"
         state: directory
         owner: root
@@ -143,7 +143,7 @@
         mode: "0750"
 
     - name: Create deprecated directory for Python 3 virtual environment (pip requirements upgrade checks)
-      file:
+      ansible.builtin.file:
         path: "/var/lib/pipreqcheck/virtualenv-py3/"
         state: directory
         owner: root
@@ -151,7 +151,7 @@
         mode: "0750"
 
     - name: Create deprecated cronjob file for Python 3 (pip requirements upgrade checks)
-      file:
+      ansible.builtin.file:
         path: "/etc/cron.d/check_pip_requirements-py3"
         state: touch
         owner: root
@@ -159,7 +159,7 @@
         mode: "0644"
 
     - name: Install the deprecated/obsolete NTP-related packages
-      apt:
+      ansible.builtin.apt:
         name:
           - ntp
           - ntpdate