diff --git a/.buildkite/kibana.sh b/.buildkite/kibana.sh
index 857d15a814..e7a3edbb03 100644
--- a/.buildkite/kibana.sh
+++ b/.buildkite/kibana.sh
@@ -5,15 +5,21 @@ set -euo pipefail
 # Since we're into the current repo, move to the top-level
 cd ..
 
+echo "--- Install dependencies"
+lsb_release -a
+apt-get update -y
+apt-get install -y unzip
+
 echo "--- Clone elasticsearch-js"
 git clone -v -- git@github.com:elastic/elasticsearch-js.git
-pushd elasticsearch-js
-git checkout $BUILDKITE_BRANCH
-popd
+
+echo "--- Clone elastic-client-generator-js"
+git clone -v -- git@github.com:elastic/elastic-client-generator-js.git
+mkdir elastic-client-generator-js/output
 
 echo "--- Clone Kibana"
 git clone -v --reference /usr/local/git-references/git-github-com-elastic-kibana-git -- git@github.com:elastic/kibana.git
-cd kibana
+pushd kibana
 
 echo "--- Install Node.js and Yarn"
 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
@@ -25,13 +31,17 @@ set -e
 nvm install
 nvm use
 npm install --global yarn
+popd
 
 echo "--- Install elasticsearch-js"
-pushd ../elasticsearch-js
+pushd elasticsearch-js
 npm install
+node .buildkite/make.mjs --task codegen main
 npm run build
 npm pack
 popd
+
+pushd kibana
 yarn add ../elasticsearch-js/elastic-elasticsearch-*.tgz
 
 echo "--- Bootstrap Kibana"
diff --git a/.buildkite/kibana.yml b/.buildkite/kibana.yml
index d67ab615fd..1fd6b35af7 100644
--- a/.buildkite/kibana.yml
+++ b/.buildkite/kibana.yml
@@ -3,7 +3,6 @@ agents:
   cpu: "4"
   ephemeralStorage: 15Gi
 
-
 steps:
   - label: "Run Kibana type checks"
     command: .buildkite/kibana.sh