diff --git a/tasks/spamassassin.yml b/tasks/spamassassin.yml
index aeb9021..9da02b6 100644
--- a/tasks/spamassassin.yml
+++ b/tasks/spamassassin.yml
@@ -11,12 +11,11 @@
       yum: pkg={{ spamassassin_sql_rh_packages }} state=present
       when: spamassassin_db_user_config | bool
 
-    - name: Perl modules, from CPAN
-      cpanm:
+    - name: Install the SpamAssassin Perl modules from CPAN
+      community.general.cpanm:
         name: '{{ item }}'
-        installdeps: True
-        system_lib: False
-      with_items: '{{ spamassassin_rh_perl_packages }}'
+      become: true
+      loop: '{{ spamassassin_rh_perl_packages }}'
 
     - name: Set some SELinux booleans related to spamassassin
       seboolean: name={{ item }} state=yes persistent=yes
@@ -142,12 +141,11 @@
       yum: pkg={{ spamassassin_dmarc_perl_requirements }} state=present
       when: ansible_distribution_file_variety == "RedHat"
 
-    - name: dmarc perl module, from CPAN
-      cpanm:
+    - name: Install the DMARC Perl module from CPAN
+      community.general.cpanm:
         name: '{{ item }}'
-        installdeps: True
-        system_lib: False
-      with_items: '{{ spamassassin_dmarc_perl_packages }}'
+      become: true
+      loop: '{{ spamassassin_dmarc_perl_packages }}'
 
     - name: Get the dmarc plugin code from github
       get_url: url={{ spamassassin_dmarc_github_plugin_url }} dest={{ spamassassin_conf_dir }}/dmarc.pm owner=root group=root mode='0644'