diff --git a/files/apt/20auto-upgrades b/files/apt/20auto-upgrades
index 8d6d7c8..5bf85d3 100644
--- a/files/apt/20auto-upgrades
+++ b/files/apt/20auto-upgrades
@@ -1,2 +1,3 @@
 APT::Periodic::Update-Package-Lists "1";
 APT::Periodic::Unattended-Upgrade "1";
+APT::Periodic::AutocleanInterval "7";
diff --git a/files/apt/50unattended-upgrades b/files/apt/50unattended-upgrades
index 5bd1983..bb466a5 100644
--- a/files/apt/50unattended-upgrades
+++ b/files/apt/50unattended-upgrades
@@ -1,10 +1,10 @@
 // ACAQB unattended upgrades configuration file
-Unattended-Upgrade::Origin-Pattern {
-    "o=Debian,n=buster";
-    "o=Debian,n=buster-updates";
-    "o=Debian,n=buster,l=Debian-Security";
-    "o=Debian,n=sid";
+Unattended-Upgrade::Origins-Pattern {
+    "o=Debian,n=${distro_codename}";
+    "o=Debian,n=${distro_codename}-updates";
+    "o=Debian,n=${distro_codename},l=Debian-Security";
 };
 Unattended-Upgrade::Remove-Unused-Dependencies "true";
 Unattended-Upgrade::MinimalSteps "true";
+Unattended-Upgrade::AutoFixInterruptedDpkg "true";
 Acquire::http::Dl-Limit "50";