diff --git a/geant/ops_ansible/roles/cic_generic/tasks/fix_template.yaml b/geant/ops_ansible/roles/cic_generic/tasks/fix_template.yaml
index dbe13bece53e07d06c59af01fb9116f3eb556446..bcaf50194957d6a495048715b8889bd9014014c5 100644
--- a/geant/ops_ansible/roles/cic_generic/tasks/fix_template.yaml
+++ b/geant/ops_ansible/roles/cic_generic/tasks/fix_template.yaml
@@ -15,4 +15,3 @@
   ansible.builtin.debug:
     msg: "{{ response }}"
   when: verb == "fix" and not (dry_run | ansible.builtin.bool)
-
diff --git a/geant/ops_ansible/roles/cic_generic/tasks/test_template.yaml b/geant/ops_ansible/roles/cic_generic/tasks/test_template.yaml
index 51173d88bf5ca4284933261f42b58a8e5c1fab5a..9fd4d68e6a2fdee9df9fd6868f6bf2f3e3adac57 100644
--- a/geant/ops_ansible/roles/cic_generic/tasks/test_template.yaml
+++ b/geant/ops_ansible/roles/cic_generic/tasks/test_template.yaml
@@ -25,7 +25,7 @@
 #   when: response.changed == true
 
 - name: Send an e-mail using Geant SMTP servers
-  mail:
+  community.general.mail:
     host: "{{ cic_alerts_mail_host }}"
     port: "{{ cic_alerts_smtp_port }}"
     sender: "{{ cic_alerts_sender }}"
@@ -33,4 +33,4 @@
     subject: "Config Integrity Check failed for {{ inventory_hostname }} on {{ config_object }}"
     body: "{{ lookup('ansible.builtin.template', 'mail_body.j2') }}"
   delegate_to: localhost
-  when: response.changed == true and (send_email | ansible.builtin.bool) == true
+  when: (response.changed | ansible.builtin.bool) and (send_email | ansible.builtin.bool)