diff --git a/libraries/onos.robot b/libraries/onos.robot
index 72d7c8a..77f4091 100755
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -399,11 +399,11 @@
     Should Be Equal As Integers    ${allocations}    ${count}
 
 Validate Subscriber DHCP Allocation
-    [Arguments]    ${ip}    ${port}    ${onu_port}
+    [Arguments]    ${ip}    ${port}    ${onu_port}   ${vlan}=''
     [Documentation]    Verifies that the specified subscriber is found in DHCP allocations
     ##TODO: Enhance the keyword to include DHCP allocated address is not 0.0.0.0
     ${allocations}=    Execute ONOS CLI Command    ${ip}    ${port}
-    ...    dhcpl2relay-allocations | grep DHCPACK | grep ${onu_port}
+    ...    dhcpl2relay-allocations | grep DHCPACK | grep ${onu_port} | grep ${vlan}
     Should Not Be Empty    ${allocations}    ONU port ${onu_port} not found in dhcpl2relay-allocations
 
 Device Is Available In ONOS
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 0b7e948..967317b 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -313,8 +313,10 @@
     ...    ${src['ip']}    ${src['user']}    ${src['pass']}    ${src['container_type']}    ${src['container_name']}
     ...    ${dst['dp_iface_name']}    ${dst['ip']}    ${dst['user']}    ${dst['pass']}    ${dst['container_type']}
     ...    ${dst['container_name']}
-    Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
+    Run Keyword IF    ${has_dataplane}    and    ${src['service_type']} != 'hsia'
+    ...    Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
     ...    Validate Subscriber DHCP Allocation    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${onu_port}
+    ...    ${src['c_tag']}
     Run Keyword and Ignore Error    Get Device Output from Voltha    ${onu_device_id}
     Run Keyword and Ignore Error    Collect Logs