diff --git a/lib/boot_data.py b/lib/boot_data.py
index 7b918fa..f1b7147 100755
--- a/lib/boot_data.py
+++ b/lib/boot_data.py
@@ -53,7 +53,7 @@
                                     boot entries.
     """
     if file_path is None:
-        if redfish_support_trans_state:
+        if redfish_support_trans_state and platform_arch_type != "x86":
             file_path = os.environ.get('BOOT_TABLE_PATH', 'data/boot_table_redfish.json')
         elif platform_arch_type == "x86":
             file_path = os.environ.get('BOOT_TABLE_PATH', 'data/boot_table_x86.json')
diff --git a/lib/state.py b/lib/state.py
index c715ba0..ea45dd2 100755
--- a/lib/state.py
+++ b/lib/state.py
@@ -261,19 +261,22 @@
 
 # Filter the states based on platform type.
 if platform_arch_type == "x86":
-    default_req_states.remove("operating_system")
+
+    if not redfish_support_trans_state:
+        default_req_states.remove("operating_system")
+        valid_req_states.remove("operating_system")
+        del default_state["operating_system"]
+        del standby_match_state["operating_system"]
+        del os_running_match_state["operating_system"]
+        del master_os_up_match["operating_system"]
+        del invalid_state_match["operating_system"]
+
     default_req_states.remove("boot_progress")
-    valid_req_states.remove("operating_system")
     valid_req_states.remove("boot_progress")
-    del default_state["operating_system"]
     del default_state["boot_progress"]
-    del standby_match_state["operating_system"]
     del standby_match_state["boot_progress"]
-    del os_running_match_state["operating_system"]
     del os_running_match_state["boot_progress"]
-    del master_os_up_match["operating_system"]
     del master_os_up_match["boot_progress"]
-    del invalid_state_match["operating_system"]
     del invalid_state_match["boot_progress"]
 
 
@@ -747,9 +750,10 @@
 
             if int(state['redfish']):
                 state['chassis'] = ret_values['chassis']
-                state['boot_progress'] = ret_values['boot_progress']
                 state['host'] = ret_values['host']
                 state['bmc'] = ret_values['bmc']
+                if platform_arch_type != "x86":
+                    state['boot_progress'] = ret_values['boot_progress']
 
     for sub_state in req_states:
         if sub_state in state:
diff --git a/lib/utils.robot b/lib/utils.robot
index a73a56c..0a8f1cf 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -876,7 +876,7 @@
     #    "State": "StandbyOffline"
     # },
 
-    ${chassis}=  Redfish.Get Properties  /redfish/v1/Chassis/chassis
+    ${chassis}=  Redfish.Get Properties  /redfish/v1/Chassis/${CHASSIS_ID}
     [Return]  ${chassis["PowerState"]}  ${chassis["Status"]["State"]}
 
 
@@ -889,6 +889,10 @@
     # },
 
     ${boot_progress}=  Redfish.Get Properties  /redfish/v1/Systems/system/
+
+    Return From Keyword If  "${PLATFORM_ARCH_TYPE}" == "x86"
+    ...  NA  ${boot_progress["Status"]["State"]}
+
     [Return]  ${boot_progress["BootProgress"]["LastState"]}  ${boot_progress["Status"]["State"]}