diff --git a/roles/cron/cron_drupal7/tasks/job.yml b/roles/cron/cron_drupal7/tasks/job.yml
index ba6109be..f8e8d608 100644
--- a/roles/cron/cron_drupal7/tasks/job.yml
+++ b/roles/cron/cron_drupal7/tasks/job.yml
@@ -27,13 +27,6 @@
     state: present
   when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0
 
-- name: Setup specific cron job with custom MAILTO
-  community.general.cronvar:
-    name: MAILTO
-    value: "{{ entry.mailto | default(drupal.cron_mailto | default(omit)) }}"
-    state: present
-  when: entry.mailto is defined
-
 - name: Setup Drupal cron tasks on app server.
   ansible.builtin.cron:
     name: "{{ project_name }}_{{ site.folder }}_{{ build_type }}_{{ entry.job }}"
@@ -42,10 +35,10 @@
     day: "{{ entry.day | default(omit) }}"
     weekday: "{{ entry.weekday | default(omit) }}"
     month: "{{ entry.month | default(omit) }}"
-    job: |
-      {% if entry.mailto is defined %}
-      MAILTO={{ entry.mailto }}
-      {% endif %}
+    env:
+      name: MAILTO
+      value: "{{ entry.mailto | default(drupal.cron_mailto | default('')) }}"
+    job: "{{ _cron_job_command }}"
     state: present
     disabled: "{{ entry.disabled | default(omit) }}"
   delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"
diff --git a/roles/cron/cron_drupal8/tasks/job.yml b/roles/cron/cron_drupal8/tasks/job.yml
index 0b4944e3..fdfd4f05 100644
--- a/roles/cron/cron_drupal8/tasks/job.yml
+++ b/roles/cron/cron_drupal8/tasks/job.yml
@@ -28,15 +28,6 @@
     state: present
   when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0
 
-- name: Setup specific MAILTO for cron jobs.
-  community.general.cronvar:
-    name: MAILTO
-    value: "{{ entry.mailto | default(drupal.cron_mailto | default(omit)) }}"
-    state: present
-  when:
-    - entry.mailto is defined
-    - entry.mailto | length > 0
-
 - name: Setup Drupal cron tasks on app server.
   ansible.builtin.cron:
     name: "{{ project_name }}_{{ site.folder }}_{{ build_type }}_{{ entry.job }}"
@@ -45,6 +36,9 @@
     day: "{{ entry.day | default(omit) }}"
     weekday: "{{ entry.weekday | default(omit) }}"
     month: "{{ entry.month | default(omit) }}"
+    env:
+      name: MAILTO
+      value: "{{ entry.mailto | default(drupal.cron_mailto | default('')) }}"
     job: "{{ _cron_job_command }}"
     state: present
     disabled: "{{ entry.disabled | default(omit) }}"