diff --git a/.github/actions/setup_bendsql/action.yml b/.github/actions/setup_bendsql/action.yml
index 488e3abd3b15..f2e314ee670e 100644
--- a/.github/actions/setup_bendsql/action.yml
+++ b/.github/actions/setup_bendsql/action.yml
@@ -7,7 +7,7 @@ runs:
       if: runner.os == 'Linux'
       shell: bash
       run: |
-        if bendsql --version; then
+        if command -v bendsql >/dev/null 2>&1; then
           exit 0
         fi
         case $RUNNER_PROVIDER in
@@ -29,7 +29,7 @@ runs:
       if: runner.os == 'macOS'
       shell: bash
       run: |
-        if bendsql --version; then
+        if command -v bendsql >/dev/null 2>&1; then
           exit 0
         fi
         brew install databendcloud/homebrew-tap/bendsql
diff --git a/.github/workflows/reuse.benchmark.yml b/.github/workflows/reuse.benchmark.yml
index d8097d9297d0..5530f79e082a 100644
--- a/.github/workflows/reuse.benchmark.yml
+++ b/.github/workflows/reuse.benchmark.yml
@@ -90,7 +90,7 @@ jobs:
           source_id: ${{ inputs.source_id }}
 
   load:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"]
     steps:
       - uses: actions/checkout@v4
         if: inputs.source == 'release'
@@ -126,7 +126,7 @@ jobs:
           echo "DROP WAREHOUSE IF EXISTS 'benchmark-${{ inputs.run_id }}';" | bendsql
 
   cloud:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, X64, Linux, 2c8g, "${{ inputs.runner_provider }}"]
     needs: load
     strategy:
       matrix:
diff --git a/benchmark/clickbench/benchmark_cloud.sh b/benchmark/clickbench/benchmark_cloud.sh
index 615825ea7a7c..0cd06e4c49a9 100755
--- a/benchmark/clickbench/benchmark_cloud.sh
+++ b/benchmark/clickbench/benchmark_cloud.sh
@@ -52,7 +52,7 @@ esac
 echo "#######################################################"
 echo "Running benchmark for Databend Cloud with S3 storage..."
 
-export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443"
+export BENDSQL_DSN="databend://${CLOUD_USER}:${CLOUD_PASSWORD}@${CLOUD_GATEWAY}:443?login=disable"
 
 echo "Creating warehouse..."
 echo "DROP WAREHOUSE IF EXISTS '${CLOUD_WAREHOUSE}';" | bendsql
diff --git a/benchmark/clickbench/benchmark_local.sh b/benchmark/clickbench/benchmark_local.sh
index 7494a4eb5d4a..fff1ac1ba287 100755
--- a/benchmark/clickbench/benchmark_local.sh
+++ b/benchmark/clickbench/benchmark_local.sh
@@ -55,8 +55,9 @@ echo "Waiting on databend-query 10 seconds..."
 
 # Connect to databend-query
 
-export BENDSQL_DSN="databend://root:@localhost:8000/${BENCHMARK_DATASET}?sslmode=disable"
+export BENDSQL_DSN="databend://root:@localhost:8000?sslmode=disable"
 echo "CREATE DATABASE ${BENCHMARK_DATASET};" | bendsql
+export BENDSQL_DSN="databend://root:@localhost:8000/${BENCHMARK_DATASET}?sslmode=disable"
 
 # Create table
 if [[ -f "${BENCHMARK_DATASET}/create_local.sql" ]]; then