diff --git a/.github/workflows/bench-aws.yml b/.github/workflows/bench-aws.yml
index ad86188d4..078c775d8 100644
--- a/.github/workflows/bench-aws.yml
+++ b/.github/workflows/bench-aws.yml
@@ -1,4 +1,4 @@
-name: "Benchmark ArmoniK with Bench"
+name: "Benchmark with Bench client"
 
 on:
   push:
@@ -8,19 +8,26 @@ on:
     types: [published]
 
 jobs:
-  # define-matrix:
-  #   runs-on: ubuntu-latest
-
-  #   outputs:
-  #     types: ${{ steps.types.outputs.type }}
-  #     exclude: ${{ steps.types.outputs.exclude }}
-  #   steps:
-  #     - name: Define Colors
-  #       id: types
-  #       env:
-  #         TRIGGER: ${{ github.event_name }} 
-  #       run: |
-  #         echo 'type=["localhost", "aws"]' >> "$GITHUB_OUTPUT"
+  define-matrix:
+    name: Define matrix
+    runs-on: ubuntu-latest
+    outputs:
+      types: ${{ steps.types.outputs.type }}
+      include: ${{ steps.types.outputs.include }}
+    steps:
+      - name: Define Colors
+        id: types
+        env:
+          TRIGGER: ${{ github.event_name }} 
+        run: |
+          set -ex
+          if [ "$TRIGGER" = 'push' ]; then
+            echo 'type=["localhost"]' >> "$GITHUB_OUTPUT"
+            echo 'include=[{"type": "localhost", "ntasks":100, "polling-limit": 300}]' >> "$GITHUB_OUTPUT"
+          elif [ "$TRIGGER" = 'release' ]
+           echo 'type=["localhost", "aws"]' >> "$GITHUB_OUTPUT"
+           echo 'include=[{"type": "localhost", "ntasks":100, "polling-limit": 300}, {"type": "localhost", "ntasks":100, "polling-limit": 300}]' >> "$GITHUB_OUTPUT"
+          fi
 
   benchmark:
     name: ${{ matrix.type }}
@@ -33,10 +40,10 @@ jobs:
         include:
           - type: localhost
             ntasks: 100
-            polling-limit: 300
+            polling-limit: 1000
           - type: aws
             ntasks: 1000
-            polling-limit: 600       
+            polling-limit: 1000
     env:
       prefix: benchmark
     outputs:
@@ -104,7 +111,7 @@ jobs:
         with:
           grpc-client-endpoint: ${{ steps.get-armonik-endpoint.outputs.grpc-endpoint }}
           session-name: ${{ steps.bench.outputs.session-name }}
-          poll-duration-limit: 720
+          poll-duration-limit: ${{ matrix.polling-limit }}
 
       - name: Upload benchmark results to artifact registry
         uses: actions/upload-artifact@v4