diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
new file mode 100644
index 00000000000..dcf5dd63d37
--- /dev/null
+++ b/.buildkite/pull-requests.json
@@ -0,0 +1,20 @@
+{
+    "jobs": [
+        {
+            "enabled": true,            
+            "pipelineSlug": "apm-server-package",
+            "allow_org_users": true,
+            "allowed_repo_permissions": ["admin", "write"],
+            "allowed_list": ["dependabot[bot]", "elastic-observability-automation[bot]", "github-actions[bot]", "mergify[bot]"],
+            "build_on_commit": true,
+            "build_on_comment": true,
+            "set_commit_status": true,
+            "trigger_comment_regex": "^/package",
+            "always_trigger_comment_regex": "^/package",
+            "skip_ci_labels": [ "skip-ci" ],
+            "skip_target_branches": [ ],
+            "skip_ci_on_only_changed": [ "^.ci/", "^.github/", "catalog-info.yaml", "^updatecli-compose.yaml", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.mergify.yml", "^.pre-commit-config.yaml", "\\.txt$", "Tiltfile" ],
+            "always_require_ci_on_changed": [ ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 8f4493e4d85..0c051131ae9 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -34,6 +34,7 @@ spec:
     metadata:
       name: apm-server-package
     spec:
+      branch_configuration: "main 7.* 8.* 9.*"
       repository: elastic/apm-server
       pipeline_file: ".buildkite/package.yml"
       provider_settings:
@@ -41,14 +42,19 @@ spec:
         build_pull_requests: true
         build_tags: false
         filter_enabled: true
-        filter_condition: build.branch == "main" || build.branch == "8.x" || build.branch =~ /^[0-9]+\.[0-9]+$$/ || build.branch =~ /^feature\//
-      cancel_intermediate_builds: false
-      skip_intermediate_builds: false
+        filter_condition: >-
+          build.pull_request.id == null || (build.creator.name == 'elasticmachine' && build.pull_request.id != null)
+      cancel_intermediate_builds: true
+      cancel_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
+      skip_intermediate_builds: true
+      skip_intermediate_builds_branch_filter: "!main !7.* !8.* !9.*"
       teams:
         obs-ds-intake-services: {}
         observablt-robots: {}
         everyone:
           access_level: READ_ONLY
+      env:
+        ELASTIC_PR_COMMENTS_ENABLED: 'true'
       schedules:
         Weekly 7.17:
           branch: "7.17"