diff --git a/files/ansible-playbooks/sot-updater.yml b/files/ansible-playbooks/sot-updater.yml
index ccf5c38..ad3f2ef 100644
--- a/files/ansible-playbooks/sot-updater.yml
+++ b/files/ansible-playbooks/sot-updater.yml
@@ -69,11 +69,14 @@
         msg:
           - "Dev1 fw_version (clean): {{ dev1_fw_clean }}"
 
-    # Build a preview of the EXACT payload string (for troubleshooting).
-    - name: Dev1 | Build payload preview string
+    - name: Dev2 | Build payload preview string
+      when:
+        - dev2_passfile_used != "NONE"
+        - indoor_fw_norm is defined
+        - (indoor_fw_norm | length) > 0
       delegate_to: localhost
       set_fact:
-        dev1_payload_preview: >-
+        dev2_payload_preview: >-
           {{
             {
               "properties": {"content_type": "application/json"},
@@ -81,8 +84,8 @@
               "payload": ({
                 "inscope_device": (ansible_hostname | default(inventory_hostname)),
                 "task_name": "custom_field_set",
-                "task_add1": "fw_version",
-                "task_result": dev1_fw_clean
+                "task_add1": "indoor_fwver",
+                "task_result": indoor_fw_norm
               } | to_json),
               "payload_encoding": "string"
             } | to_json