diff --git a/Ansible/roles/router/tasks/main.yaml b/Ansible/roles/router/tasks/main.yaml
index 5feb0416ab19d7e7b81dd6d0156fc7be367b6be8..a0f292c3b545d3028ce864eef64e8e876ad5b0c7 100644
--- a/Ansible/roles/router/tasks/main.yaml
+++ b/Ansible/roles/router/tasks/main.yaml
@@ -509,7 +509,7 @@
       VERBOSESTATUS=0
       syspatch -c
       pkg_add -uInx | grep -v '^quirks'
-      fw_update -an | grep -v '^fw_update: added none; updated none;'
+      fw_update -an | grep -v '^fw_update: add none; update none;'
       {{ "rcctl ls rogue" if ansible_distribution_version is version('7.1', '>=') }}
     # yamllint enable rule:line-length
     dest: /etc/daily.local
diff --git a/Ansible/update.yaml b/Ansible/update.yaml
index b6eb489053242dab1a9ffab62d7715eea37239ac..4ca52148a917b23eafca225cccacd0540e7a1345 100644
--- a/Ansible/update.yaml
+++ b/Ansible/update.yaml
@@ -27,9 +27,9 @@
         - name: Update firmware
           command: fwupdmgr --assume-yes update
           register: fwupdmgr
-          changed_when: fwupdmgr.stdout_lines|length > 0
+          changed_when: fwupdmgr.rc == 0
           # yamllint disable rule:line-length
-          failed_when: fwupdmgr.rc not in [0, 2] and "No updatable devices" not in fwupdmgr.stderr_lines
+          failed_when: fwupdmgr.rc not in [0, 2]
 
         - name: Gather package facts
           package_facts:
@@ -109,7 +109,7 @@
           command: fw_update -a
           register: fw_update
           changed_when: |-
-            "fw_update: added none; updated none;" not in fw_update.stdout
+            "fw_update: add none; update none;" not in fw_update.stdout
 
         - name: Set reboot needed fact
           set_fact: