diff --git a/group-all.yml b/group-all.yml
index e840c91..cd58700 100644
--- a/group-all.yml
+++ b/group-all.yml
@@ -31,10 +31,12 @@
         name: hifis.unattended_upgrades
       vars:
         unattended_origins_patterns:
-          - "origin=Debian,archive={{ ansible_distribution_release }}-security"
-          - "o=Debian,a={{ ansible_distribution_release }}-updates"
+          - "origin=${ distro_id },archive=${ distro_codename }-security"
+          - "origin=${ distro_id },archive=${ distro_codename }-updates"
         unattended_package_blacklist: [cowsay]
         unattended_mail: "root"
+        unattended_mail_only_on_error: true
+        unattended_syslog_enable: true
 
     - name: Install some common software packages
       ansible.builtin.apt:
@@ -42,3 +44,4 @@
         name:
           - molly-guard
           - mc
+          - bsd-mailx