diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7a133209..eacc1afe 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -97,12 +97,6 @@ jobs:
           -H "Content-Type: application/json" \
           -d '{"statechain_id":"550e8400e29b41d4a716446655440000"}'
           docker logs $(docker ps -qf "name=enclave")
-      - name: Verify Esplora Service with Curl
-        run: |
-          docker logs $(docker ps -qf "name=esplora-container")
-          docker exec $(docker ps -qf "name=esplora-container") \
-          curl http://esplora-container:8094/regtest/api/blocks/tip/height
-          docker logs $(docker ps -qf "name=esplora-container")
       - name: Verify Node Service with Curl
         run: |
           docker ps -a
@@ -112,6 +106,12 @@ jobs:
           -H 'Content-Type: application/json' \
           -d '{"address":"bcrt1pkygl356c6fvk6ptx72c64hrjkhcxecj4hjzfzc430svzczuv6m0s42lvwx","amount":1000}'
           docker logs $(docker ps -qf "name=node-server")
+      - name: Verify Esplora Service with Curl
+        run: |
+          docker logs $(docker ps -qf "name=esplora-container")
+          docker exec $(docker ps -qf "name=esplora-container") \
+          curl http://esplora-container:8094/regtest/api/blocks/tip/height
+          docker logs $(docker ps -qf "name=esplora-container")
       - name: Check connectivity between containers
         run: |
           # Get container IDs
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index 3f595f94..2cb0bd36 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -170,6 +170,7 @@ services:
       - .:/usr/src/app
     working_dir: /usr/src/app
     command: ["node ./clients/tests/web/server-regtest.cjs"]
+    restart: unless-stopped
     depends_on:
       - esplora
     ports: