diff --git a/.github/workflows/benchmark-tag.yml b/.github/workflows/benchmark-tag.yml
index fb3225604..b20d3b48d 100644
--- a/.github/workflows/benchmark-tag.yml
+++ b/.github/workflows/benchmark-tag.yml
@@ -51,7 +51,7 @@ jobs:
           fi
 
       - name: "Checkout to specific ref"
-        uses: "actions/checkout@v2"
+        uses: "actions/checkout@v4"
         with:
           ref: ${{ env.GIT_REF }}
 
@@ -63,14 +63,6 @@ jobs:
           php-version: "${{ matrix.php-version }}"
           ini-values: memory_limit=-1
 
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: none
-          tools: composer:v2
-          php-version: "${{ matrix.php-version }}"
-          ini-values: memory_limit=-1
-
       - name: "Get Composer Cache Directory"
         id: composer-cache
         run: |
diff --git a/.github/workflows/test-benchmark.yml b/.github/workflows/test-benchmark.yml
index 0ea7e4e1c..2a2458cad 100644
--- a/.github/workflows/test-benchmark.yml
+++ b/.github/workflows/test-benchmark.yml
@@ -8,6 +8,7 @@ on:
       - 'src/core/**'
       - 'src/lib/**'
       - 'tools/**'
+      - 'composer.json'
       - 'composer.lock'
 
 jobs:
@@ -96,4 +97,4 @@ jobs:
           echo '---' >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
           composer test:benchmark -- --ref=1.x --progress=none --group=entry_factory >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
\ No newline at end of file
+          echo '```' >> $GITHUB_STEP_SUMMARY
diff --git a/composer.json b/composer.json
index 0b22b2f9b..94eedd8e9 100644
--- a/composer.json
+++ b/composer.json
@@ -165,7 +165,7 @@
             "tools/phpunit/vendor/bin/phpunit"
         ],
         "test:benchmark": [
-            "tools/phpbench/vendor/bin/phpbench run --report=aggregate --retry-threshold=5"
+            "tools/phpbench/vendor/bin/phpbench run --report=flow-report"
         ],
         "test:mutation": [
             "tools/infection/vendor/bin/infection -j2"
diff --git a/phpbench.json b/phpbench.json
index 816bdffd8..962d3823e 100644
--- a/phpbench.json
+++ b/phpbench.json
@@ -1,6 +1,19 @@
 {
   "$schema": "./tools/phpbench/vendor/phpbench/phpbench/phpbench.schema.json",
   "runner.bootstrap": "vendor/autoload.php",
+  "report.generators": {
+    "flow-report": {
+      "generator": "expression",
+      "cols": {
+        "benchmark": null,
+        "subject": null,
+        "revs": null,
+        "its": null,
+        "mem_peak": null,
+        "mode": null
+      }
+    }
+  },
   "runner.path": [
     "src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Benchmark/",
     "src/adapter/etl-adapter-csv/tests/Flow/ETL/Adapter/CSV/Tests/Benchmark/",
@@ -11,5 +24,6 @@
     "src/core/etl/tests/Flow/ETL/Tests/Benchmark/"
   ],
   "runner.progress": "dots",
+  "runner.retry_threshold": 5,
   "storage.xml_storage_path": "var/phpbench"
 }