diff --git a/roles/cron/cron_drupal7/tasks/job.yml b/roles/cron/cron_drupal7/tasks/job.yml
index d86bc180..bd39303b 100644
--- a/roles/cron/cron_drupal7/tasks/job.yml
+++ b/roles/cron/cron_drupal7/tasks/job.yml
@@ -26,19 +26,15 @@
     - drupal.defer is defined
     - drupal.defer
 
-#- name: Remove existing MAILTO entry (if any)
-#  community.general.cronvar:
-#    name: MAILTO
-#    state: absent
-#  delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
-
-#- name: Set global MAILTO for cron jobs (if defined)
-#  community.general.cronvar:
-#    name: MAILTO
-#    value: "{{ drupal.cron_mailto | default(omit) }}"
-#    state: present
-#  when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0
-#  delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
+- name: Set global MAILTO entry if it exists
+  ansible.builtin.cron:
+    name: MAILTO
+    env: true
+    job: "{{ drupal.cron_mailto }}"
+    user: "{{ deploy_user }}"
+    state: present
+  when: drupal.cron_mailto is defined
+  delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
 
 - name: Setup Drupal cron tasks on app server.
   ansible.builtin.cron:
diff --git a/roles/cron/cron_drupal8/tasks/job.yml b/roles/cron/cron_drupal8/tasks/job.yml
index 2a7e021f..6e213112 100644
--- a/roles/cron/cron_drupal8/tasks/job.yml
+++ b/roles/cron/cron_drupal8/tasks/job.yml
@@ -26,19 +26,14 @@
     - drupal.defer is defined
     - drupal.defer
 
-#- name: Remove existing MAILTO entry (if any)
-#  community.general.cronvar:
-#    name: MAILTO
-#    state: absent
-#  delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
-
-#- name: Set global MAILTO for cron jobs (if defined)
-#  community.general.cronvar:
-#    name: MAILTO
-#    value: "{{ drupal.cron_mailto | default(omit) }}"
-#    state: present
-#  when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0
-#  delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
+- name: Set global MAILTO entry if it exists
+  ansible.builtin.cron:
+    name: MAILTO
+    env: true
+    job: "{{ drupal.cron_mailto }}"
+    state: present
+  when: drupal.cron_mailto is defined
+  delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
 
 - name: Setup Drupal cron tasks on app server.
   ansible.builtin.cron: