diff --git a/.github/workflows/htcmock-localhost.yml b/.github/workflows/htcmock-localhost.yml
index f845b1f7b..4958de91d 100644
--- a/.github/workflows/htcmock-localhost.yml
+++ b/.github/workflows/htcmock-localhost.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - "ts/add-htc-mock-worflow"
-      - "ts/ci-**"
+      - "main"
   workflow_dispatch:
     inputs:
       ntasks:
@@ -19,6 +19,9 @@ on:
         description: "Whether to purge session"
         default: "false"
         required: false
+      polling-limit:
+        description: "Polling duration for HTC Mock session completion"
+        default: 600
   release:
     types: [created, published]
 
@@ -41,6 +44,12 @@ jobs:
           k3s: true
           docker: true
 
+      - id: deploy
+        name: "Deploy ArmoniK"
+        uses: aneoconsulting/ArmoniK.Action.Deploy/deploy@main
+        with:
+          type: localhost
+
       - name: Define runner env variables
         run: |
           echo "core-version=$(cat versions.tfvars.json | jq '.armonik_versions.core' | sed -r 's/"//g')" >> $GITHUB_ENV
@@ -48,12 +57,6 @@ jobs:
           echo "subtasks-levels=${{ inputs.subtasks-levels || 5 }}" >> $GITHUB_ENV
           echo "purge-data=${{ inputs.purge-data || false }}" >> $GITHUB_ENV
 
-      - id: deploy
-        name: "Deploy ArmoniK"
-        uses: aneoconsulting/ArmoniK.Action.Deploy/deploy@main
-        with:
-          type: localhost
-
       - id: get-armonik-endpoint
         name: "Get ArmoniK's control plane endpoint"
         run: |
@@ -85,18 +88,17 @@ jobs:
       - name: Upload bench results to artifact registry
         uses: actions/upload-artifact@v4
         with:
-          name: htc-mock-results
+          name: main_bench_htcmock_${{ env.GITHUB_RUN_ID }}
           path: ${{ steps.get-throughput.outputs.bench-file-path }}
 
-      - name: (test) Upload bench results to s3
+      - name: Upload bench results to s3
         env:
           BENCH_RESULTS_PATH: ${{ steps.get-throughput.outputs.bench-file-path }}
-          COMMIT_SHA: ${{ github.sha }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_EC2_METADATA_DISABLED: true
         run: |
-          aws s3 cp "$BENCH_RESULTS_PATH" "s3://test-armonik-bench-storage/commit/$COMMIT_SHA/$date-htcmock-$ntasks_tasks.json"
+          aws s3 cp "$BENCH_RESULTS_PATH" "s3://test-armonik-bench-storage/main_bench_htcmock_$GITHUB_RUN_ID.json"
           
       - if: "always()"
         id: destroy
diff --git a/tools/ci/htcmock-job-template.yml b/tools/ci/htcmock-job-template.yml
index f4a26710e..1dfe61fb2 100644
--- a/tools/ci/htcmock-job-template.yml
+++ b/tools/ci/htcmock-job-template.yml
@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: htcmock-session
+  name: bench-htcmock
   namespace: armonik
 spec:
   ttlSecondsAfterFinished: 0