diff --git a/templates/etc/dnf/automatic.conf.j2 b/templates/etc/dnf/automatic.conf.j2
index ed8ecad..1406a17 100644
--- a/templates/etc/dnf/automatic.conf.j2
+++ b/templates/etc/dnf/automatic.conf.j2
@@ -5,6 +5,10 @@
 upgrade_type = default
 random_sleep = 0
 
+# Maximum time in seconds to wait until the system is on-line and able to
+# connect to remote repositories.
+network_online_timeout = 60
+
 # To just receive updates use dnf-automatic-notifyonly.timer
 
 # Whether updates should be downloaded when they are available, by
@@ -61,7 +65,7 @@ email_host = localhost
 # The shell command to use to send email. This is a Python format string,
 # as used in str.format(). The format function will pass shell-quoted arguments
 # called body, subject, email_from, email_to.
-# command_format = "mail -s {subject} -r {email_from} {email_to}"
+# command_format = "mail -Ssendwait -s {subject} -r {email_from} {email_to}"
 
 # The contents of stdin to pass to the command. It is a format string with the
 # same arguments as `command_format`.