diff --git a/.ci/generate-releases.sh b/.ci/generate-releases.sh
index 1ee83323..c54078a7 100755
--- a/.ci/generate-releases.sh
+++ b/.ci/generate-releases.sh
@@ -78,6 +78,7 @@ function next() {
   retry 3 curl -s "${URL}/versions?${NO_KPI_URL_PARAM}" 2> /dev/null > $file
   jq -r --arg version "$version" '[.versions[]
     | select(contains("SNAPSHOT")|not)
+    | select(contains("+build")|not)
     | select(startswith($version))]
     | sort_by(.| split(".") | map(tonumber))
     | .[-1]' $file
diff --git a/.ci/generate-snapshots.sh b/.ci/generate-snapshots.sh
index b9d2ed08..79f0026b 100755
--- a/.ci/generate-snapshots.sh
+++ b/.ci/generate-snapshots.sh
@@ -30,7 +30,7 @@ NO_KPI_URL_PARAM="x-elastic-no-kpi=true"
 
 
 echo ">> Query versions in ${URL}"
-QUERY_OUTPUT=$(curl -s "${URL}/versions?${NO_KPI_URL_PARAM}"| jq -r '.aliases[] | select(contains("SNAPSHOT"))')
+QUERY_OUTPUT=$(curl -s "${URL}/versions?${NO_KPI_URL_PARAM}"| jq -r '.aliases[] | select(contains("SNAPSHOT")) | select(contains("+build")|not)')
 for version in ${QUERY_OUTPUT}; do
   LATEST_OUTPUT=$(curl -s "${URL}/versions/${version}/builds/latest?${NO_KPI_URL_PARAM}" | jq 'del(.build.projects,.manifests) | . |= .build')
   BRANCH=$(echo "$LATEST_OUTPUT" | jq -r .branch)