diff --git a/.buildkite/run-repository.sh b/.buildkite/run-repository.sh
index e5361f05c2..6ab4ae6c04 100644
--- a/.buildkite/run-repository.sh
+++ b/.buildkite/run-repository.sh
@@ -41,7 +41,7 @@ ELASTICSEARCH_BUILD_VERSION=$(curl -sSk $external_elasticsearch_url | jq -r '.ve
 ELASTICSEARCH_BUILD_HASH=$(curl -sSk $external_elasticsearch_url | jq -r '.version.build_hash')
 
 echo -e "\033[34;1mINFO:\033[0m Download Elasticsearch specs... \033[0m"
-docker run --volume=$WORKSPACE/tmp:/tmp --workdir=/go-elasticsearch/internal/build --rm elastic/go-elasticsearch /bin/sh -c "
+docker run -e ELASTICSEARCH_BUILD_VERSION=$ELASTICSEARCH_BUILD_VERSION --volume=$WORKSPACE/tmp:/tmp --workdir=/go-elasticsearch/internal/build --rm elastic/go-elasticsearch /bin/sh -c "
   go mod download
   go run main.go download-spec -o /tmp -d
 "
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31a29b2537..981597c195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 8.18.1
+
+ * This patch release fixes the broken build found in 8.18.0. If you are using the `TypedClient`, you should update to this version.
+
 # 8.18.0
 
 * Update `elastictransport` to `8.7.0`.
diff --git a/go.mod b/go.mod
index a43b6b8e43..6c38e42f76 100644
--- a/go.mod
+++ b/go.mod
@@ -16,3 +16,5 @@ require (
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	golang.org/x/sys v0.19.0 // indirect
 )
+
+retract v8.18.0