diff --git a/.github/workflows/bun-clickhouse.js.yml b/.github/workflows/bun-clickhouse.js.yml
index 1f3da331..5bcca0c0 100644
--- a/.github/workflows/bun-clickhouse.js.yml
+++ b/.github/workflows/bun-clickhouse.js.yml
@@ -35,22 +35,10 @@ jobs:
           - 9000:9000
     steps:
     - uses: actions/checkout@v4
-    - uses: oven-sh/setup-bun@v1
-      with:
-        bun-version: ${{ matrix.bun-version }}
     - run: rm -rf package-lock.json
     - run: git submodule init
     - run: git submodule update
-    - run: bun install
-    - run: cd test/e2e && bun install
     - name: Workflow Telemetry
       uses: runforesight/workflow-telemetry-action@v1.8.7
       if: github.event_name != 'pull_request'
-    - env:
-        CLICKHOUSE_DB: qryn
-        CLICKHOUSE_TSDB: qryn
-        INTEGRATION_E2E: 1
-        CLOKI_EXT_URL: 127.0.0.1:3100
-        QRYN_LOGIN: a
-        QRYN_PASSWORD: b
-      run: bun --bun qryn.mjs >/dev/stdout & bun run test --forceExit
+    - run: 'sh test/e2e/compose/clickhouse_sso_e2e_bun/run_test.sh'
diff --git a/.github/workflows/node-clickhouse-cluster.js.yml b/.github/workflows/node-clickhouse-cluster.js.yml
index 50a65a72..00200bd8 100644
--- a/.github/workflows/node-clickhouse-cluster.js.yml
+++ b/.github/workflows/node-clickhouse-cluster.js.yml
@@ -26,15 +26,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18, 16.x, 20]
+        node-version: [18, 16, 20]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
     steps:
     - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4.0.0
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
     - run: npm install
     - run: npm run postinstall
     - run: git submodule init
@@ -44,14 +39,9 @@ jobs:
       with:
         version: v2.1.0 # defaults to 'latest'
         legacy: true    # will also install in PATH as `docker-compose`
-    - run: docker-compose -f docker/e2e/docker-compose-cluster.yaml up -d
-    - run: sleep 5
     - name: Workflow Telemetry
       uses: runforesight/workflow-telemetry-action@v1.8.7 
       if: github.event_name != 'pull_request'
     - env:
-        CLICKHOUSE_DB: qryn
-        CLICKHOUSE_TSDB: qryn
-        INTEGRATION_E2E: 1
-        CLOKI_EXT_URL: 127.0.0.1:3100
-      run: CLUSTER_NAME=test_cluster_two_shards node qryn.mjs >/dev/stdout & sleep 10 && npm run test --forceExit
+        NODE_VERSION: ${{ matrix.node-version }}
+      run: "sh ./test/e2e/compose/clickhouse_cluster_e2e/run_test.sh"
diff --git a/test/e2e b/test/e2e
index 0ecc2256..376a7dbb 160000
--- a/test/e2e
+++ b/test/e2e
@@ -1 +1 @@
-Subproject commit 0ecc22567a16247eb6a0fcabf845433aca94302d
+Subproject commit 376a7dbbc46109a1bb568b23ad8d27477b6ca91f