diff --git a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
index a8e216a..1a4a06a 100644
--- a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
@@ -6,13 +6,12 @@
 Resource         ../lib/ipmi_client.robot
 Resource         ../lib/protocol_setting_utils.robot
 Resource         ../lib/common_utils.robot
-Suite Setup      Launch Browser And Login GUI
+Suite Setup      Run Keywords  Launch Browser And Login GUI  AND  Redfish.Login
 Suite Teardown   Close Browser
 Test Setup       Test Setup Execution
 
 
 *** Variables ***
- 
 ${xpath_policies_heading}                     //h1[text()="Policies"]
 ${xpath_bmc_ssh_toggle}                       //*[@data-test-id='policies-toggle-bmcShell']
 ...  /following-sibling::label
@@ -68,7 +67,7 @@
     [Tags]  Enable_SSH_Via_GUI_And_Verify
 
     Set Policy Via GUI  SSH  Enabled
-    Wait Until Keyword Succeeds  10 sec  5 sec  Open Connection And Login
+    Wait Until Keyword Succeeds  ${NETWORK_TIMEOUT}  ${NETWORK_RETRY_TIME}  Open Connection And Login
 
 
 Disable SSH Via GUI And Verify
@@ -76,7 +75,7 @@
     ...  verify that SSH to BMC stops working after disabling SSH.
     [Tags]  Disable_SSH_Via_GUI_And_Verify
     [Teardown]  Run Keywords  Enable SSH Protocol  ${True}  AND
-    ...  Wait Until Keyword Succeeds  30 sec  10 sec  Open Connection And Login
+    ...  Wait Until Keyword Succeeds  30 sec  15 sec  Open Connection And Login
 
     Set Policy Via GUI  SSH  Disabled
 
@@ -95,7 +94,7 @@
     Set Policy Via GUI  IPMI  Disabled
 
     ${status}=  Run Keyword And Return Status
-    ...  Wait Until Keyword Succeeds  10 sec  5 sec  Run IPMI Standard Command  sel info
+    ...  Wait Until Keyword Succeeds  ${NETWORK_TIMEOUT}  ${NETWORK_RETRY_TIME}  Run IPMI Standard Command  sel info
 
     Should Be Equal As Strings  ${status}  False
     ...  msg=IPMI command is working after disabling IPMI.
@@ -107,7 +106,7 @@
     [Tags]  Enable_IPMI_Via_GUI_And_Verify
 
     Set Policy Via GUI  IPMI  Enabled
-    Wait Until Keyword Succeeds  10 sec  5 sec  Run IPMI Standard Command  sel info
+    Wait Until Keyword Succeeds  ${NETWORK_TIMEOUT}  ${NETWORK_RETRY_TIME}  Run IPMI Standard Command  sel info
 
 
 Enable SSH Via GUI And Verify Persistency On BMC Reboot
@@ -146,7 +145,7 @@
     Reboot BMC via GUI
 
     ${status}=  Run Keyword And Return Status
-    ...  Wait Until Keyword Succeeds  10 sec  5 sec  Open Connection And Login
+    ...  Wait Until Keyword Succeeds  ${NETWORK_TIMEOUT}  ${NETWORK_RETRY_TIME}  Open Connection And Login
 
     Should Be Equal As Strings  ${status}  False
     ...  msg=SSH login still working after disabling SSH.
@@ -164,7 +163,7 @@
     Reboot BMC via GUI
 
     ${status}=  Run Keyword And Return Status
-    ...  Wait Until Keyword Succeeds  10 sec  5 sec  Run IPMI Standard Command  sel info
+    ...  Wait Until Keyword Succeeds  ${NETWORK_TIMEOUT}  ${NETWORK_RETRY_TIME}  Run IPMI Standard Command  sel info
 
     Should Be Equal As Strings  ${status}  False
     ...  msg=IPMI command is working after disabling IPMI.
@@ -177,7 +176,7 @@
 
     Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_policies_sub_menu}
-    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  policies
+    Wait Until Keyword Succeeds  30 sec  15 sec  Location Should Contain  policies
 
 
 Set Policy Via GUI