diff --git a/.github/actions/run-test/action.yml b/.github/actions/run-test/action.yml
index 6b6af04fe1a58..e4ea163fa01fe 100644
--- a/.github/actions/run-test/action.yml
+++ b/.github/actions/run-test/action.yml
@@ -15,6 +15,10 @@ inputs:
   bot-name:
     description: 'Bot name'
     required: true
+  shard-index:
+    description: 'Shard index (optional)'
+    required: false
+    default: '0'
   shell:
     description: 'Shell to use'
     required: false
@@ -87,4 +91,4 @@ runs:
       uses: ./.github/actions/upload-blob-report
       with:
         report_dir: blob-report
-        job_name: ${{ inputs.bot-name }}
+        job_name: ${{ inputs.bot-name }}-${{ inputs.shard-index }}
diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml
index 669c40841516a..68b1d2c5da274 100644
--- a/.github/workflows/tests_primary.yml
+++ b/.github/workflows/tests_primary.yml
@@ -120,7 +120,8 @@ jobs:
       with:
         node-version: ${{matrix.node-version}}
         command: npm run ttest -- --shard ${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --shard-weights=58:42
-        bot-name: "${{ matrix.os }}-node${{ matrix.node-version }}-${{ matrix.shardIndex }}"
+        bot-name: "${{ matrix.os }}-node${{ matrix.node-version }}"
+        shard-index: ${{ matrix.shardIndex }}
         flakiness-client-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_CLIENT_ID }}
         flakiness-tenant-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_TENANT_ID }}
         flakiness-subscription-id: ${{ secrets.AZURE_FLAKINESS_DASHBOARD_SUBSCRIPTION_ID }}