diff --git a/update.yml b/update.yml
index 3e7d711..c077b06 100644
--- a/update.yml
+++ b/update.yml
@@ -5,24 +5,12 @@
   become_method: sudo
   become_user: root
   tasks:
-    - name: Update apt cache (allow release info changes)
-      apt:
-        update_cache: yes
-        cache_valid_time: 3600
-        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: Update apt cache (tolerate repo codename changes)
+      shell: apt-get update -o Acquire::AllowReleaseInfoChange=true -o Acquire::AllowReleaseInfoChange::Origin=true -o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Codename=true
+      register: apt_update
+      changed_when: "'packages can be upgraded' in apt_update.stdout"
 
-    - name: Upgrade all packages (allow release info changes)
-      apt:
-        upgrade: dist
-        autoremove: yes
-        autoclean: yes
-        force_apt_get: yes
-      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)
+      shell: apt-get dist-upgrade -y --autoremove --autoclean -o Acquire::AllowReleaseInfoChange=true -o Acquire::AllowReleaseInfoChange::Origin=true -o Acquire::AllowReleaseInfoChange::Suite=true -o Acquire::AllowReleaseInfoChange::Codename=true
+      register: apt_upgrade
+      changed_when: "'upgraded,' in apt_upgrade.stdout"