diff --git a/libraries/k8s.robot b/libraries/k8s.robot
index 24a1ca6..9a21190 100644
--- a/libraries/k8s.robot
+++ b/libraries/k8s.robot
@@ -335,11 +335,3 @@
     ...    kubectl -n ${namespace} get pods -l ${key}=${value} -o json | jq -r ".items[].status.phase" | wc -l
     Should Be Equal as Integers    ${count}    ${number}
 
-Reboot ONU
-    [Arguments]    ${onu_id}    ${src}   ${dst}
-    [Documentation]   Using voltctl command reboot ONU and verify that ONU comes up to running state
-    ${rc}    ${devices}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG}; voltctl device reboot ${onu_id}
-    Should Be Equal As Integers    ${rc}    0
-    Run Keyword and Ignore Error    Wait Until Keyword Succeeds    30   1s    Validate Device
-    ...    ENABLED    ACTIVATING    UNREACHABLE   ${onu_id}    onu=True
-
diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index 7ad15b1..00c85c4 100644
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -409,3 +409,13 @@
         Append To List    ${ids}    ${device_id}
     END
     List Should Not Contain Value    ${ids}    ${id}
+
+Reboot ONU
+    [Arguments]    ${onu_id}    ${src}   ${dst}
+    [Documentation]   Using voltctl command reboot ONU and verify that ONU comes up to running state
+    ${rc}    ${devices}=    Run and Return Rc and Output    ${VOLTCTL_CONFIG}; voltctl device reboot ${onu_id}
+    Should Be Equal As Integers    ${rc}    0
+    Run Keyword and Ignore Error    Wait Until Keyword Succeeds    60s   1s    Validate Device
+    ...    ENABLED    DISCOVERED    UNREACHABLE   ${onu_id}    onu=True
+
+