diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
index 76fdfb3e6cdc..4607a0576d0b 100644
--- a/.buildkite/pull-requests.json
+++ b/.buildkite/pull-requests.json
@@ -141,8 +141,8 @@
             "always_trigger_comment_regex": "^/test elastic-agent$",
             "skip_ci_labels": [  ],
             "skip_target_branches": [ ],
-            "skip_ci_on_only_changed": ["^xpack/elastic-agent/README.md", "^xpack/elastic-agent/docs/.*", "^xpack/elastic-agent/devtools/.*" ],
-            "always_require_ci_on_changed": ["^xpack/elastic-agent/.*", ".buildkite/xpack/elastic-agent/.*", "^go.mod", "^pytest.ini", "^dev-tools/.*", "^libbeat/.*", "^testing/.*"]
+            "skip_ci_on_only_changed": ["^x-pack/elastic-agent/README.md", "^x-pack/elastic-agent/docs/.*", "^x-pack/elastic-agent/devtools/.*" ],
+            "always_require_ci_on_changed": ["^x-pack/elastic-agent/.*", ".buildkite/x-pack/elastic-agent/.*", "^go.mod", "^pytest.ini", "^dev-tools/.*", "^libbeat/.*", "^testing/.*"]
         }
     ]
 }
diff --git a/.buildkite/xpack/elastic-agent/pipeline.xpack.elastic-agent.yml b/.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.yml
similarity index 100%
rename from .buildkite/xpack/elastic-agent/pipeline.xpack.elastic-agent.yml
rename to .buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.yml
diff --git a/catalog-info.yaml b/catalog-info.yaml
index d145975ab7d3..f3dd3094788e 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -401,7 +401,7 @@ spec:
       description: "Beats xpack elastic agent pipeline"
     spec:
       branch_configuration: "7.17"
-      pipeline_file: ".buildkite/xpack/elastic-agent/pipeline.xpack.elastic-agent.yml"
+      pipeline_file: ".buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.yml"
       provider_settings:
         build_pull_request_forks: false
         build_pull_requests: true # requires filter_enabled and filter_condition settings as below when used with buildkite-pr-bot