diff --git a/.github/workflows/ftr-e2e-dashboards-observability-test.yml b/.github/workflows/ftr-e2e-dashboards-observability-test.yml
index 453ac77c76..f482f3d258 100644
--- a/.github/workflows/ftr-e2e-dashboards-observability-test.yml
+++ b/.github/workflows/ftr-e2e-dashboards-observability-test.yml
@@ -128,12 +128,21 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         run: |
           cd ./OpenSearch-Dashboards
-          if timeout 600 grep -q "bundles compiled successfully after" <(tail -n0 -f dashboard.log); then
-            echo "OpenSearch Dashboards compiled successfully."
-          else
-            echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling."
-            exit 1
-          fi
+          timeout=900
+          interval=60
+          elapsed=0
+
+          while [ $elapsed -lt $timeout ]; do
+            if grep -q "bundles compiled successfully after" dashboard.log; then
+              echo "OpenSearch Dashboards compiled successfully."
+              exit 0
+            fi
+            sleep $interval
+            elapsed=$((elapsed + interval))
+          done
+
+          echo "Timeout for $timeout seconds reached. OpenSearch Dashboards did not finish compiling."
+          exit 1
 
       - name: Checkout Dashboards Functioanl Test Repo
         uses: actions/checkout@v2
diff --git a/.github/workflows/integration-tests-workflow.yml b/.github/workflows/integration-tests-workflow.yml
index badb360407..7cecaa455f 100644
--- a/.github/workflows/integration-tests-workflow.yml
+++ b/.github/workflows/integration-tests-workflow.yml
@@ -150,12 +150,21 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         run: |
           cd ./OpenSearch-Dashboards
-          if timeout 600 grep -q "bundles compiled successfully after" <(tail -n0 -f dashboard.log); then
-            echo "OpenSearch Dashboards compiled successfully."
-          else
-            echo "Timeout for 600 seconds reached. OpenSearch Dashboards did not finish compiling."
-            exit 1
-          fi
+          timeout=900
+          interval=60
+          elapsed=0
+
+          while [ $elapsed -lt $timeout ]; do
+            if grep -q "bundles compiled successfully after" dashboard.log; then
+              echo "OpenSearch Dashboards compiled successfully."
+              exit 0
+            fi
+            sleep $interval
+            elapsed=$((elapsed + interval))
+          done
+
+          echo "Timeout for $timeout seconds reached. OpenSearch Dashboards did not finish compiling."
+          exit 1
 
       - name: Install Cypress
         run: |