diff --git a/.ci/generate-buildkite-pipeline-premerge b/.ci/generate-buildkite-pipeline-premerge
index f32eb7213b9402..318b968fbc7025 100755
--- a/.ci/generate-buildkite-pipeline-premerge
+++ b/.ci/generate-buildkite-pipeline-premerge
@@ -197,17 +197,6 @@ function check-targets() {
 
 # Project specific pipelines.
 
-# If libc++ or one of the runtimes directories changed.
-if echo "$modified_dirs" | grep -q -E "^(libcxx|libcxxabi|libunwind|runtimes|cmake)$"; then
-  cat <<EOF
-- trigger: "libcxx-ci"
-  build:
-    message: "${buildMessage}"
-    commit: "${BUILDKITE_COMMIT}"
-    branch: "${BUILDKITE_BRANCH}"
-EOF
-fi
-
 # If clang changed.
 if echo "$modified_dirs" | grep -q -E "^(clang)$"; then
   cat <<EOF
diff --git a/.github/workflows/libcxx-build-and-test.yaml b/.github/workflows/libcxx-build-and-test.yaml
index 1666a687aa5d04..ee3beba9da3048 100644
--- a/.github/workflows/libcxx-build-and-test.yaml
+++ b/.github/workflows/libcxx-build-and-test.yaml
@@ -207,3 +207,14 @@ jobs:
             **/CMakeError.log
             **/CMakeOutput.log
             **/crash_diagnostics/*
+  buildkite-stage:
+    if: github.repository_owner == 'philnik777'
+    runs-on: ubuntu-latest
+    continue-on-error: false
+    steps:
+      - name: Trigger Buildkite Pipeline
+        uses: buildkite/trigger-pipeline-action@v2.0.0
+        with:
+          buildkite_api_access_token: ${{ secrets.TRIGGER_BK_BUILD_TOKEN }}
+          pipeline: "llvm-project/libcxx-ci"
+          ignore_pipeline_branch_filter: true
diff --git a/libcxx/include/libcxx_trigger b/libcxx/include/libcxx_trigger
new file mode 100644
index 00000000000000..e69de29bb2d1d6