diff --git a/files/ansible-playbooks/afterupgrade_withcurl.yml b/files/ansible-playbooks/afterupgrade_withcurl.yml
index 3396cf8..45db318 100644
--- a/files/ansible-playbooks/afterupgrade_withcurl.yml
+++ b/files/ansible-playbooks/afterupgrade_withcurl.yml
@@ -13,18 +13,19 @@
     rmq_exchange: "controls"
     control_queue: "queue_controls"
 
-    # --- Manual run defaults (so we can execute without -e) ---
-    # These are safe to leave here; anything passed via -e will still override them.
-    attempt: 1
-    max_attempts: 3
-    current_delay_sec: 300
-    correlation_id: "6f680073dc7c"
-    original_emitted_at: "2025-10-30T18:46:52Z"
-    target_version: "2.2.3 rev 9800"
-    # Intentionally keep this empty to exercise the target_version_effective logic.
-    target_version_full: ""
+# --- Manual run defaults (so we can execute without -e) --- 
+# These are safe to leave here; anything passed via -e will still override them.
+    attempt: 1 
+    max_attempts: 3 
+    current_delay_sec: 300 
+    correlation_id: "6f680073dc7c" 
+    original_emitted_at: "2025-10-30T18:46:52Z" 
+    target_version: "2.2.3 rev 9800" 
+    # Intentionally keep this empty to exercise the target_version_effective logic. 
+    target_version_full: "" 
     schema_version: 1
 
+
     # Probing/SSH defaults
     tcp_port: 22
     nc_timeout: 5
@@ -157,7 +158,10 @@
       ignore_errors: true
 
     - name: Set eth0_macaddress fact
-      when: mac_probe is defined and mac_probe.rc == 0
+      when:
+        - mac_probe is defined
+        - (mac_probe.skipped | default(false)) == false
+        - (mac_probe.rc | default(1)) == 0
       ansible.builtin.set_fact:
         eth0_macaddress: "{{ (mac_probe.stdout | default('') | trim) }}"