diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index e362e3e1..4deeec3d 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -67,7 +67,8 @@ steps:
               interpolation: false
               watch:
                 - path:
-                    - .buildkite/pipeline.yml
+                    # As long as https://github.com/elastic/golang-crossbuild/issues/615
+                    #- .buildkite/pipeline.yml
                     - .buildkite/llvm-apple-pipeline.yml
                     - .buildkite/scripts/llvm-apple
                     - go/llvm-apple/**
diff --git a/.buildkite/pull-requests.json b/.buildkite/pull-requests.json
index 9e252c17..8f499cee 100644
--- a/.buildkite/pull-requests.json
+++ b/.buildkite/pull-requests.json
@@ -16,40 +16,6 @@
             "skip_ci_on_only_changed": [ "\\.md$", ".mergify.yml", "^.github/" ],
             "always_require_ci_on_changed": [ ],
             "fail_on_not_mergeable": true
-        },
-        {
-          "enabled": true,
-          "pipelineSlug": "llvm-apple",
-          "allow_org_users": true,
-          "allowed_repo_permissions": ["admin", "write"],
-          "allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]", "elastic-vault-github-plugin-prod[bot]"],
-          "set_commit_status": true,
-          "build_on_commit": true,
-          "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_target_branches": [ ],
-          "skip_ci_on_only_changed": [ ],
-          "always_require_ci_on_changed": [ ],
-          "fail_on_not_mergeable": true
-        },
-        {
-          "enabled": true,
-          "pipelineSlug": "fpm",
-          "allow_org_users": true,
-          "allowed_repo_permissions": ["admin", "write"],
-          "allowed_list": ["dependabot[bot]", "mergify[bot]", "github-actions[bot]", "elastic-vault-github-plugin-prod[bot]"],
-          "set_commit_status": true,
-          "build_on_commit": true,
-          "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_target_branches": [ ],
-          "skip_ci_on_only_changed": [ ],
-          "always_require_ci_on_changed": [ ],
-          "fail_on_not_mergeable": true
         }
     ]
 }