diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 513b08d..0d05e50 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -18,11 +18,15 @@ jobs:
         path: ./cache
         key: ${{ runner.os }}-benchmark
     - name: Save Benchmark Results
-      uses: rhysd/github-action-benchmark@v1
+      uses: benchmark-action/github-action-benchmark@v1
       with:
         tool: 'go'
         output-file-path: output.txt
         github-token: ${{ secrets.BENCHMARK_TOKEN }}
+        benchmark-data-dir-path: 'benchmarks'
         fail-on-alert: true
-        comment-on-alert: true
-        auto-push: true
+        comment-on-alert: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+        # Enable Job Summary for PRs - deactivated because of issues
+        #summary-always: ${{ github.event_name != 'push' && github.event_name != 'workflow_dispatch' }}
+        auto-push: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+        save-data-file: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}