diff --git a/VERSION b/VERSION
index 0668896..7ee4924 100755
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.8.24
+2.8.25
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 66dd136..60e197b 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -1087,15 +1087,17 @@
         ${olt_user}    Evaluate    ${olts}[${I}].get("user")
         ${olt_pass}    Evaluate    ${olts}[${I}].get("pass")
         ${olt_ssh_ip}    Evaluate    ${olts}[${I}].get("sship")
+        ${olt_type}    Evaluate    ${olts}[${I}].get("type")
         Continue For Loop If    "${olt_user}" == "${None}"
         Continue For Loop If    "${olt_pass}" == "${None}"
-        Wait Until Keyword Succeeds    180s    10s    Execute Remote Command
+        ${command_timeout}=    Set Variable If   "${olt_type}"=="adtranolt"    300s    180s
+        Wait Until Keyword Succeeds    ${command_timeout}    10s    Execute Remote Command
         ...    printf '%s\n' '' '' '${message}' '' >> /var/log/openolt.log
         ...    ${olt_ssh_ip}    ${olt_user}    ${olt_pass}
-        Wait Until Keyword Succeeds    180s    10s    Execute Remote Command
+        Wait Until Keyword Succeeds    ${command_timeout}    10s    Execute Remote Command
         ...    printf '%s\n' '' '' '${message}' '' >> /var/log/dev_mgmt_daemon.log
         ...    ${olt_ssh_ip}    ${olt_user}    ${olt_pass}
-        Wait Until Keyword Succeeds    180s    10s    Execute Remote Command
+        Wait Until Keyword Succeeds    ${command_timeout}    10s    Execute Remote Command
         ...    printf '%s\n' '' '' '${message}' '' >> /var/log/openolt_process_watchdog.log
         ...    ${olt_ssh_ip}    ${olt_user}    ${olt_pass}
     END