diff --git a/defaults/main.yml b/defaults/main.yml
index 0ae37f9..6fa7235 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,5 +1,10 @@
 ---
-yum_cron_enabled: False
+yum_cron_enabled:
+  enabled: False
+  name: yum-cron
+  minute: 0
+  hour: 4
+  
 yum_cron_custom_cronjob: False
 yum_cron_apply_updates: no
 yum_cron_download_updates: yes
diff --git a/molecule/ec2-centos-7/playbook.yml b/molecule/ec2-centos-7/playbook.yml
index 21c3bbe..73cb4e6 100644
--- a/molecule/ec2-centos-7/playbook.yml
+++ b/molecule/ec2-centos-7/playbook.yml
@@ -2,7 +2,8 @@
 - name: Converge
   hosts: all
   vars:
-    yum_cron_enabled: True
+    yum_cron_enabled:
+      enabled: True
 
   roles:
     - role: xoxys.yum
diff --git a/tasks/yum_cron.yml b/tasks/yum_cron.yml
index 31cc8af..bc19002 100644
--- a/tasks/yum_cron.yml
+++ b/tasks/yum_cron.yml
@@ -40,12 +40,12 @@
 
     - name: Configure crontab to use custom yum-cron cronjob
       cron:
-        name: yum-cron
-        minute: 0
-        hour: 3
+        name: "{{ yum_cron_custom_cronjob.name | default('yum-cron') }}"
+        minute: "{{ yum_cron_custom_cronjob.minute | default(0) }}"
+        hour: "{{ yum_cron_custom_cronjob.hour | default(4) }}"
         user: root
         cron_file: /etc/crontab
         job: "/bin/sh /etc/cron.d/x-yum"
   become: True
   become_user: root
-  when: yum_cron_custom_cronjob
+  when: yum_cron_custom_cronjob.enabled | bool