diff --git a/Jenkinsfile-voltha-build b/Jenkinsfile-voltha-build
index 9326f0c..4dbae1a 100644
--- a/Jenkinsfile-voltha-build
+++ b/Jenkinsfile-voltha-build
@@ -261,7 +261,7 @@
                         timeout(5) {
                             sh returnStdout: true, script: """
                             ssh-keyscan -H ${deployment_config.olts[i].ip} >> ~/.ssh/known_hosts
-                            sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'rm -f /var/log/openolt.log; rm -f /var/log/dev_mgmt_daemon.log; reboot' || true
+                            sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].ip} 'rm -f /var/log/openolt.log; rm -f /var/log/dev_mgmt_daemon.log; rm -f /var/log/openolt_process_watchdog.log; reboot' || true
                             sleep 120
                             """
                         }
@@ -343,7 +343,7 @@
                         timeout(10) {
                             sh returnStdout: true, script: """
                             ssh-keyscan -H ${deployment_config.olts[i].sship} >> ~/.ssh/known_hosts
-                            sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'rm -f /var/log/openolt.log; rm -f /var/log/dev_mgmt_daemon.log; reboot' || true
+                            sshpass -p ${deployment_config.olts[i].pass} ssh -l ${deployment_config.olts[i].user} ${deployment_config.olts[i].sship} 'rm -f /var/log/openolt.log; rm -f /var/log/dev_mgmt_daemon.log; rm -f /var/log/startup.log; rm -f /var/log/openolt_process_watchdog.log; reboot' || true
                             sleep 360
                             """
                         }
diff --git a/libraries/utils.robot b/libraries/utils.robot
index b86f2fc..eacd8e6 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -557,6 +557,9 @@
     Wait Until Keyword Succeeds    180s    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
+    ...    printf '%s\n' '' '' '${message}' '' >> /var/log/openolt_process_watchdog.log
+    ...    ${olt_ssh_ip}    ${olt_user}    ${olt_pass}
 
 Start Logging
     [Arguments]    ${label}