diff --git a/roles/pfsense_upgrade/tasks/upgrade.yml b/roles/pfsense_upgrade/tasks/upgrade.yml
index 25674bb..698d770 100644
--- a/roles/pfsense_upgrade/tasks/upgrade.yml
+++ b/roles/pfsense_upgrade/tasks/upgrade.yml
@@ -60,7 +60,13 @@
 
 - name: Display upgrade command exit code
   ansible.builtin.debug:
-    msg: "Upgrade command exit code: {{ _upgrade_exec.rc }}"
+    msg: "Upgrade command exit code: {{ _upgrade_exec.rc | default('TIMEOUT - upgrade may still be running') }}"
+  when: perform_upgrade | bool
+
+- name: Check upgrade success from log file
+  ansible.builtin.raw: |
+    grep -q "__RC=0" /conf/upgrade_log.txt && echo "SUCCESS" || echo "FAILED"
+  register: _upgrade_verify
   when: perform_upgrade | bool
 
 - name: Check upgrade success from log file