diff --git a/group-all.yml b/group-all.yml
index e840c91..0a0ed10 100644
--- a/group-all.yml
+++ b/group-all.yml
@@ -31,8 +31,8 @@
         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"