diff --git a/update.yml b/update.yml
index 2fece49..3e7d711 100644
--- a/update.yml
+++ b/update.yml
@@ -5,23 +5,24 @@
   become_method: sudo
   become_user: root
   tasks:
-    - name: Update apt cache (tolerate repo codename changes)
+    - name: Update apt cache (allow release info changes)
       apt:
         update_cache: yes
         cache_valid_time: 3600
-      environment:
-        APT::Get::AllowReleaseInfoChange: "true"
-        APT::Get::AllowReleaseInfoChange::Origin: "true"
-        APT::Get::AllowReleaseInfoChange::Suite: "true"
-        APT::Get::AllowReleaseInfoChange::Codename: "true"
+        force_apt_get: yes
+      # Use apt options to allow codename/origin/suite changes safely
+      extra_args: >
+        -o Acquire::AllowReleaseInfoChange::Suite=true
+        -o Acquire::AllowReleaseInfoChange::Codename=true
+        -o Acquire::AllowReleaseInfoChange::Origin=true
 
-    - name: Upgrade all packages (tolerate repo codename changes)
+    - name: Upgrade all packages (allow release info changes)
       apt:
         upgrade: dist
         autoremove: yes
         autoclean: yes
-      environment:
-        APT::Get::AllowReleaseInfoChange: "true"
-        APT::Get::AllowReleaseInfoChange::Origin: "true"
-        APT::Get::AllowReleaseInfoChange::Suite: "true"
-        APT::Get::AllowReleaseInfoChange::Codename: "true"
+        force_apt_get: yes
+      extra_args: >
+        -o Acquire::AllowReleaseInfoChange::Suite=true
+        -o Acquire::AllowReleaseInfoChange::Codename=true
+        -o Acquire::AllowReleaseInfoChange::Origin=true