diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
index 001d7cd1709..628f46e6172 100644
--- a/.buildkite/pull-requests.json
+++ b/.buildkite/pull-requests.json
@@ -1,7 +1,7 @@
 {
     "jobs": [
         {
-            "enabled": true,
+            "enabled": true,            
             "pipelineSlug": "elastic-agent",
             "allow_org_users": true,
             "allowed_repo_permissions": ["admin", "write"],
@@ -11,13 +11,14 @@
             "build_on_comment": true,
             "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
             "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^/test$",
-            "skip_ci_labels": [  ],
+            "skip_ci_labels": [ "skip-ci" ],
             "skip_target_branches": [ ],
-            "skip_ci_on_only_changed": [ "changelog", "docs", "README.md", "sonar-project.properties", "docker-compose.yml", ".pre-commit-config.yaml", "skaffold.yaml", "Dockerfile.skaffold", "Dockerfile"],
+            "skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
             "always_require_ci_on_changed": [ ]
         },
         {
             "enabled": true,
+            "build_drafts": false,
             "pipelineSlug": "elastic-agent-extended-testing",
             "allow_org_users": true,
             "allowed_repo_permissions": ["admin", "write"],
@@ -27,9 +28,9 @@
             "build_on_comment": true,
             "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
             "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:extended))|^/test extended$",
-            "skip_ci_labels": [  ],
+            "skip_ci_labels": [ "skip-ci", "skip-it" ],
             "skip_target_branches": [ ],
-            "skip_ci_on_only_changed": [ "changelog", "docs", "README.md", "sonar-project.properties", "docker-compose.yml", ".pre-commit-config.yaml", "skaffold.yaml", "Dockerfile.skaffold", "Dockerfile"],
+            "skip_ci_on_only_changed": [ "^.ci/", "^.github/", "^changelog", "^docs/", "\\.md$", "^sonar-project.properties", "^docker-compose.yml", "^.pre-commit-config.yaml", "skaffold.yaml", "^Dockerfile.skaffold", "^Dockerfile"],
             "always_require_ci_on_changed": [ ]
         },
         {
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d4abe0c32ab..3335fee4631 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -69,3 +69,13 @@ Link related issues below. Insert the issue link or reference after the word "Cl
 - How are we going to debug this?
 - What are the metrics I should take care of?
 - ...
+
+<!-- CI Cheatsheet
+Trigger comments:
+/test             (Or `buildkite test this|it`) Triggers unit test pipeline
+/test extended    (Or `buildkite test extended`) Triggers integration test pipeline
+
+PR labels:
+skip-ci           Skips unit and integration tests
+skip-it           Skips integration tests
+-->
\ No newline at end of file