diff --git a/.ci/bump.sh b/.ci/bump.sh
deleted file mode 100755
index 6c434a1932..0000000000
--- a/.ci/bump.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ -z $VERSION ]]; then
-  echo "Required environment variable VERSION not set"
-  exit 1;
-fi
-
-# If VERSION is x.y.z, set it to x.y
-if [[ ${VERSION} =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
-  VERSION=${VERSION%.*}
-fi
-
-sed -i "s/\(STACK_VERSION:\s\)\([0-9.]\+\)\(-SNAPSHOT\)/\1$VERSION\3/" .github/workflows/validate-pr.yml
diff --git a/.ci/make.sh b/.ci/make.sh
deleted file mode 100755
index 9818c454e2..0000000000
--- a/.ci/make.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-# ------------------------------------------------------- #
-#
-# Build entry script for elasticsearch-specification
-#
-# Must be called: ./.ci/make.sh <target> <params>
-#
-# Version: 1.1.0
-#
-# Targets:
-# ---------------------------
-# bump     <VERSION> : bump client internals to version
-# ------------------------------------------------------- #
-
-# ------------------------------------------------------- #
-# Bootstrap
-# ------------------------------------------------------- #
-script_path=$(dirname "$(realpath -s "$0")")
-repo=$(realpath "$script_path/../")
-
-# shellcheck disable=SC1090
-CMD=$1
-VERSION=$2
-set -euo pipefail
-
-product="elastic/elasticsearch-specification"
-case $CMD in
-  bump)
-    if [ -v $VERSION ]; then
-      echo -e "\033[31;1mTARGET: bump -> missing version parameter\033[0m"
-      exit 1
-    fi
-    echo -e "\033[36;1mTARGET: bump to version $VERSION\033[0m"
-    TASK=bump
-    # VERSION is BRANCH here for now
-    TASK_ARGS=("$VERSION")
-    ;;
-esac
-
-# ------------------------------------------------------- #
-# Build Container
-# ------------------------------------------------------- #
-
-echo -e "\033[34;1mINFO: building $product container\033[0m"
-docker build -t ${product} ./.ci
-
-# ------------------------------------------------------- #
-# Run the Container
-# ------------------------------------------------------- #
-
-echo -e "\033[34;1mINFO: running $product container\033[0m"
-
-docker run \
-       --env "VERSION=${VERSION}" \
-       --volume "${repo}:/usr/src/app" \
-       --rm \
-       "${product}" \
-       make $TASK
diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml
index 6977fb56cb..48c33df002 100644
--- a/.github/workflows/validate-pr.yml
+++ b/.github/workflows/validate-pr.yml
@@ -17,8 +17,6 @@ jobs:
     name: build
     if: github.repository_owner == 'elastic' # this action will fail if executed from a fork
     runs-on: ubuntu-latest
-    env:
-      STACK_VERSION: 8.13-SNAPSHOT
 
     steps:
       - uses: actions/checkout@v2
@@ -53,8 +51,13 @@ jobs:
       - name: Download artifacts
         working-directory: ./clients-flight-recorder
         run: |
+          if [[ -n "${GITHUB_BASE_REF+x}" ]]; then
+            branch=$GITHUB_BASE_REF
+          else
+            branch=$GITHUB_REF_NAME
+          fi
           node scripts/upload-recording/download.js --branch latest
-          node scripts/clone-elasticsearch/index.js --version ${{ env.STACK_VERSION }}
+          node scripts/clone-elasticsearch/index.js --branch $branch
         env:
           GCS_CREDENTIALS: ${{ secrets.GCS_CREDENTIALS }}
 
@@ -69,4 +72,4 @@ jobs:
 
       - name: Run validation
         working-directory: ./elasticsearch-specification
-        run: node .github/validate-pr --token ${{ secrets.GITHUB_TOKEN }} --version ${{ env.STACK_VERSION }}
+        run: node .github/validate-pr --token ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
index a8fa83a89a..563409ca2f 100644
--- a/Makefile
+++ b/Makefile
@@ -55,10 +55,6 @@ dump-routes: ## Create a new schema with all generics expanded
 
 contrib: | generate license-check spec-format-fix transform-to-openapi ## Pre contribution target
 
-bump:
-	@echo ">> bumping..."
-	.ci/bump.sh
-
 help:  ## Display help
 	@awk 'BEGIN {FS = ":.*##"; printf "Usage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 #------------- <https://suva.sh/posts/well-documented-makefiles> --------------
diff --git a/specification/indices/create/IndicesCreateRequest.ts b/specification/indices/create/IndicesCreateRequest.ts
index 93e202dd1e..52141aeec9 100644
--- a/specification/indices/create/IndicesCreateRequest.ts
+++ b/specification/indices/create/IndicesCreateRequest.ts
@@ -54,7 +54,7 @@ export interface Request extends RequestBase {
      */
     timeout?: Duration
     /**
-     The number of shard copies that must be active before proceeding with the operation. 
+     The number of shard copies that must be active before proceeding with the operation.
      * Set to `all` or any positive integer up to the total number of shards in the index (`number_of_replicas+1`).
      * @server_default 1
      */