diff --git a/.github/workflows/node-ci.yml b/.github/workflows/node-ci.yml
index 32700f2c7..13d12b37c 100644
--- a/.github/workflows/node-ci.yml
+++ b/.github/workflows/node-ci.yml
@@ -181,7 +181,7 @@ jobs:
         run: |
           ./gen_node_configs.sh
           ./run_docker.sh
-          ./wait.sh '[[ $(curl -s -N localhost:26657/block | jq -cr '"'"'.result.block.last_commit.height'"'"') -gt 1 ]] && echo "Height is more than 1"'
+          bash tests/networks/wait_for_chain.sh
 
       - name: Add observer node
         working-directory: ./tests/networks/docker_compose
@@ -237,7 +237,7 @@ jobs:
         run: |
           ./gen_node_configs.sh
           ./run_docker.sh
-          ./wait.sh '[[ $(curl -s -N localhost:26657/block | jq -cr '"'"'.result.block.last_commit.height'"'"') -gt 1 ]] && echo "Height is more than 1"'
+          bash tests/networks/wait_for_chain.sh
 
       - name: Set up test environment
         working-directory: ./tests/e2e