diff --git a/src/test/cord-api/Tests/WorkflowValidations/BBSIM.robot b/src/test/cord-api/Tests/WorkflowValidations/BBSIM.robot
index 0eab01f..6820451 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/BBSIM.robot
+++ b/src/test/cord-api/Tests/WorkflowValidations/BBSIM.robot
@@ -44,14 +44,14 @@
     [Documentation]    Validates All ONU Device states are "enabled" and "active"
     [Tags]    onustates
     : FOR    ${onu}    IN    @{serial_numbers}
-    \    Validate ONU States    ACTIVE    ENABLED    ${onu}
+    \    Wait Until Keyword Succeeds    120s    5s    Validate ONU States    ACTIVE    ENABLED    ${onu}
 
 Validate ATT WF Driver SIs
     [Documentation]    Validates all service instances per onu devices become "approved" and "dhcpdiscovered"
     [Tags]    serviceinstances
     : FOR    ${onu}    IN    @{serial_numbers}
     \    Wait Until Keyword Succeeds    120s    2s    Validate ATT Workflow Driver SI    ENABLED    APPROVED    ${onu}
-    \    Wait Until Keyword Succeeds    120s    2s    Validate ATT Workflow Driver SI DHCP State    DHCPDISCOVER    ${onu}
+    \    Wait Until Keyword Succeeds    120s    2s    Validate ATT Workflow Driver SI DHCP State    DHCPACK    ${onu}
 
 *** Keywords ***
 Setup
@@ -76,4 +76,4 @@
     \    Run Keyword if    '${contains}' == 'True'    Append To List    ${serial_numbers}    ${sn}
     Set Suite Variable    ${serial_numbers}
     ${length_of_bbsim_onus}=    Get Length    ${serial_numbers}
-    Should Be Equal as Integers    ${length_of_bbsim_onus}    ${expected_onus}
\ No newline at end of file
+    Should Be Equal as Integers    ${length_of_bbsim_onus}    ${expected_onus}