diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 6c47d08bf92..f251bcaf81c 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -4,6 +4,15 @@ env:
   VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
   DOCKER_REGISTRY: "docker.elastic.co"
 steps:
+  - label: "check-ci"
+    key: "check-ci"
+    command: ".buildkite/scripts/steps/check-ci.sh"
+    agents:
+      provider: "gcp"
+      image: "family/core-ubuntu-2204"
+    retry:
+      manual:
+        allowed: true
   - group: "Unit tests"
     key: "unit-tests"
     steps:
diff --git a/.buildkite/scripts/steps/check-ci.sh b/.buildkite/scripts/steps/check-ci.sh
new file mode 100755
index 00000000000..46923d1b7ef
--- /dev/null
+++ b/.buildkite/scripts/steps/check-ci.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common.sh
+
+echo "--- Check CI"
+go version
+mage --version
+BEAT_VERSION=$(make get-version)
+echo "Beat version: $BEAT_VERSION"
+make check-ci
\ No newline at end of file