diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index ee8f430..61d839d 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -6,11 +6,11 @@
 
   pre_tasks:
     - name: "Update APT cache"
-      apt:
+      ansible.builtin.apt:
         update_cache: true
       when:
         - ansible_pkg_mgr == "apt"
 
     - name: Install sshd
-      package:
+      ansible.builtin.package:
         name: openssh-server
diff --git a/tasks/main.yml b/tasks/main.yml
index 1dd5b3f..a60c824 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,7 @@
   ansible.builtin.include_tasks: disable_default_motd.yml
   when: motd_disable_default_motd|bool
 
-- name: configure_motd | Apply template {{ motd_template }} on {{ _motd_file_path }}
+- name: "Configure_motd | Apply template {{ motd_template + ' in ' + _motd_file_path }}"
   ansible.builtin.copy:
     content: "{{ motd_template_prepend + _motd_template_content + motd_template_append }}"
     dest: "{{ _motd_file_path }}"
@@ -13,7 +13,7 @@
   tags:
     - molecule-idempotence-notest
 
-- name: configure_motd | Add pam_exec {{ _motd_file_path }} in pam
+- name: Configure_motd | Add in pam pam_exec {{ _motd_file_path }}
   ansible.builtin.lineinfile:
     path: "{{ item }}"
     line: session optional pam_exec.so type=open_session stdout {{ _motd_file_path }}