diff --git a/.buildkite/scripts/build-stable.sh b/.buildkite/scripts/build-stable.sh
index c6d1e4442be42d..5c9e66647fd025 100755
--- a/.buildkite/scripts/build-stable.sh
+++ b/.buildkite/scripts/build-stable.sh
@@ -8,31 +8,37 @@ source "$here"/common.sh
 
 agent="${1-solana}"
 
-partitions=$(
-  cat <<EOF
+parallelism=5
+partitions=()
+for i in $(seq 1 $parallelism); do
+  partitions+=("$(
+    cat <<EOF
 {
-  "name": "partitions",
-  "command": "ci/docker-run-default-image.sh ci/stable/run-partition.sh",
+  "name": "partition-$i",
+  "command": "ci/docker-run-default-image.sh ci/stable/run-partition.sh $i $parallelism",
   "timeout_in_minutes": 25,
   "agent": "$agent",
-  "parallelism": 5,
   "retry": 3
 }
 EOF
-)
+  )")
+done
 
-local_cluster_partitions=$(
-  cat <<EOF
+parallelism=10
+local_cluster_partitions=()
+for i in $(seq 1 $parallelism); do
+  local_cluster_partitions+=("$(
+    cat <<EOF
 {
-  "name": "local-cluster",
-  "command": "ci/docker-run-default-image.sh ci/stable/run-local-cluster-partially.sh",
+  "name": "local-cluster-$i",
+  "command": "ci/docker-run-default-image.sh ci/stable/run-local-cluster-partially.sh $i $parallelism",
   "timeout_in_minutes": 15,
   "agent": "$agent",
-  "parallelism": 10,
   "retry": 3
 }
 EOF
-)
+  )")
+done
 
 localnet=$(
   cat <<EOF
@@ -46,4 +52,6 @@ EOF
 )
 
 # shellcheck disable=SC2016
-group "stable" "$partitions" "$local_cluster_partitions" "$localnet"
+group "stable" "${partitions[@]}"
+group "local-cluster" "${local_cluster_partitions[@]}"
+group "localnet" "$localnet"
diff --git a/ci/stable/run-local-cluster-partially.sh b/ci/stable/run-local-cluster-partially.sh
index 396310910694d8..7ba0c4edd09376 100755
--- a/ci/stable/run-local-cluster-partially.sh
+++ b/ci/stable/run-local-cluster-partially.sh
@@ -1,6 +1,17 @@
 #!/usr/bin/env bash
 set -e
 
+CURRENT=$1
+: "${CURRENT:?}"
+
+TOTAL=$2
+: "${TOTAL:?}"
+
+if [ "$CURRENT" -gt "$TOTAL" ]; then
+  echo "Error: The value of CURRENT (\$1) cannot be greater than the value of TOTAL (\$2)."
+  exit 1
+fi
+
 here="$(dirname "$0")"
 
 #shellcheck source=ci/common/shared-functions.sh
@@ -9,16 +20,10 @@ source "$here"/../common/shared-functions.sh
 #shellcheck source=ci/stable/common.sh
 source "$here"/common.sh
 
-INDEX=${1:-"$BUILDKITE_PARALLEL_JOB"}
-: "${INDEX:?}"
-
-LIMIT=${2:-"$BUILDKITE_PARALLEL_JOB_COUNT"}
-: "${LIMIT:?}"
-
 _ cargo nextest run \
   --profile ci \
   --package solana-local-cluster \
   --test local_cluster \
-  --partition hash:"$((INDEX + 1))/$LIMIT" \
+  --partition hash:"$CURRENT/$TOTAL" \
   --test-threads=1 \
   --no-tests=warn
diff --git a/ci/stable/run-partition.sh b/ci/stable/run-partition.sh
index 43019313e623dd..a981d9111a4ae8 100755
--- a/ci/stable/run-partition.sh
+++ b/ci/stable/run-partition.sh
@@ -1,6 +1,17 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
+CURRENT=$1
+: "${CURRENT:?}"
+
+TOTAL=$2
+: "${TOTAL:?}"
+
+if [ "$CURRENT" -gt "$TOTAL" ]; then
+  echo "Error: The value of CURRENT (\$1) cannot be greater than the value of TOTAL (\$2)."
+  exit 1
+fi
+
 here="$(dirname "$0")"
 
 #shellcheck source=ci/common/shared-functions.sh
@@ -12,25 +23,12 @@ source "$here"/../common/limit-threads.sh
 #shellcheck source=ci/stable/common.sh
 source "$here"/common.sh
 
-# check partition info
-INDEX=${1:-"$BUILDKITE_PARALLEL_JOB"} # BUILDKITE_PARALLEL_JOB from 0 to (BUILDKITE_PARALLEL_JOB_COUNT - 1)
-: "${INDEX:?}"
-
-# if LIMIT = 3, the valid INDEX is 0~2
-LIMIT=${2:-"$BUILDKITE_PARALLEL_JOB_COUNT"}
-: "${LIMIT:?}"
-
-if [ ! "$LIMIT" -gt "$INDEX" ]; then
-  echo "LIMIT(\$2) should greater than INDEX(\$1)"
-  exit 1
-fi
-
 ARGS=(
   --profile ci
   --workspace
   --tests
   --jobs "$JOBS"
-  --partition hash:"$((INDEX + 1))/$LIMIT"
+  --partition hash:"$CURRENT/$TOTAL"
   --verbose
   --exclude solana-local-cluster
   --no-tests=warn