diff --git a/.github/workflows/openstack.yml b/.github/workflows/openstack.yml
index f45a2bce..4fdbfa31 100644
--- a/.github/workflows/openstack.yml
+++ b/.github/workflows/openstack.yml
@@ -159,8 +159,7 @@ jobs:
               chmod -v +x /scripts/elevate-cpanel
               /usr/local/cpanel/cpkeyclt
               /scripts/elevate-cpanel --non-interactive --start &
-              /scripts/elevate-cpanel --log &
-              /scripts/elevate-cpanel --log | awk '/Rebooting into stage 2 of 5/ { print | "exit" }'
+              REGEX="Starting stage 1 of 5" RETVAL=1 /scripts/reboot_watch
 
     wait_for_stage_2_reboot:
       runs-on: self-hosted
diff --git a/.github/workflows/openstack/reboot_watch b/.github/workflows/openstack/reboot_watch
index d4d2e507..212bda56 100755
--- a/.github/workflows/openstack/reboot_watch
+++ b/.github/workflows/openstack/reboot_watch
@@ -34,7 +34,6 @@ sub _check_elevate_log_for_regex {
     while ( defined( $line = $file->read ) ) {
         if ( grep { /$REGEX/m } $line ) {
             _success_message();
-            exit 0;
         }
         $RETRIES++;
     }
@@ -43,5 +42,5 @@ sub _check_elevate_log_for_regex {
 sub _success_message {
     my $time = POSIX::strftime( "%Y-%m-%d %H:%M:%S", localtime );
     print "## [$time] [INFO]: SUCCESS: Reboot regex ( $REGEX ) found in /var/log/elevate-cpanel.log  ##\n";
-    return 0;
+    exit 0;
 }