diff --git a/roles/wsgi_website/molecule/default/prepare.yml b/roles/wsgi_website/molecule/default/prepare.yml
index 7112f12c9130fab03c04f342c5a42f006914d07d..e5de092b6fb1b6d2d84afdcd4d6569499bd1a2b2 100644
--- a/roles/wsgi_website/molecule/default/prepare.yml
+++ b/roles/wsgi_website/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"
@@ -33,7 +33,7 @@
           fqdn: wsgi-website
 
     - name: Set-up link to generated X.509 material
-      file:
+      ansible.builtin.file:
         src: ".gimmecert"
         dest: "tests/data/x509"
         state: link
@@ -45,16 +45,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: Remove the ss utility (see https://github.com/philpep/testinfra/pull/320)
-      file:
+      ansible.builtin.file:
         path: "/bin/ss"
         state: absent
 
@@ -64,37 +64,37 @@
   tasks:
 
     - name: Set-up /etc/hosts entries
-      lineinfile:
+      ansible.builtin.lineinfile:
         dest: /etc/hosts
         line: "{{ ansible_eth0.ipv4.address }} parameters-mandatory parameters-optional.local parameters-paste-req wsgi-website"
 
     - name: Install curl for testing redirects and webpage content
-      apt:
+      ansible.builtin.apt:
         name: curl
         state: present
 
     - name: Install swaks for testing mail forwarding
-      apt:
+      ansible.builtin.apt:
         name: swaks
         state: present
 
     - name: Install net-tools for testing sockets
-      apt:
+      ansible.builtin.apt:
         name: net-tools
         state: present
 
     - name: Install Postfix for testing mail forwarding (Exim4 not covered)
-      apt:
+      ansible.builtin.apt:
         name: postfix
         state: present
 
     - name: Install procmail for consistency with mail_server and mail_forwarder roles
-      apt:
+      ansible.builtin.apt:
         name: procmail
         state: present
 
     - name: Update Postfix configuration
-      lineinfile:
+      ansible.builtin.lineinfile:
         path: /etc/postfix/main.cf
         regexp: "^{{ item.key }}"
         line: "{{ item.value }}"
@@ -106,7 +106,7 @@
         - Restart Postfix
 
     - name: Direct all mails from the root account to vagrant
-      lineinfile:
+      ansible.builtin.lineinfile:
         path: /etc/aliases
         regexp: "^root"
         line: "root: vagrant"
@@ -115,12 +115,12 @@
         - Generate aliases database
 
     - name: Set-up group for an additional user
-      group:
+      ansible.builtin.group:
         name: user
         state: present
 
     - name: Set-up additional user for testing mail delivery
-      user:
+      ansible.builtin.user:
         name: user
         group: user
         shell: /bin/bash
@@ -128,11 +128,11 @@
   handlers:
 
     - name: Restart Postfix
-      service:
+      ansible.builtin.service:
         name: postfix
         state: restarted
 
     - name: Generate aliases database  # noqa no-changed-when
-      command: "/usr/bin/newaliases"
+      ansible.builtin.command: "/usr/bin/newaliases"
       # [no-changed-when] Commands should not change things if nothing needs doing
       #   Does not matter in test prepare stage.