diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
index dbbb3334429..0701d846fe4 100644
--- a/.github/workflows/benchmarks.yml
+++ b/.github/workflows/benchmarks.yml
@@ -54,6 +54,10 @@ jobs:
       GOBENCH_PASSWORD: ${{ secrets.GOBENCH_PASSWORD }}
       GOBENCH_USERNAME: ${{ secrets.GOBENCH_USERNAME }}
       GOBENCH_HOST: ${{ secrets.GOBENCH_HOST }}
+      # temporarily override to get faster feedback
+      BENCHMARK_WARMUP_TIME: 1m
+      BENCHMARK_COUNT: 2
+      BENCHMARK_TIME: 1m
     steps:
       - uses: actions/checkout@v4
 
@@ -184,15 +188,14 @@ jobs:
       - name: Open PGO PR
         run: |
           cd "${{ github.workspace }}"
-          cp "$PROFILE_PATH" x-pack/apm-server/default.pgo
-          cp "$PROFILE_PATH" cmd/apm-server/default.pgo
+          mv "$PROFILE_PATH" x-pack/apm-server/default.pgo
           git config user.email "apm@elastic.co"
           git config user.name "APM Server"
           git fetch origin main
           git checkout main
           BRANCH="update-pgo-$(date +%s)"
           git checkout -b "$BRANCH"
-          git add x-pack/apm-server/default.pgo cmd/apm-server/default.pgo
+          git add x-pack/apm-server/default.pgo
           git commit -m "PGO: Update default.pgo from benchmarks $WORKFLOW."
           git push -u origin "$BRANCH"
           gh pr create -B main -H "$BRANCH" --t "PGO: Update default.pgo" --b "Update default.pgo CPU profile from the benchmarks [workflow]($WORKFLOW)." -R elastic/apm-server
diff --git a/systemtest/benchtest/profiles.go b/systemtest/benchtest/profiles.go
index 9e2ee89b43a..2214c7e764e 100644
--- a/systemtest/benchtest/profiles.go
+++ b/systemtest/benchtest/profiles.go
@@ -88,7 +88,12 @@ func (p *profiles) recordCPU() error {
 	if benchConfig.CPUProfile == "" {
 		return nil
 	}
-	duration := 2 * benchConfig.Benchtime
+	// Limit the CPU profile collection to static 1 minute interval per a benchmark.
+	// Otherwise the profile will be too heavy and over influenced by the "longest" benchmark.
+	duration := time.Minute
+	if duration > benchConfig.Benchtime {
+		duration = benchConfig.Benchtime
+	}
 	profile, err := fetchProfile("/debug/pprof/profile", duration)
 	if err != nil {
 		return fmt.Errorf("failed to fetch CPU profile: %w", err)