diff --git a/all.yml b/all.yml
index c9960e9..82c29ed 100644
--- a/all.yml
+++ b/all.yml
@@ -25,11 +25,11 @@
 
     - name: Setup unattended-upgrades
       include_role:
-        name: hifis.unattended-upgrades
+        name: hifis.unattended_upgrades
       vars:
         unattended_origins_patterns:
-          - "origin=Debian,archive=buster-security"
-          - "o=Debian,a=buster-updates"
+          - "origin=Debian,archive={{ ansible_distribution_release }}-security"
+          - "o=Debian,a={{ ansible_distribution_release }}-updates"
         unattended_package_blacklist: [cowsay]
         unattended_mail: "root"
 
diff --git a/requirements.yml b/requirements.yml
index e23c6a3..53073ff 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,5 +1,5 @@
 ---
-- src: hifis.unattended-upgrades 
+- src: hifis.unattended_upgrades 
   version: v1.12.2
 - src: git+https://github.com/adriagalin/ansible.timezone.git
   version: 3.0.0