diff --git a/deploy-manage/deploy/_snippets/stack-version-compatibility.md b/deploy-manage/deploy/_snippets/stack-version-compatibility.md
index 0fe8644575..c8189b676c 100644
--- a/deploy-manage/deploy/_snippets/stack-version-compatibility.md
+++ b/deploy-manage/deploy/_snippets/stack-version-compatibility.md
@@ -1,3 +1,3 @@
-When installing the {{stack}}, you must use the same version across the entire stack. For example, if you are using {{es}} {{stack-version}}, you install Beats {{stack-version}}, APM Server {{stack-version}}, {{es}} Hadoop {{stack-version}}, {{kib}} {{stack-version}}, and Logstash {{stack-version}}.
+When installing the {{stack}}, you must use the same version across the entire stack. For example, if you are using {{es}} {{version.stack}}, you install Beats {{version.stack}}, APM Server {{version.stack}}, {{es}} Hadoop {{version.stack}}, {{kib}} {{version.stack}}, and Logstash {{version.stack}}.
 
-If you’re upgrading an existing installation, see [](/deploy-manage/upgrade.md) for information about how to ensure compatibility with {{stack-version}}.
\ No newline at end of file
+If you’re upgrading an existing installation, see [](/deploy-manage/upgrade.md) for information about how to ensure compatibility with {{version.stack}}.
\ No newline at end of file
diff --git a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
index e5cdc617fc..6e7facfee6 100644
--- a/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
+++ b/deploy-manage/deploy/elastic-cloud/heroku-getting-started-installing.md
@@ -42,10 +42,10 @@ If you want your add-on to run a specific version of {{es}}, use the `--elastics
 
 To find which {{es}} versions and plugins are currently available, you can omit the version to default to the latest one and add plugins later on from the [{{heroku}} console](https://cloud.elastic.co?page=docs&placement=docs-body). To use your own custom plugins, you can upload and select these plugins in the console as well.
 
-For example: Install the add-on version {{stack-version}} and include the phonetic analysis plugin for  MY_APP:
+For example: Install the add-on version {{version.stack}} and include the phonetic analysis plugin for  MY_APP:
 
 ```bash subs=true
-heroku addons:create foundelasticsearch --elasticsearch-version {{stack-version}} --plugins analysis-phonetic --app MY_APP
+heroku addons:create foundelasticsearch --elasticsearch-version {{version.stack}} --plugins analysis-phonetic --app MY_APP
 ```
 
 After the add-on gets added, you can perform future version upgrades and plugin changes through the [console](heroku-getting-started-accessing.md).
diff --git a/deploy-manage/deploy/self-managed/_snippets/wolfi.md b/deploy-manage/deploy/self-managed/_snippets/wolfi.md
index af884464ce..fd7c45fd8d 100644
--- a/deploy-manage/deploy/self-managed/_snippets/wolfi.md
+++ b/deploy-manage/deploy/self-managed/_snippets/wolfi.md
@@ -5,5 +5,5 @@ To use the Wolfi image, append `-wolfi` to the image tag in the Docker command.
 For example:
 
 ```sh subs=true
-docker pull docker.elastic.co/elasticsearch/elasticsearch-wolfi:{{stack-version}}
+docker pull docker.elastic.co/elasticsearch/elasticsearch-wolfi:{{version.stack}}
 ```
\ No newline at end of file
diff --git a/deploy-manage/deploy/self-managed/air-gapped-install.md b/deploy-manage/deploy/self-managed/air-gapped-install.md
index 1226afdff7..08a90fbe95 100644
--- a/deploy-manage/deploy/self-managed/air-gapped-install.md
+++ b/deploy-manage/deploy/self-managed/air-gapped-install.md
@@ -98,7 +98,7 @@ EPR_BIND_ADDRESS="0.0.0.0"
 EPR_BIND_PORT="8443"
 EPR_TLS_CERT="/etc/elastic/epr/epr.pem"
 EPR_TLS_KEY="/etc/elastic/epr/epr-key.pem"
-EPR_IMAGE="docker.elastic.co/package-registry/distribution:{{stack-version}}"
+EPR_IMAGE="docker.elastic.co/package-registry/distribution:{{version.stack}}"
 
 podman create \
   --name "elastic-epr" \
@@ -149,7 +149,7 @@ ExecStart=/usr/bin/podman run \
   -v /etc/elastic/epr/epr-key.pem:/etc/ssl/epr.key:ro \
   -e EPR_ADDRESS=0.0.0.0:8443 \
   -e EPR_TLS_CERT=/etc/ssl/epr.crt \
-  -e EPR_TLS_KEY=/etc/ssl/epr.key docker.elastic.co/package-registry/distribution:{{stack-version}}
+  -e EPR_TLS_KEY=/etc/ssl/epr.key docker.elastic.co/package-registry/distribution:{{version.stack}}
 ExecStop=/usr/bin/podman stop --ignore --cidfile=%t/%n.ctr-id
 ExecStopPost=/usr/bin/podman rm -f --ignore --cidfile=%t/%n.ctr-id
 Type=notify
@@ -178,7 +178,7 @@ The following example script downloads artifacts from the internet to be later s
 #!/usr/bin/env bash
 set -o nounset -o errexit -o pipefail
 
-STACK_VERSION={{stack-version}}
+STACK_VERSION={{version.stack}}
 ARTIFACT_DOWNLOADS_BASE_URL=https://artifacts.elastic.co/downloads
 
 DOWNLOAD_BASE_DIR=${DOWNLOAD_BASE_DIR:?"Make sure to set DOWNLOAD_BASE_DIR when running this script"}
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-basic.md b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-basic.md
index 208b0dffdd..089ca3afe2 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-basic.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-basic.md
@@ -35,7 +35,7 @@ Use Docker commands to start a single-node {{es}} cluster for development or tes
 3. Pull the {{es}} Docker image.
 
     ```sh subs=true
-    docker pull docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    docker pull docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
 4. Optional: Install [Cosign](https://docs.sigstore.dev/cosign/system_config/installation/) for your environment. Then use Cosign to verify the {{es}} image’s signature.
@@ -44,13 +44,13 @@ Use Docker commands to start a single-node {{es}} cluster for development or tes
 
     ```sh subs=true
     wget https://artifacts.elastic.co/cosign.pub
-    cosign verify --key cosign.pub docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    cosign verify --key cosign.pub docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
     The `cosign` command prints the check results and the signature payload in JSON format:
 
     ```sh subs=true
-    Verification for docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}} --
+    Verification for docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}} --
     The following checks were performed on each of these signatures:
       - The cosign claims were validated
       - Existence of the claims in the transparency log was verified offline
@@ -60,7 +60,7 @@ Use Docker commands to start a single-node {{es}} cluster for development or tes
 5. Start an {{es}} container.
 
     ```sh subs=true
-    docker run --name es01 --net elastic -p 9200:9200 -it -m 1GB docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    docker run --name es01 --net elastic -p 9200:9200 -it -m 1GB docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
     ::::{tip}
@@ -71,7 +71,7 @@ Use Docker commands to start a single-node {{es}} cluster for development or tes
     {{ml-cap}} features such as [semantic search with ELSER](/solutions/search/semantic-search/semantic-search-elser-ingest-pipelines.md) require a larger container with more than 1GB of memory. If you intend to use the {{ml}} capabilities, then start the container with this command:
 
     ```sh subs=true
-    docker run --name es01 --net elastic -p 9200:9200 -it -m 6GB -e "xpack.ml.use_auto_machine_memory_percent=true" docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    docker run --name es01 --net elastic -p 9200:9200 -it -m 6GB -e "xpack.ml.use_auto_machine_memory_percent=true" docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
     The command prints the `elastic` user password and an enrollment token for {{kib}}.
@@ -114,7 +114,7 @@ Use Docker commands to start a single-node {{es}} cluster for development or tes
 2. Start a new {{es}} container. Include the enrollment token as an environment variable.
 
     ```sh subs=true
-    docker run -e ENROLLMENT_TOKEN="<token>" --name es02 --net elastic -it -m 1GB docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    docker run -e ENROLLMENT_TOKEN="<token>" --name es02 --net elastic -it -m 1GB docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
 3. Call the [cat nodes API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cat-nodes) to verify the node was added to the cluster.
@@ -128,20 +128,20 @@ Use Docker commands to start a single-node {{es}} cluster for development or tes
 1. Pull the {{kib}} Docker image.
 
     ```sh subs=true
-    docker pull docker.elastic.co/kibana/kibana:{{stack-version}}
+    docker pull docker.elastic.co/kibana/kibana:{{version.stack}}
     ```
 
 2. Optional: Verify the {{kib}} image’s signature.
 
     ```sh subs=true
     wget https://artifacts.elastic.co/cosign.pub
-    cosign verify --key cosign.pub docker.elastic.co/kibana/kibana:{{stack-version}}
+    cosign verify --key cosign.pub docker.elastic.co/kibana/kibana:{{version.stack}}
     ```
 
 3. Start a {{kib}} container.
 
     ```sh subs=true
-    docker run --name kib01 --net elastic -p 5601:5601 docker.elastic.co/kibana/kibana:{{stack-version}}
+    docker run --name kib01 --net elastic -p 5601:5601 docker.elastic.co/kibana/kibana:{{version.stack}}
     ```
 
 4. When {{kib}} starts, it outputs a unique generated link to the terminal. To access {{kib}}, open this link in a web browser.
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-compose.md b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-compose.md
index f443916a38..038bef4541 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-compose.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-compose.md
@@ -44,7 +44,7 @@ Use Docker Compose to start a three-node {{es}} cluster with {{kib}}. Docker Com
     ```txt subs=true
     ...
     # Version of Elastic products
-    STACK_VERSION={{stack-version}}
+    STACK_VERSION={{version.stack}}
     ...
     ```
 
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-configure.md b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-configure.md
index fe50572889..3f79072ba2 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-configure.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-configure.md
@@ -66,7 +66,7 @@ For example:
 ```sh subs=true
 docker run -it --rm \
 -v full_path_to/config:/usr/share/elasticsearch/config \
-docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}} \
+docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}} \
 bin/elasticsearch-keystore create -p
 ```
 
@@ -75,7 +75,7 @@ You can also use a `docker run` command to add or update secure settings in the
 ```sh subs=true
 docker run -it --rm \
 -v full_path_to/config:/usr/share/elasticsearch/config \
-docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}} \
+docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}} \
 bin/elasticsearch-keystore \
 add my.secure.setting \
 my.other.secure.setting
@@ -94,7 +94,7 @@ If you’ve already created the keystore and don’t need to update it, you can
 In some environments, it might make more sense to prepare a custom image that contains your configuration. A `Dockerfile` to achieve this might be as simple as:
 
 ```sh subs=true
-FROM docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+FROM docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
 COPY --chown=elasticsearch:elasticsearch elasticsearch.yml /usr/share/elasticsearch/config/
 ```
 
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-prod.md b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-prod.md
index 4fb62452c3..24de6e0da7 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-docker-prod.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-docker-prod.md
@@ -132,7 +132,7 @@ Increased ulimits for [nofile](setting-system-settings.md) and [nproc](/deploy-m
 To check the Docker daemon defaults for ulimits, run:
 
 ```sh subs=true
-docker run --rm docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}} /bin/bash -c 'ulimit -Hn && ulimit -Sn && ulimit -Hu && ulimit -Su'
+docker run --rm docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}} /bin/bash -c 'ulimit -Hn && ulimit -Sn && ulimit -Hu && ulimit -Su'
 ```
 
 If needed, adjust them in the Daemon or override them per container. For example, when using `docker run`, set:
@@ -167,7 +167,7 @@ To manually set the heap size in production, bind mount a [JVM options](elastics
 For testing, you can also manually set the heap size using the `ES_JAVA_OPTS` environment variable. For example, to use 1GB, use the following command.
 
 ```sh subs=true
-docker run -e ES_JAVA_OPTS="-Xms1g -Xmx1g" -e ENROLLMENT_TOKEN="<token>" --name es01 -p 9200:9200 --net elastic -it docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+docker run -e ES_JAVA_OPTS="-Xms1g -Xmx1g" -e ENROLLMENT_TOKEN="<token>" --name es01 -p 9200:9200 --net elastic -it docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
 ```
 
 The `ES_JAVA_OPTS` variable overrides all other JVM options. We do not recommend using `ES_JAVA_OPTS` in production.
@@ -178,7 +178,7 @@ The `ES_JAVA_OPTS` variable overrides all other JVM options. We do not recommend
 Pin your deployments to a specific version of the {{es}} Docker image. For example:
 
 ```sh subs=true
-docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
 ```
 
 
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md b/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
index 3b5db2a4c5..42992bb614 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-from-archive-on-linux-macos.md
@@ -43,14 +43,14 @@ Download and install the archive for Linux or MacOS.
 
 ### Linux [install-linux]
 
-The Linux archive for {{es}} {{stack-version}} can be downloaded and installed as follows:
+The Linux archive for {{es}} {{version.stack}} can be downloaded and installed as follows:
 
 ```sh subs=true
-wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-linux-x86_64.tar.gz
-wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-linux-x86_64.tar.gz.sha512
-shasum -a 512 -c elasticsearch-{{stack-version}}-linux-x86_64.tar.gz.sha512 <1>
-tar -xzf elasticsearch-{{stack-version}}-linux-x86_64.tar.gz
-cd elasticsearch-{{stack-version}}/ <2>
+wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-linux-x86_64.tar.gz
+wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-linux-x86_64.tar.gz.sha512
+shasum -a 512 -c elasticsearch-{{version.stack}}-linux-x86_64.tar.gz.sha512 <1>
+tar -xzf elasticsearch-{{version.stack}}-linux-x86_64.tar.gz
+cd elasticsearch-{{version.stack}}/ <2>
 ```
 
 1. Compares the SHA of the downloaded `.tar.gz` archive and the published checksum, which should output `elasticsearch-<version>-linux-x86_64.tar.gz: OK`.
@@ -60,13 +60,13 @@ cd elasticsearch-{{stack-version}}/ <2>
 
 ### MacOS [install-macos]
 
-The MacOS archive for {{es}} {{stack-version}} can be downloaded and installed as follows:
+The MacOS archive for {{es}} {{version.stack}} can be downloaded and installed as follows:
 
 ```sh subs=true
-curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-darwin-x86_64.tar.gz
-curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-darwin-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
-tar -xzf elasticsearch-{{stack-version}}-darwin-x86_64.tar.gz
-cd elasticsearch-{{stack-version}}/ <2>
+curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-darwin-x86_64.tar.gz
+curl https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-darwin-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
+tar -xzf elasticsearch-{{version.stack}}-darwin-x86_64.tar.gz
+cd elasticsearch-{{version.stack}}/ <2>
 ```
 
 1. Compares the SHA of the downloaded `.tar.gz` archive and the published checksum, which should output `elasticsearch-<version>-darwin-x86_64.tar.gz: OK`.
@@ -75,7 +75,7 @@ cd elasticsearch-{{stack-version}}/ <2>
 ::::{admonition} macOS Gatekeeper warnings
 :class: important
 
-Apple’s rollout of stricter notarization requirements affected the notarization of the {{stack-version}} {{es}} artifacts. If macOS displays a dialog when you first run {{es}} that interrupts it, then you need to take an action to allow it to run.
+Apple’s rollout of stricter notarization requirements affected the notarization of the {{version.stack}} {{es}} artifacts. If macOS displays a dialog when you first run {{es}} that interrupts it, then you need to take an action to allow it to run.
 
 To prevent Gatekeeper checks on the {{es}} files, run the following command on the downloaded .tar.gz archive or the directory to which was extracted:
 
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md b/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
index 62525e0571..413ad087fb 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-with-debian-package.md
@@ -50,7 +50,7 @@ You have several options for installing the {{es}} Debian package:
 
 * [From the APT repository](#deb-repo)
 * [Manually](#install-deb)
-  
+
 ### Install from the APT repository [deb-repo]
 
 1. You may need to install the `apt-transport-https` package on Debian before proceeding:
@@ -99,13 +99,13 @@ Examine `/etc/apt/sources.list.d/elasticsearch-9.x.list` for the duplicate entry
 
 ### Download and install the Debian package manually [install-deb]
 
-The Debian package for {{es}} {{stack-version}} can be downloaded from the website and installed as follows:
+The Debian package for {{es}} {{version.stack}} can be downloaded from the website and installed as follows:
 
 ```sh subs=true
-wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-amd64.deb
-wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-amd64.deb.sha512
-shasum -a 512 -c elasticsearch-{{stack-version}}-amd64.deb.sha512 <1>
-sudo dpkg -i elasticsearch-{{stack-version}}-amd64.deb
+wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-amd64.deb
+wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-amd64.deb.sha512
+shasum -a 512 -c elasticsearch-{{version.stack}}-amd64.deb.sha512 <1>
+sudo dpkg -i elasticsearch-{{version.stack}}-amd64.deb
 ```
 
 1. Compares the SHA of the downloaded Debian package and the published checksum, which should output `elasticsearch-<version>-amd64.deb: OK`.
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md b/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
index f19bb7019e..ad0c9d0c21 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-with-rpm.md
@@ -83,13 +83,13 @@ sudo zypper modifyrepo --enable elasticsearch && \
 
 ### Download and install the RPM manually [install-rpm]
 
-1. Download and install the RPM for {{es}} {{stack-version}} with the following commands:
+1. Download and install the RPM for {{es}} {{version.stack}} with the following commands:
 
     ```sh subs=true
-    wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-x86_64.rpm
-    wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-x86_64.rpm.sha512
-    shasum -a 512 -c elasticsearch-{{stack-version}}-x86_64.rpm.sha512 <1>
-    sudo rpm --install elasticsearch-{{stack-version}}-x86_64.rpm
+    wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-x86_64.rpm
+    wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-x86_64.rpm.sha512
+    shasum -a 512 -c elasticsearch-{{version.stack}}-x86_64.rpm.sha512 <1>
+    sudo rpm --install elasticsearch-{{version.stack}}-x86_64.rpm
     ```
 
     1. Compares the SHA of the downloaded RPM and the published checksum, which should output `elasticsearch-<version>-x86_64.rpm: OK`.
diff --git a/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md b/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
index 8506c8bd2b..afd05b9e22 100644
--- a/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
+++ b/deploy-manage/deploy/self-managed/install-elasticsearch-with-zip-on-windows.md
@@ -42,12 +42,12 @@ On Windows, the {{es}} {{ml}} feature requires the Microsoft Universal C Runtime
 ## Step 1: Download and install the `.zip` package [install-windows]
 
 % link url manually set
-Download the `.zip` archive for {{es}} {{stack-version}} from: [https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{stack-version}}-windows-x86_64.zip](https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-9.0.0-windows-x86_64.zip)
+Download the `.zip` archive for {{es}} {{version.stack}} from: [https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-windows-x86_64.zip](https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-{{version.stack}}-windows-x86_64.zip)
 
 Unzip it with your favorite unzip tool. This will create a folder called `elasticsearch-<version>`, which we will refer to as `%ES_HOME%`. In a terminal window, `cd` to the `%ES_HOME%` directory, for instance:
 
 ```sh subs=true
-cd C:\Program Files\elasticsearch-{{stack-version}}
+cd C:\Program Files\elasticsearch-{{version.stack}}
 ```
 
 ## Step 2: Enable automatic creation of system indices [windows-enable-indices]
diff --git a/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md b/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
index 54e650458c..91420be2c5 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-from-archive-on-linux-macos.md
@@ -27,13 +27,13 @@ macOS is supported for development purposes only and is not covered under the su
 
 ### Linux [install-linux64]
 
-The Linux archive for {{kib}} {{stack-version}} can be downloaded and installed as follows:
+The Linux archive for {{kib}} {{version.stack}} can be downloaded and installed as follows:
 
 ```sh subs=true
-curl -O https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-linux-x86_64.tar.gz
-curl https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-linux-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
-tar -xzf kibana-{{stack-version}}-linux-x86_64.tar.gz
-cd kibana-{{stack-version}}/ <2>
+curl -O https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-linux-x86_64.tar.gz
+curl https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-linux-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
+tar -xzf kibana-{{version.stack}}-linux-x86_64.tar.gz
+cd kibana-{{version.stack}}/ <2>
 ```
 
 1. Compares the SHA of the downloaded `.tar.gz` archive and the published checksum, which should output `kibana-<version>-linux-x86_64.tar.gz: OK`.
@@ -41,13 +41,13 @@ cd kibana-{{stack-version}}/ <2>
 
 ### MacOS [install-darwin64]
 
-The Darwin archive for {{kib}} {{stack-version}} can be downloaded and installed as follows:
+The Darwin archive for {{kib}} {{version.stack}} can be downloaded and installed as follows:
 
 ```sh subs=true
-curl -O https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-darwin-x86_64.tar.gz
-curl https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-darwin-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
-tar -xzf kibana-{{stack-version}}-darwin-x86_64.tar.gz
-cd kibana-{{stack-version}}/ <2>
+curl -O https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-darwin-x86_64.tar.gz
+curl https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-darwin-x86_64.tar.gz.sha512 | shasum -a 512 -c - <1>
+tar -xzf kibana-{{version.stack}}-darwin-x86_64.tar.gz
+cd kibana-{{version.stack}}/ <2>
 ```
 
 1. Compares the SHA of the downloaded `.tar.gz` archive and the published checksum, which should output `kibana-<version>-darwin-x86_64.tar.gz: OK`.
@@ -57,7 +57,7 @@ cd kibana-{{stack-version}}/ <2>
 ::::{admonition} macOS Gatekeeper warnings
 :class: important
 
-Apple’s rollout of stricter notarization requirements affected the notarization of the {{stack-version}} {{kib}} artifacts. If macOS displays a dialog when you first run {{kib}} that interrupts it, you will need to take an action to allow it to run.
+Apple’s rollout of stricter notarization requirements affected the notarization of the {{version.stack}} {{kib}} artifacts. If macOS displays a dialog when you first run {{kib}} that interrupts it, you will need to take an action to allow it to run.
 
 To prevent Gatekeeper checks on the {{kib}} files, run the following command on the downloaded `.tar.gz` archive or the directory to which was extracted:
 
diff --git a/deploy-manage/deploy/self-managed/install-kibana-on-windows.md b/deploy-manage/deploy/self-managed/install-kibana-on-windows.md
index a573592590..c0799768ca 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-on-windows.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-on-windows.md
@@ -18,12 +18,12 @@ products:
 
 ## Step 1: Download and install the `.zip` package [install-windows]
 
-Download the .zip windows archive for {{kib}} {{stack-version}} from [https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-windows-x86_64.zip](https://artifacts.elastic.co/downloads/kibana/kibana-9.0.0-windows-x86_64.zip)
+Download the .zip windows archive for {{kib}} {{version.stack}} from [https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-windows-x86_64.zip](https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-windows-x86_64.zip)
 
-Unzip it with your favorite unzip tool. This will create a folder called kibana-{{stack-version}}-windows-x86_64, which we will refer to as `$KIBANA_HOME`. In a terminal window, CD to the `$KIBANA_HOME` directory, for instance:
+Unzip it with your favorite unzip tool. This will create a folder called kibana-{{version.stack}}-windows-x86_64, which we will refer to as `$KIBANA_HOME`. In a terminal window, CD to the `$KIBANA_HOME` directory, for instance:
 
 ```sh subs=true
-CD c:\kibana-{{stack-version}}-windows-x86_64
+CD c:\kibana-{{version.stack}}-windows-x86_64
 ```
 
 ## Step 2: Start {{es}} and generate an enrollment token for {{kib}} [windows-enroll]
diff --git a/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md b/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
index 37e1866d2e..635504b4da 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-with-debian-package.md
@@ -78,12 +78,12 @@ Examine `/etc/apt/sources.list.d/kibana-9.x.list` for the duplicate entry or loc
 
 ### Download and install the Debian package manually [install-deb]
 
-The Debian package for {{kib}} {{stack-version}} can be downloaded from the website and installed as follows:
+The Debian package for {{kib}} {{version.stack}} can be downloaded from the website and installed as follows:
 
 ```sh subs=true
-wget https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-amd64.deb
-shasum -a 512 kibana-{{stack-version}}-amd64.deb <1>
-sudo dpkg -i kibana-{{stack-version}}-amd64.deb
+wget https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-amd64.deb
+shasum -a 512 kibana-{{version.stack}}-amd64.deb <1>
+sudo dpkg -i kibana-{{version.stack}}-amd64.deb
 ```
 
 1. 	Compare the SHA produced by shasum with the [published SHA](https://artifacts.elastic.co/downloads/kibana/kibana-9.0.0-amd64.deb.sha512).
diff --git a/deploy-manage/deploy/self-managed/install-kibana-with-docker.md b/deploy-manage/deploy/self-managed/install-kibana-with-docker.md
index 73114407a0..1be37fc9f5 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-with-docker.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-with-docker.md
@@ -49,20 +49,20 @@ This setup doesn’t run multiple {{es}} nodes by default. To create a multi-nod
 3. Pull the {{es}} Docker image.
 
     ```sh subs=true
-    docker pull docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    docker pull docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
 4. Optional: Install [Cosign](https://docs.sigstore.dev/system_config/installation/) for your environment. Then use Cosign to verify the {{es}} image’s signature.
 
     ```sh subs=true
     wget https://artifacts.elastic.co/cosign.pub
-    cosign verify --key cosign.pub docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    cosign verify --key cosign.pub docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
     The `cosign` command prints the check results and the signature payload in JSON format:
 
     ```sh subs=true
-    Verification for docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}} --
+    Verification for docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}} --
     The following checks were performed on each of these signatures:
       - The cosign claims were validated
       - Existence of the claims in the transparency log was verified offline
@@ -72,7 +72,7 @@ This setup doesn’t run multiple {{es}} nodes by default. To create a multi-nod
 5. Start an {{es}} container.
 
     ```sh subs=true
-    docker run --name es01 --net elastic -p 9200:9200 -it -m 1GB docker.elastic.co/elasticsearch/elasticsearch:{{stack-version}}
+    docker run --name es01 --net elastic -p 9200:9200 -it -m 1GB docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     ```
 
     ::::{tip}
@@ -92,20 +92,20 @@ This setup doesn’t run multiple {{es}} nodes by default. To create a multi-nod
 7. Pull the {{kib}} Docker image.
 
     ```sh subs=true
-    docker pull docker.elastic.co/kibana/kibana:{{stack-version}}
+    docker pull docker.elastic.co/kibana/kibana:{{version.stack}}
     ```
 
 8. Optional: Verify the {{kib}} image’s signature.
 
     ```sh subs=true
     wget https://artifacts.elastic.co/cosign.pub
-    cosign verify --key cosign.pub docker.elastic.co/kibana/kibana:{{stack-version}}
+    cosign verify --key cosign.pub docker.elastic.co/kibana/kibana:{{version.stack}}
     ```
 
 9. Start a {{kib}} container.
 
     ```sh subs=true
-    docker run --name kib01 --net elastic -p 5601:5601 docker.elastic.co/kibana/kibana:{{stack-version}}
+    docker run --name kib01 --net elastic -p 5601:5601 docker.elastic.co/kibana/kibana:{{version.stack}}
     ```
 
 10. When {{kib}} starts, it outputs a unique generated link to the terminal. To access {{kib}}, open this link in a web browser.
@@ -154,7 +154,7 @@ One way to configure {{kib}} on Docker is to provide `kibana.yml` via bind-mount
 version: '2'
 services:
   kibana:
-    image: docker.elastic.co/kibana/kibana:{{stack-version}}
+    image: docker.elastic.co/kibana/kibana:{{version.stack}}
     volumes:
       - ./kibana.yml:/usr/share/kibana/config/kibana.yml
 ```
@@ -165,8 +165,8 @@ services:
 By default, {{kib}} auto-generates a keystore file for secure settings at startup. To persist your [secure settings](/deploy-manage/security/secure-settings.md), use the `kibana-keystore` utility to bind-mount the parent directory of the keystore to the container. For example:
 
 ```sh subs=true
-docker run -it --rm -v full_path_to/config:/usr/share/kibana/config -v full_path_to/data:/usr/share/kibana/data docker.elastic.co/kibana/kibana:{{stack-version}} bin/kibana-keystore create
-docker run -it --rm -v full_path_to/config:/usr/share/kibana/config -v full_path_to/data:/usr/share/kibana/data docker.elastic.co/kibana/kibana:{{stack-version}} bin/kibana-keystore add test_keystore_setting
+docker run -it --rm -v full_path_to/config:/usr/share/kibana/config -v full_path_to/data:/usr/share/kibana/data docker.elastic.co/kibana/kibana:{{version.stack}} bin/kibana-keystore create
+docker run -it --rm -v full_path_to/config:/usr/share/kibana/config -v full_path_to/data:/usr/share/kibana/data docker.elastic.co/kibana/kibana:{{version.stack}} bin/kibana-keystore add test_keystore_setting
 ```
 
 
@@ -199,7 +199,7 @@ These variables can be set with `docker-compose` like this:
 version: '2'
 services:
   kibana:
-    image: docker.elastic.co/kibana/kibana:{{stack-version}}
+    image: docker.elastic.co/kibana/kibana:{{version.stack}}
     environment:
       SERVER_NAME: kibana.example.org
       ELASTICSEARCH_HOSTS: '["<ELASTICSEARCH_HOST_URL_01>:9200","<ELASTICSEARCH_HOST_URL_02>:9200","<ELASTICSEARCH_HOST_URL_03>:9200"]'
diff --git a/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md b/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
index f81e55d745..04a98ca2dc 100644
--- a/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
+++ b/deploy-manage/deploy/self-managed/install-kibana-with-rpm.md
@@ -67,13 +67,13 @@ sudo zypper install kibana <3>
 
 ### Download and install the RPM manually [install-rpm]
 
-The RPM for {{kib}} {{stack-version}} can be downloaded from the website and installed as follows:
+The RPM for {{kib}} {{version.stack}} can be downloaded from the website and installed as follows:
 
 ```sh subs=true
-wget https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-x86_64.rpm
-wget https://artifacts.elastic.co/downloads/kibana/kibana-{{stack-version}}-x86_64.rpm.sha512
-shasum -a 512 -c kibana-{{stack-version}}-x86_64.rpm.sha512 <1>
-sudo rpm --install kibana-{{stack-version}}-x86_64.rpm
+wget https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-x86_64.rpm
+wget https://artifacts.elastic.co/downloads/kibana/kibana-{{version.stack}}-x86_64.rpm.sha512
+shasum -a 512 -c kibana-{{version.stack}}-x86_64.rpm.sha512 <1>
+sudo rpm --install kibana-{{version.stack}}-x86_64.rpm
 ```
 
 1. Compares the SHA of the downloaded RPM and the published checksum, which should output `kibana-<version>-x86_64.rpm: OK`.
diff --git a/docset.yml b/docset.yml
index e4996b3d48..3853e8de40 100644
--- a/docset.yml
+++ b/docset.yml
@@ -278,15 +278,12 @@ subs:
   fleet-server-issue:   "https://github.com/elastic/fleet-server/issues/"
   fleet-server-pull:   "https://github.com/elastic/fleet-server/pull/"
   kib-pull:   "https://github.com/elastic/kibana/pull/"
-  stack-version: "9.0.3"
   ece_version: "4.0.1"
   eck_version: "3.0.0"
   eck_release_branch: "3.0"
   eck_helm_minimum_version: "3.2.0"
   eck_resources_list: "Elasticsearch, Kibana, APM Server, Beats, Elastic Agent, Elastic Maps Server, and Logstash"
   eck_resources_list_short: "APM Server, Beats, Elastic Agent, Elastic Maps Server, and Logstash"
-  apm_server_version: "9.0.0"
-  version: "9.0.0"
   release-date: "2-April-2025"
   heroku: "Elasticsearch Add-on for Heroku"
   obs-ai-assistant: "Elastic AI Assistant for Observability and Search"
diff --git a/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md b/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md
index 51c9ed148e..81105aadaa 100644
--- a/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md
+++ b/explore-analyze/alerts-cases/alerts/alerting-troubleshooting.md
@@ -193,7 +193,7 @@ This approach should be used only temporarily as a last resort to restore functi
 
 ## Limitations [alerting-limitations]
 
-The following limitations and known problems apply to the {{version}} release of the {{kib}} {{alert-features}}:
+The following limitations and known problems apply to the {{version.stack}} release of the {{kib}} {{alert-features}}:
 
 ### Alert visibility [_alert_visibility]
 
diff --git a/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md b/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
index fb8748297b..28a6bc6902 100644
--- a/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
+++ b/explore-analyze/machine-learning/anomaly-detection/ml-limitations.md
@@ -11,7 +11,7 @@ products:
 
 # Limitations [ml-limitations]
 
-The following limitations and known problems apply to the {{version}} release of the Elastic {{ml-features}}. The limitations are grouped into four categories:
+The following limitations and known problems apply to the {{version.stack}} release of the Elastic {{ml-features}}. The limitations are grouped into four categories:
 
 * [Platform limitations](#ad-platform-limitations) are related to the platform that hosts the {{ml}} feature of the {{stack}}.
 * [Configuration limitations](#ad-config-limitations) apply to the configuration process of the {{anomaly-jobs}}.
diff --git a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
index 8e388a36bb..0d44909182 100644
--- a/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
+++ b/explore-analyze/machine-learning/data-frame-analytics/ml-dfa-limitations.md
@@ -11,7 +11,7 @@ products:
 
 # Limitations [ml-dfa-limitations]
 
-The following limitations and known problems apply to the {{version}} release of the Elastic {{dfanalytics}} feature. The limitations are grouped into the following categories:
+The following limitations and known problems apply to the {{version.stack}} release of the Elastic {{dfanalytics}} feature. The limitations are grouped into the following categories:
 
 * [Platform limitations](#dfa-platform-limitations) are related to the platform that hosts the {{ml}} feature of the {{stack}}.
 * [Configuration limitations](#dfa-config-limitations) apply to the configuration process of the {{dfanalytics-jobs}}.
diff --git a/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md b/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
index e0ede3195c..e26b284125 100644
--- a/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
+++ b/explore-analyze/machine-learning/nlp/ml-nlp-limitations.md
@@ -10,7 +10,7 @@ products:
 
 # Limitations [ml-nlp-limitations]
 
-The following limitations and known problems apply to the {{version}} release of the Elastic {{nlp}} trained models feature.
+The following limitations and known problems apply to the {{version.stack}} release of the Elastic {{nlp}} trained models feature.
 
 ## Document size limitations when using `semantic_text` fields [ml-nlp-large-documents-limit-10k-10mb]
 
diff --git a/explore-analyze/query-filter/languages/sql-jdbc.md b/explore-analyze/query-filter/languages/sql-jdbc.md
index 07fba6af57..66d6be6543 100644
--- a/explore-analyze/query-filter/languages/sql-jdbc.md
+++ b/explore-analyze/query-filter/languages/sql-jdbc.md
@@ -27,7 +27,7 @@ Maven dependency
 <dependency>
   <groupId>org.elasticsearch.plugin</groupId>
   <artifactId>x-pack-sql-jdbc</artifactId>
-  <version>{{version}}</version>
+  <version>{{version.stack}}</version>
 </dependency>
 ```
 
@@ -48,7 +48,7 @@ from [Maven Central Repository](https://search.maven.org/artifact/org.elasticsea
 Your driver must be compatible with your {{es}} version.
 
 ::::{important}
-The driver version cannot be newer than the {{es}} version. For example, {{es}} version 7.10.0 is not compatible with {{version}} drivers.
+The driver version cannot be newer than the {{es}} version. For example, {{es}} version 7.10.0 is not compatible with {{version.stack}} drivers.
 ::::
 
 
diff --git a/explore-analyze/query-filter/languages/sql-odbc-installation.md b/explore-analyze/query-filter/languages/sql-odbc-installation.md
index 2bd90d268a..31d0b2ada4 100644
--- a/explore-analyze/query-filter/languages/sql-odbc-installation.md
+++ b/explore-analyze/query-filter/languages/sql-odbc-installation.md
@@ -44,7 +44,7 @@ When installing the MSI, the Windows Defender SmartScreen might warn about runni
 Your driver must be compatible with your {{es}} version.
 
 ::::{important}
-The driver version cannot be newer than the {{es}} version. For example, {{es}} version 7.10.0 is not compatible with {{version}} drivers.
+The driver version cannot be newer than the {{es}} version. For example, {{es}} version 7.10.0 is not compatible with {{version.stack}} drivers.
 ::::
 
 
@@ -55,7 +55,7 @@ The driver version cannot be newer than the {{es}} version. For example, {{es}}
 
 ## Download the `.msi` package(s) [download]
 
-Download the `.msi` package for Elasticsearch SQL ODBC Driver {{version}} from: [https://www.elastic.co/downloads/odbc-client](https://www.elastic.co/downloads/odbc-client)
+Download the `.msi` package for Elasticsearch SQL ODBC Driver {{version.stack}} from: [https://www.elastic.co/downloads/odbc-client](https://www.elastic.co/downloads/odbc-client)
 
 There are two versions of the installer available:
 
@@ -84,7 +84,7 @@ Clicking **Next** will present the End User License Agreement. You will need to
 The following screen allows you to customise the installation path for the Elasticsearch ODBC driver files.
 
 ::::{note}
-The default installation path is of the format: **%ProgramFiles%\Elastic\ODBCDriver\\{{version}}**
+The default installation path is of the format: **%ProgramFiles%\Elastic\ODBCDriver\\{{version.stack}}**
 ::::
 
 
@@ -130,19 +130,19 @@ The examples given below apply to installation of the 64 bit MSI package. To ach
 The `.msi` can also be installed via the command line. The simplest installation using the same defaults as the GUI is achieved by first navigating to the download directory, then running:
 
 ```sh subs=true
-msiexec.exe /i esodbc-{{version}}-windows-x86_64.msi /qn
+msiexec.exe /i esodbc-{{version.stack}}-windows-x86_64.msi /qn
 ```
 
 By default, `msiexec.exe` does not wait for the installation process to complete, since it runs in the Windows subsystem. To wait on the process to finish and ensure that `%ERRORLEVEL%` is set accordingly, it is recommended to use `start /wait` to create a process and wait for it to exit:
 
 ```sh subs=true
-start /wait msiexec.exe /i esodbc-{{version}}-windows-x86_64.msi /qn
+start /wait msiexec.exe /i esodbc-{{version.stack}}-windows-x86_64.msi /qn
 ```
 
 As with any MSI installation package, a log file for the installation process can be found within the `%TEMP%` directory, with a randomly generated name adhering to the format `MSI<random>.LOG`. The path to a log file can be supplied using the `/l` command line argument
 
 ```sh subs=true
-start /wait msiexec.exe /i esodbc-{{version}}-windows-x86_64.msi /qn /l install.log
+start /wait msiexec.exe /i esodbc-{{version.stack}}-windows-x86_64.msi /qn /l install.log
 ```
 
 Supported Windows Installer command line arguments can be viewed using:
@@ -158,12 +158,12 @@ msiexec.exe /help
 All settings exposed within the GUI are also available as command line arguments (referred to as *properties* within Windows Installer documentation) that can be passed to `msiexec.exe`:
 
 `INSTALLDIR`
-:   The installation directory. Defaults to _%ProgramFiles%\Elastic\ODBCDriver\\{{version}}_.
+:   The installation directory. Defaults to _%ProgramFiles%\Elastic\ODBCDriver\\{{version.stack}}_.
 
 To pass a value, simply append the property name and value using the format `<PROPERTYNAME>="<VALUE>"` to the installation command. For example, to use a different installation directory to the default one:
 
 ```sh subs=true
-start /wait msiexec.exe /i esodbc-{{version}}-windows-x86_64.msi /qn INSTALLDIR="c:\CustomDirectory"
+start /wait msiexec.exe /i esodbc-{{version.stack}}-windows-x86_64.msi /qn INSTALLDIR="c:\CustomDirectory"
 ```
 
 Consult the [Windows Installer SDK Command-Line Options](https://msdn.microsoft.com/en-us/library/windows/desktop/aa367988(v=vs.85).aspx) for additional rules related to values containing quotation marks.
@@ -193,11 +193,11 @@ Once opened, find the Elasticsearch ODBC Driver installation within the list of
 Uninstallation can also be performed from the command line by navigating to the directory containing the `.msi` package and running:
 
 ```sh subs=true
-start /wait msiexec.exe /x esodbc-{{version}}-windows-x86_64.msi /qn
+start /wait msiexec.exe /x esodbc-{{version.stack}}-windows-x86_64.msi /qn
 ```
 
 Similar to the install process, a path for a log file for the uninstallation process can be passed using the `/l` command line argument
 
 ```sh subs=true
-start /wait msiexec.exe /x esodbc-{{version}}-windows-x86_64.msi /qn /l uninstall.log
+start /wait msiexec.exe /x esodbc-{{version.stack}}-windows-x86_64.msi /qn /l uninstall.log
 ```
diff --git a/explore-analyze/transforms/transform-limitations.md b/explore-analyze/transforms/transform-limitations.md
index 541f7fb57d..71863f2cb0 100644
--- a/explore-analyze/transforms/transform-limitations.md
+++ b/explore-analyze/transforms/transform-limitations.md
@@ -11,7 +11,7 @@ products:
 
 # Limitations [transform-limitations]
 
-The following limitations and known problems apply to the {{version}} release of the Elastic {{transform}} feature. The limitations are grouped into the following categories:
+The following limitations and known problems apply to the {{version.stack}} release of the Elastic {{transform}} feature. The limitations are grouped into the following categories:
 
 * [Configuration limitations](#transform-config-limitations) apply to the configuration process of the {{transforms}}.
 * [Operational limitations](#transform-operational-limitations) affect the behavior of the {{transforms}} that are running.
diff --git a/explore-analyze/visualize/maps/maps-connect-to-ems.md b/explore-analyze/visualize/maps/maps-connect-to-ems.md
index 047d5e3b60..a80f05627e 100644
--- a/explore-analyze/visualize/maps/maps-connect-to-ems.md
+++ b/explore-analyze/visualize/maps/maps-connect-to-ems.md
@@ -44,7 +44,7 @@ Headers for the Tile Service JSON manifest describing the basemaps available.
 ::::::{tab-item} Curl Example
 ::::{dropdown}
 ```bash subs=true
-curl -I 'https://tiles.maps.elastic.co/v9.0/manifest?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version}}' \
+curl -I 'https://tiles.maps.elastic.co/v9.0/manifest?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version.stack}}' \
 -H 'User-Agent: curl/7.81.0' \
 -H 'Accept: */*' \
 -H 'Accept-Encoding: gzip, deflate, br'
@@ -124,7 +124,7 @@ Headers for a vector tile asset in *protobuffer* format from the Tile Service.
 ::::::{tab-item} Curl Example
 ::::{dropdown}
 ```bash subs=true
-$ curl -I 'https://tiles.maps.elastic.co/data/v3/1/1/0.pbf?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version}}' \
+$ curl -I 'https://tiles.maps.elastic.co/data/v3/1/1/0.pbf?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version.stack}}' \
 -H 'User-Agent: curl/7.81.0' \
 -H 'Accept: */*' \
 -H 'Accept-Encoding: gzip, deflate, br'
@@ -287,7 +287,7 @@ Headers for the File Service JSON manifest that declares all the datasets availa
 ::::::{tab-item} Curl example
 ::::{dropdown}
 ```bash subs=true
-curl -I 'https://vector.maps.elastic.co/v9.0/manifest?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version}}' \
+curl -I 'https://vector.maps.elastic.co/v9.0/manifest?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version.stack}}' \
 -H 'User-Agent: curl/7.81.0' \
 -H 'Accept: */*' \
 -H 'Accept-Encoding: gzip, deflate, br'
@@ -378,7 +378,7 @@ Headers for a sample Dataset from the File Service in TopoJSON format.
 ::::::{tab-item} Curl example
 ::::{dropdown}
 ```bash subs=true
-curl -I 'https://vector.maps.elastic.co/files/world_countries_v7.topo.json?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version}}' \
+curl -I 'https://vector.maps.elastic.co/files/world_countries_v7.topo.json?elastic_tile_service_tos=agree&my_app_name=kibana&my_app_version={{version.stack}}' \
 -H 'User-Agent: curl/7.81.0' \
 -H 'Accept: */*' \
 -H 'Accept-Encoding: gzip, deflate, br'
@@ -487,20 +487,20 @@ If you cannot connect to Elastic Maps Service from the {{kib}} server or browser
 1. Pull the {{hosted-ems}} Docker image.
 
     ```bash subs=true
-    docker pull docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version}}
+    docker pull docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version.stack}}
     ```
 
 2. Optional: Install [Cosign](https://docs.sigstore.dev/system_config/installation/) for your environment. Then use Cosign to verify the {{es}} image’s signature.
 
     ```sh subs=true
     wget https://artifacts.elastic.co/cosign.pub
-    cosign verify --key cosign.pub docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version}}
+    cosign verify --key cosign.pub docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version.stack}}
     ```
 
     The `cosign` command prints the check results and the signature payload in JSON format:
 
     ```sh subs=true
-    Verification for docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version}} --
+    Verification for docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version.stack}} --
     The following checks were performed on each of these signatures:
       - The cosign claims were validated
       - Existence of the claims in the transparency log was verified offline
@@ -511,7 +511,7 @@ If you cannot connect to Elastic Maps Service from the {{kib}} server or browser
 
     ```bash subs=true
     docker run --rm --init --publish 8080:8080 \
-      docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version}}
+      docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version.stack}}
     ```
 
     Once {{hosted-ems}} is running, follow instructions from the webpage at `localhost:8080` to define a configuration file and optionally download a more detailed basemaps database.
@@ -566,7 +566,7 @@ One way to configure {{hosted-ems}} is to provide `elastic-maps-server.yml` via
 ```yaml subs=true
 services:
   ems-server:
-    image: docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version}}
+    image: docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version.stack}}
     volumes:
       - ./elastic-maps-server.yml:/usr/src/app/server/config/elastic-maps-server.yml
 ```
@@ -586,7 +586,7 @@ These variables can be set with `docker-compose` like this:
 ```yaml subs=true
 services:
   ems-server:
-    image: docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version}}
+    image: docker.elastic.co/elastic-maps-service/elastic-maps-server:{{version.stack}}
     environment:
       ELASTICSEARCH_HOST: http://elasticsearch.example.org
       ELASTICSEARCH_USERNAME: 'ems'
diff --git a/reference/fleet/add-fleet-server-kubernetes.md b/reference/fleet/add-fleet-server-kubernetes.md
index ab611b5635..9647fecd62 100644
--- a/reference/fleet/add-fleet-server-kubernetes.md
+++ b/reference/fleet/add-fleet-server-kubernetes.md
@@ -336,7 +336,7 @@ Adapt and change the suggested manifests and deployment strategy to your needs,
           automountServiceAccountToken: false
           containers:
           - name: elastic-agent
-            image: docker.elastic.co/beats/elastic-agent:{{stack-version}}
+            image: docker.elastic.co/beats/elastic-agent:{{version.stack}}
             env:
               - name: FLEET_SERVER_ENABLE
                 value: "true"
@@ -422,7 +422,7 @@ Adapt and change the suggested manifests and deployment strategy to your needs,
           automountServiceAccountToken: false
           containers:
           - name: elastic-agent
-            image: docker.elastic.co/beats/elastic-agent:{{stack-version}}
+            image: docker.elastic.co/beats/elastic-agent:{{version.stack}}
             env:
               - name: FLEET_SERVER_ENABLE
                 value: "true"
diff --git a/reference/fleet/air-gapped.md b/reference/fleet/air-gapped.md
index 8323bc0e91..ecf4ab640f 100644
--- a/reference/fleet/air-gapped.md
+++ b/reference/fleet/air-gapped.md
@@ -108,8 +108,8 @@ The {{package-registry}} can be deployed and hosted onsite using one of the avai
 
 There are different distributions available:
 
-* {{stack-version}} (recommended): *docker.elastic.co/package-registry/distribution:{{stack-version}}* - Selection of packages from the production repository released with {{stack}} {{stack-version}}.
-* lite-{{stack-version}}: *docker.elastic.co/package-registry/distribution:lite-{{stack-version}}* - Subset of the most commonly used packages from the production repository released with {{stack}} {{stack-version}}. This image is a good candidate to start using {{fleet}} in air-gapped environments.
+* {{version.stack}} (recommended): *docker.elastic.co/package-registry/distribution:{{version.stack}}* - Selection of packages from the production repository released with {{stack}} {{version.stack}}.
+* lite-{{version.stack}}: *docker.elastic.co/package-registry/distribution:lite-{{version.stack}}* - Subset of the most commonly used packages from the production repository released with {{stack}} {{version.stack}}. This image is a good candidate to start using {{fleet}} in air-gapped environments.
 * production: *docker.elastic.co/package-registry/distribution:production* - Packages available in the production registry ([https://epr.elastic.co](https://epr.elastic.co)). Note that this image is updated every time a new version of a package gets published.
 * lite: *docker.elastic.co/package-registry/distribution:lite* - Subset of the most commonly used packages available in the production registry ([https://epr.elastic.co](https://epr.elastic.co)). Note that this image is updated every time a new version of a package gets published.
 
@@ -126,13 +126,13 @@ These steps use the standard Docker CLI, but you can create a Kubernetes manifes
 1. Pull the Docker image from the public Docker registry:
 
     ```sh subs=true
-    docker pull docker.elastic.co/package-registry/distribution:{{stack-version}}
+    docker pull docker.elastic.co/package-registry/distribution:{{version.stack}}
     ```
 
 2. Save the Docker image locally:
 
     ```sh subs=true
-    docker save -o package-registry-{{stack-version}}.tar docker.elastic.co/package-registry/distribution:{{stack-version}}
+    docker save -o package-registry-{{version.stack}}.tar docker.elastic.co/package-registry/distribution:{{version.stack}}
     ```
 
     ::::{tip}
@@ -142,13 +142,13 @@ These steps use the standard Docker CLI, but you can create a Kubernetes manifes
 3. Transfer the image to the air-gapped environment and load it:
 
     ```sh subs=true
-    docker load -i package-registry-{{stack-version}}.tar
+    docker load -i package-registry-{{version.stack}}.tar
     ```
 
 4. Run the {{package-registry}}:
 
     ```sh subs=true
-    docker run -it -p 8080:8080 docker.elastic.co/package-registry/distribution:{{stack-version}}
+    docker run -it -p 8080:8080 docker.elastic.co/package-registry/distribution:{{version.stack}}
     ```
 
 5. (Optional) You can monitor the health of your {{package-registry}} with requests to the root path:
@@ -156,7 +156,7 @@ These steps use the standard Docker CLI, but you can create a Kubernetes manifes
     ```sh subs=true
     docker run -it -p 8080:8080 \
         --health-cmd "curl -f -L http://127.0.0.1:8080/health" \
-        docker.elastic.co/package-registry/distribution:{{stack-version}}
+        docker.elastic.co/package-registry/distribution:{{version.stack}}
     ```
 
 
@@ -183,7 +183,7 @@ docker run -it -p 443:443 \
   -e EPR_ADDRESS=0.0.0.0:443 \
   -e EPR_TLS_KEY=/etc/ssl/package-registry.key \
   -e EPR_TLS_CERT=/etc/ssl/package-registry.crt \
-  docker.elastic.co/package-registry/distribution:{{stack-version}}
+  docker.elastic.co/package-registry/distribution:{{version.stack}}
 ```
 
 The {{package-registry}} supports TLS versions from 1.0 to 1.3. The minimum version accepted can be configured with `EPR_TLS_MIN_VERSION`, it defaults to 1.0. If you want to restrict the supported versions from 1.2 to 1.3, you can use `EPR_TLS_MIN_VERSION=1.2`.
@@ -209,48 +209,48 @@ To make binaries available in an air-gapped environment, you can host your own c
     1. Download the latest release artifacts from the public {{artifact-registry}} at `https://artifacts.elastic.co/downloads/`. For example, the following cURL commands download all the artifacts that may be needed to upgrade {{agent}}s running on Linux x86_64. You may replace `x86_64` with `arm64` for the ARM64 version. The exact list depends on which integrations you’re using.  Make sure to also download the corresponding sha512, and PGP Signature (.asc) files for each binary.  These are used for file integrity validations during installations and upgrades.
 
         ```shell subs=true
-        curl -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/beats/auditbeat/auditbeat-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/beats/auditbeat/auditbeat-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/beats/auditbeat/auditbeat-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/beats/osquerybeat/osquerybeat-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/beats/osquerybeat/osquerybeat-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/beats/osquerybeat/osquerybeat-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/beats/packetbeat/packetbeat-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/beats/packetbeat/packetbeat-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/beats/packetbeat/packetbeat-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/cloudbeat/cloudbeat-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/cloudbeat/cloudbeat-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/cloudbeat/cloudbeat-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/endpoint-dev/endpoint-security-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/endpoint-dev/endpoint-security-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/endpoint-dev/endpoint-security-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/fleet-server/fleet-server-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/fleet-server/fleet-server-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/fleet-server/fleet-server-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-host-agent-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-host-agent-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-host-agent-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{stack-version}}-linux-x86_64.tar.gz.asc
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{stack-version}}-linux-x86_64.tar.gz
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{stack-version}}-linux-x86_64.tar.gz.sha512
-        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{stack-version}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/beats/auditbeat/auditbeat-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/beats/auditbeat/auditbeat-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/beats/auditbeat/auditbeat-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/beats/osquerybeat/osquerybeat-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/beats/osquerybeat/osquerybeat-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/beats/osquerybeat/osquerybeat-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/beats/packetbeat/packetbeat-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/beats/packetbeat/packetbeat-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/beats/packetbeat/packetbeat-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/cloudbeat/cloudbeat-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/cloudbeat/cloudbeat-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/cloudbeat/cloudbeat-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/endpoint-dev/endpoint-security-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/endpoint-dev/endpoint-security-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/endpoint-dev/endpoint-security-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/fleet-server/fleet-server-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/fleet-server/fleet-server-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/fleet-server/fleet-server-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-host-agent-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-host-agent-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-host-agent-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{version.stack}}-linux-x86_64.tar.gz.asc
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{version.stack}}-linux-x86_64.tar.gz
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{version.stack}}-linux-x86_64.tar.gz.sha512
+        curl -O https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{version.stack}}-linux-x86_64.tar.gz.asc
         ```
 
     2. On your HTTP file server, group the artifacts into directories and sub-directories that follow the same convention used by the {{artifact-registry}}:
diff --git a/reference/fleet/elastic-agent-container.md b/reference/fleet/elastic-agent-container.md
index 2c38772e14..fd37fd8ddb 100644
--- a/reference/fleet/elastic-agent-container.md
+++ b/reference/fleet/elastic-agent-container.md
@@ -46,25 +46,25 @@ Run the `docker pull` command against the Elastic Docker registry:
 ### Basic flavor
 
 ```terminal subs=true
-docker pull docker.elastic.co/elastic-agent/elastic-agent-slim:{{stack-version}}
+docker pull docker.elastic.co/elastic-agent/elastic-agent-slim:{{version.stack}}
 ```
 
 Alternately, you can use the hardened [Wolfi](https://github.com/wolfi-dev/) image. Using Wolfi images requires Docker version 20.10.10 or later. For details about why the Wolfi images have been introduced, refer to our article [Reducing CVEs in Elastic container images](https://www.elastic.co/blog/reducing-cves-in-elastic-container-images).
 
 ```terminal subs=true
-docker pull docker.elastic.co/elastic-agent/elastic-agent-slim-wolfi:{{stack-version}}
+docker pull docker.elastic.co/elastic-agent/elastic-agent-slim-wolfi:{{version.stack}}
 ```
 
 ### Server flavor
 
 ```terminal subs=true
-docker pull docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}}
+docker pull docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}}
 ```
 
 To run the server flavor using the hardened [Wolfi](https://github.com/wolfi-dev/) image, run:
 
 ```terminal subs=true
-docker pull docker.elastic.co/elastic-agent/elastic-agent-wolfi:{{stack-version}}
+docker pull docker.elastic.co/elastic-agent/elastic-agent-wolfi:{{version.stack}}
 ```
 
 ### Complete flavor
@@ -72,12 +72,12 @@ docker pull docker.elastic.co/elastic-agent/elastic-agent-wolfi:{{stack-version}
 If you want to run Synthetics tests, run the docker pull command to fetch the elastic-agent-complete image:
 
 ```terminal subs=true
-docker pull docker.elastic.co/elastic-agent/elastic-agent-complete:{{stack-version}}
+docker pull docker.elastic.co/elastic-agent/elastic-agent-complete:{{version.stack}}
 ```
 To run Synthetics tests using the hardened [Wolfi](https://github.com/wolfi-dev/) image, run:
 
 ```terminal subs=true
-docker pull docker.elastic.co/elastic-agent/elastic-agent-complete-wolfi:{{stack-version}}
+docker pull docker.elastic.co/elastic-agent/elastic-agent-complete-wolfi:{{version.stack}}
 ```
 
 ## Step 2: Optional: Verify the image [_step_2_optional_verify_the_image]
@@ -86,11 +86,11 @@ Although it’s optional, we highly recommend verifying the signatures included
 
 Elastic images are signed with Cosign which is part of the [Sigstore](https://www.sigstore.dev) project. Cosign supports container signing, verification, and storage in an OCI registry. Install the appropriate Cosign application for your operating system.
 
-Run the following commands to verify the **elastic-agent** container image signature for Elastic Agent v{{stack-version}}:
+Run the following commands to verify the **elastic-agent** container image signature for Elastic Agent v{{version.stack}}:
 
 ```terminal subs=true
 wget https://artifacts.elastic.co/cosign.pub <1>
-cosign verify --key cosign.pub docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}} <2>
+cosign verify --key cosign.pub docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}} <2>
 ```
 1. Download the Elastic public key to verify container signature
 2. Verify the container against the Elastic public key
@@ -99,12 +99,12 @@ If you’re using the elastic-agent-complete image, run the commands as follows:
 
 ```terminal subs=true
 wget https://artifacts.elastic.co/cosign.pub
-cosign verify --key cosign.pub docker.elastic.co/elastic-agent/elastic-agent-complete:{{stack-version}}
+cosign verify --key cosign.pub docker.elastic.co/elastic-agent/elastic-agent-complete:{{version.stack}}
 ```
 The command prints the check results and the signature payload in JSON format, for example:
 
 ```terminal subs=true
-Verification for docker.elastic.co/elastic-agent/elastic-agent-complete:{{stack-version}} --
+Verification for docker.elastic.co/elastic-agent/elastic-agent-complete:{{version.stack}} --
 The following checks were performed on each of these signatures:
   - The cosign claims were validated
   - Existence of the claims in the transparency log was verified offline
@@ -116,7 +116,7 @@ The following checks were performed on each of these signatures:
 The Elastic Agent container command offers a wide variety of options. To see the full list, run:
 
 ```terminal subs=true
-docker run --rm docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}} elastic-agent container -h
+docker run --rm docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}} elastic-agent container -h
 ```
 
 ## Step 4: Run the Elastic Agent image [_step_4_run_the_elastic_agent_image]
@@ -131,7 +131,7 @@ docker run \
   --env FLEET_ENROLL=1 \ <1>
   --env FLEET_URL=<fleet-server-host-url> \ <2>
   --env FLEET_ENROLLMENT_TOKEN=<enrollment-token> \ <3>
-  --rm docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}} <4>
+  --rm docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}} <4>
 ```
 
 1. Set to 1 to enroll the {{agent}} into {{fleet-server}}.
@@ -153,7 +153,7 @@ docker run \
   --env FLEET_SERVER_SERVICE_TOKEN=<service-token> \ <3>
   --env FLEET_SERVER_POLICY_ID=<fleet-server-policy> \ <4>
   -p 8220:8220 \ <5>
-  --rm docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}} <6>
+  --rm docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}} <6>
 ```
 
 1. Set to 1 to bootstrap Fleet Server on this Elastic Agent.
@@ -189,7 +189,7 @@ If you’d like to run {{agent}} in a Docker container on a read-only file syste
 For example:
 
 ```bash subs=true
-docker run --rm --mount source=$(pwd)/state,destination=/state -e {STATE_PATH}=/state --read-only docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}} <1>
+docker run --rm --mount source=$(pwd)/state,destination=/state -e {STATE_PATH}=/state --read-only docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}} <1>
 ```
 
 1. Where `{STATE_PATH}` is the path to a stateful directory to mount where {{agent}} application data can be stored.
@@ -235,7 +235,7 @@ You can run {{agent}} in docker-compose. The example below shows how to enroll a
 version: "3"
 services:
   elastic-agent:
-    image: docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}} <1>
+    image: docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}} <1>
     container_name: elastic-agent
     restart: always
     user: root                                                       <2>
diff --git a/reference/fleet/filter-agent-list-by-tags.md b/reference/fleet/filter-agent-list-by-tags.md
index 8a82fefa33..38972fc156 100644
--- a/reference/fleet/filter-agent-list-by-tags.md
+++ b/reference/fleet/filter-agent-list-by-tags.md
@@ -76,7 +76,7 @@ docker run \
   --env FLEET_URL=<Fleet Server host URL> \
   --env FLEET_ENROLLMENT_TOKEN=<enrollment token> \
   --env ELASTIC_AGENT_TAGS=docker,dev
-  --rm docker.elastic.co/elastic-agent/elastic-agent:{{stack-version}}
+  --rm docker.elastic.co/elastic-agent/elastic-agent:{{version.stack}}
 ```
 
 For more information about running on containers, refer to the guides under [Install {{agent}}s in a containerized environment](/reference/fleet/install-elastic-agents-in-containers.md).
diff --git a/reference/fleet/install-standalone-elastic-agent.md b/reference/fleet/install-standalone-elastic-agent.md
index ad13a794ac..589e40afe9 100644
--- a/reference/fleet/install-standalone-elastic-agent.md
+++ b/reference/fleet/install-standalone-elastic-agent.md
@@ -32,23 +32,23 @@ To install and run {{agent}} standalone:
 
     ::::::{tab-item} macOS
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-darwin-aarch64.tar.gz
-    tar xzvf elastic-agent-{{stack-version}}-darwin-aarch64.tar.gz
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-darwin-aarch64.tar.gz
+    tar xzvf elastic-agent-{{version.stack}}-darwin-aarch64.tar.gz
     ```
     ::::::
 
     ::::::{tab-item} Linux
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-linux-x86_64.tar.gz
-    tar xzvf elastic-agent-{{stack-version}}-linux-x86_64.tar.gz
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-linux-x86_64.tar.gz
+    tar xzvf elastic-agent-{{version.stack}}-linux-x86_64.tar.gz
     ```
     ::::::
 
     ::::::{tab-item} Windows
     ```shell subs=true
     # PowerShell 5.0+
-    wget https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-windows-x86_64.zip -OutFile elastic-agent-{{stack-version}}-windows-x86_64.zip
-    Expand-Archive .\elastic-agent-{{stack-version}}-windows-x86_64.zip
+    wget https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-windows-x86_64.zip -OutFile elastic-agent-{{version.stack}}-windows-x86_64.zip
+    Expand-Archive .\elastic-agent-{{version.stack}}-windows-x86_64.zip
     ```
     Or manually:
 
@@ -65,8 +65,8 @@ To install and run {{agent}} standalone:
     :::::
 
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-amd64.deb
-    sudo dpkg -i elastic-agent-{{stack-version}}-amd64.deb
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-amd64.deb
+    sudo dpkg -i elastic-agent-{{version.stack}}-amd64.deb
     ```
 
     By default the {{agent}} basic flavor is installed. To install the servers flavor add the `ELASTIC_AGENT_FLAVOR=servers` parameter. Refer to [{{agent}} installation flavors](./install-elastic-agents.md#elastic-agent-installation-flavors) for details about the different flavors.
@@ -74,13 +74,13 @@ To install and run {{agent}} standalone:
     You can use either of the two command formats to set the `ELASTIC_AGENT_FLAVOR` environment variable:
 
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-amd64.deb
-    sudo ELASTIC_AGENT_FLAVOR=servers dpkg -i elastic-agent-{{stack-version}}-amd64.deb
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-amd64.deb
+    sudo ELASTIC_AGENT_FLAVOR=servers dpkg -i elastic-agent-{{version.stack}}-amd64.deb
     ```
 
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-amd64.deb
-    ELASTIC_AGENT_FLAVOR=servers sudo -E dpkg -i elastic-agent-{{stack-version}}-amd64.deb
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-amd64.deb
+    ELASTIC_AGENT_FLAVOR=servers sudo -E dpkg -i elastic-agent-{{version.stack}}-amd64.deb
     ```
 
     :::::{note}
@@ -97,8 +97,8 @@ To install and run {{agent}} standalone:
     :::::
 
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-x86_64.rpm
-    sudo rpm -vi elastic-agent-{{stack-version}}-x86_64.rpm
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-x86_64.rpm
+    sudo rpm -vi elastic-agent-{{version.stack}}-x86_64.rpm
     ```
 
     By default the {{agent}} basic flavor is installed. To install the servers flavor add the `ELASTIC_AGENT_FLAVOR=servers` parameter. Refer to [{{agent}} installation flavors](./install-elastic-agents.md#elastic-agent-installation-flavors) for details about the different flavors.
@@ -106,13 +106,13 @@ To install and run {{agent}} standalone:
     You can use either of the two command formats to set the `ELASTIC_AGENT_FLAVOR` environment variable:
 
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-amd64.deb
-    sudo ELASTIC_AGENT_FLAVOR=servers rpm -vi elastic-agent-{{stack-version}}-x86_64.rpm
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-amd64.deb
+    sudo ELASTIC_AGENT_FLAVOR=servers rpm -vi elastic-agent-{{version.stack}}-x86_64.rpm
     ```
 
     ```shell subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-amd64.deb
-    ELASTIC_AGENT_FLAVOR=servers sudo -E rpm -vi elastic-agent-{{stack-version}}-x86_64.rpm
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-amd64.deb
+    ELASTIC_AGENT_FLAVOR=servers sudo -E rpm -vi elastic-agent-{{version.stack}}-x86_64.rpm
     ```
 
     ::::::
diff --git a/reference/fleet/upgrade-elastic-agent.md b/reference/fleet/upgrade-elastic-agent.md
index 3de1b58062..9895a992c2 100644
--- a/reference/fleet/upgrade-elastic-agent.md
+++ b/reference/fleet/upgrade-elastic-agent.md
@@ -229,13 +229,13 @@ For installation steps refer to [Install {{fleet}}-managed {{agent}}s](/referenc
 1. Download the {{agent}} Debian install package for the release that you want to upgrade to:
 
     ```bash subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-amd64.deb
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-amd64.deb
     ```
 
 2. Upgrade {{agent}} to the target release:
 
     ```bash subs=true
-    sudo dpkg -i elastic-agent-{{stack-version}}-amd64.deb
+    sudo dpkg -i elastic-agent-{{version.stack}}-amd64.deb
     ```
 
 3. Confirm in {{fleet}} that the agent has been upgraded to the target version. Note that the **Upgrade agent** option in the **Actions** menu next to the agent will be disabled since [fleet]-managed upgrades are not supported for this package type.
@@ -246,13 +246,13 @@ For installation steps refer to [Install {{fleet}}-managed {{agent}}s](/referenc
 1. Download the {{agent}} RPM install package for the release that you want to upgrade to:
 
     ```bash subs=true
-    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-x86_64.rpm
+    curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-x86_64.rpm
     ```
 
 2. Upgrade {{agent}} to the target release:
 
     ```bash subs=true
-    sudo rpm -U elastic-agent-{{stack-version}}-x86_64.rpm
+    sudo rpm -U elastic-agent-{{version.stack}}-x86_64.rpm
     ```
 
 3. Confirm in {{fleet}} that the agent has been upgraded to the target version. Note that the **Upgrade agent** option in the **Actions** menu next to the agent will be disabled since {{fleet}}-managed upgrades are not supported for this package type.
diff --git a/solutions/observability/apm/apm-server-command-reference.md b/solutions/observability/apm/apm-server-command-reference.md
index d48b2d7462..907e70fa33 100644
--- a/solutions/observability/apm/apm-server-command-reference.md
+++ b/solutions/observability/apm/apm-server-command-reference.md
@@ -177,7 +177,7 @@ Also see [Global flags](#apm-global-flags).
 
 ```sh subs=true
 apm-server export config
-apm-server export template --es.version {{version}} --index myindexname
+apm-server export template --es.version {{version.stack}} --index myindexname
 ```
 
 ## `help` command [apm-help-command]
diff --git a/solutions/observability/apm/configure-kafka-output.md b/solutions/observability/apm/configure-kafka-output.md
index 7c1e895468..962836d093 100644
--- a/solutions/observability/apm/configure-kafka-output.md
+++ b/solutions/observability/apm/configure-kafka-output.md
@@ -138,7 +138,7 @@ output.kafka:
         message: "ERR"
 ```
 
-This configuration results in topics named _critical-{{version}}_, _error-{{version}}_, and _logs-{{version}}_.
+This configuration results in topics named _critical-{{version.stack}}_, _error-{{version.stack}}_, and _logs-{{version.stack}}_.
 
 ### `key` [_key]
 
diff --git a/solutions/observability/apm/configure-logstash-output.md b/solutions/observability/apm/configure-logstash-output.md
index 61e33ad389..966f351d40 100644
--- a/solutions/observability/apm/configure-logstash-output.md
+++ b/solutions/observability/apm/configure-logstash-output.md
@@ -98,7 +98,7 @@ Every event sent to {{ls}} contains a special field called [`@metadata`](logstas
     ...
     "@metadata": {
       "beat": "apm-server", <1>
-      "version": "{{version}}" <2>
+      "version": "{{version.stack}}" <2>
     }
 }
 ```
@@ -221,7 +221,7 @@ The `proxy_use_local_resolver` option determines if {{ls}} hostnames are resolve
 
 #### `index` [apm-logstash-index]
 
-The index root name to write events to. The default is `apm-server`. For example `"apm"` generates `"[apm-]VERSION-YYYY.MM.DD"` indices (for example, _"apm-{{version}}-2017.04.26"_).
+The index root name to write events to. The default is `apm-server`. For example `"apm"` generates `"[apm-]VERSION-YYYY.MM.DD"` indices (for example, _"apm-{{version.stack}}-2017.04.26"_).
 
 ::::{note}
 This parameter’s value will be assigned to the `metadata.beat` field. It can then be accessed in {{ls}}'s output section as `%{[@metadata][beat]}`.
diff --git a/solutions/observability/apm/get-started-apm-server-binary.md b/solutions/observability/apm/get-started-apm-server-binary.md
index 2dbfd968ef..dd2f14f0b2 100644
--- a/solutions/observability/apm/get-started-apm-server-binary.md
+++ b/solutions/observability/apm/get-started-apm-server-binary.md
@@ -39,32 +39,32 @@ $$$apm-deb$$$
 **deb:**
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{apm_server_version}}-amd64.deb
-sudo dpkg -i apm-server-{{apm_server_version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{version.stack}}-amd64.deb
+sudo dpkg -i apm-server-{{version.stack}}-amd64.deb
 ```
 
 $$$apm-rpm$$$
 **RPM:**
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{apm_server_version}}-x86_64.rpm
-sudo rpm -vi apm-server-{{apm_server_version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{version.stack}}-x86_64.rpm
+sudo rpm -vi apm-server-{{version.stack}}-x86_64.rpm
 ```
 
 $$$apm-linux$$$
 **Other Linux:**
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{apm_server_version}}-linux-x86_64.tar.gz
-tar xzvf apm-server-{{apm_server_version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf apm-server-{{version.stack}}-linux-x86_64.tar.gz
 ```
 
 $$$apm-mac$$$
 **Mac:**
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{apm_server_version}}-darwin-x86_64.tar.gz
-tar xzvf apm-server-{{apm_server_version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/apm-server/apm-server-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf apm-server-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 
 $$$apm-installing-on-windows$$$
diff --git a/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md b/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
index 83877be14a..a67b1e582b 100644
--- a/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
+++ b/solutions/observability/apm/switch-an-elastic-cloud-cluster-to-apm-integration.md
@@ -18,7 +18,7 @@ products:
 
 ## Upgrade the {{stack}} [apm-integration-upgrade-ess-1]
 
-Use the {{ecloud}} Console to upgrade the {{stack}} to version {{version}}. See the [Upgrade guide](/deploy-manage/upgrade/deployment-or-cluster.md) for details.
+Use the {{ecloud}} Console to upgrade the {{stack}} to version {{version.stack}}. See the [Upgrade guide](/deploy-manage/upgrade/deployment-or-cluster.md) for details.
 
 ## Switch to {{agent}} [apm-integration-upgrade-ess-2]
 
diff --git a/solutions/observability/apm/switch-to-elastic-apm-integration.md b/solutions/observability/apm/switch-to-elastic-apm-integration.md
index f2bdb9a05f..094a1fbc25 100644
--- a/solutions/observability/apm/switch-to-elastic-apm-integration.md
+++ b/solutions/observability/apm/switch-to-elastic-apm-integration.md
@@ -23,7 +23,7 @@ The APM integration offers a number of benefits over the standalone method of ru
 * More granular data control
 * Errors and metrics data streams are shared with other data sources — which means better long-term integration with the logs and metrics apps
 * Removes template inheritance for {{ilm-init}} policies and makes use of new {{es}} index and component templates
-* Fixes _resource 'apm-{{version}}-$type' exists, but it is not an alias_ error
+* Fixes _resource 'apm-{{version.stack}}-$type' exists, but it is not an alias_ error
 
 **APM Integration**:
 
diff --git a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
index abdf988a99..705b8c0814 100644
--- a/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
+++ b/solutions/observability/cloud/monitor-amazon-web-services-aws-with-beats.md
@@ -129,34 +129,34 @@ Download and install {{filebeat}}.
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-amd64.deb
-sudo dpkg -i filebeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-amd64.deb
+sudo dpkg -i filebeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi filebeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi filebeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf filebeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf filebeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Filebeat Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Filebeat Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
@@ -426,34 +426,34 @@ Download and install {{metricbeat}}.
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-amd64.deb
-sudo dpkg -i metricbeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-amd64.deb
+sudo dpkg -i metricbeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi metricbeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi metricbeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
diff --git a/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md b/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
index a87070c9c6..27d82f9679 100644
--- a/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
+++ b/solutions/observability/cloud/monitor-google-cloud-platform-gcp.md
@@ -123,34 +123,34 @@ Download and install {{metricbeat}}.
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-amd64.deb
-sudo dpkg -i metricbeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-amd64.deb
+sudo dpkg -i metricbeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi metricbeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi metricbeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
@@ -323,34 +323,34 @@ Download and install {{filebeat}}.
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-amd64.deb
-sudo dpkg -i filebeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-amd64.deb
+sudo dpkg -i filebeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi filebeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi filebeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf filebeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf filebeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Filebeat Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Filebeat Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
diff --git a/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md b/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
index 7b902b258e..6f857626f4 100644
--- a/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
+++ b/solutions/observability/cloud/monitor-microsoft-azure-with-beats.md
@@ -201,38 +201,38 @@ Download and install {{metricbeat}}.
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-amd64.deb
-sudo dpkg -i metricbeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-amd64.deb
+sudo dpkg -i metricbeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi metricbeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi metricbeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
-3. Rename the _metricbeat-{{stack-version}}-windows-x86\_64_ directory to _Metricbeat_.
+3. Rename the _metricbeat-{{version.stack}}-windows-x86\_64_ directory to _Metricbeat_.
 
 4. Open a PowerShell prompt as an Administrator (right-click the PowerShell icon and select *Run As Administrator*).
 
diff --git a/solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md b/solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
index 8bd55914bb..6362086c08 100644
--- a/solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
+++ b/solutions/observability/get-started/other-tutorials/tutorial-monitor-java-application.md
@@ -368,34 +368,34 @@ To read the log file and send it to {{es}}, {{filebeat}} is required. To downloa
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-amd64.deb
-sudo dpkg -i filebeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-amd64.deb
+sudo dpkg -i filebeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi filebeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi filebeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf filebeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf filebeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Filebeat Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Filebeat Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
@@ -1096,34 +1096,34 @@ To send metrics to {{es}}, {{metricbeat}} is required. To download and install {
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-amd64.deb
-sudo dpkg -i metricbeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-amd64.deb
+sudo dpkg -i metricbeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi metricbeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi metricbeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf metricbeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf metricbeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Metricbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/metricbeat/metricbeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
@@ -1724,34 +1724,34 @@ To send uptime data to {{es}}, {{heartbeat}} (the polling component) is required
 
 ::::::{tab-item} DEB
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-amd64.deb
-sudo dpkg -i heartbeat-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-amd64.deb
+sudo dpkg -i heartbeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-x86_64.rpm
-sudo rpm -vi heartbeat-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi heartbeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} MacOS
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf heartbeat-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf heartbeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf heartbeat-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf heartbeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [Heartbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{stack-version}}-windows-x86_64.zip).
+1. Download the [Heartbeat Windows zip file](https://artifacts.elastic.co/downloads/beats/heartbeat/heartbeat-{{version.stack}}-windows-x86_64.zip).
 
 2. Extract the contents of the zip file into `C:\Program Files`.
 
diff --git a/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md b/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
index 90ee110eab..25497291b1 100644
--- a/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
+++ b/solutions/observability/infra-and-hosts/add-symbols-for-native-frames.md
@@ -16,8 +16,8 @@ To see function names and line numbers in traces of applications written in prog
 
 Click the appropriate link for your system to download the `symbtool` binary:
 
-* [x86_64](https://artifacts.elastic.co/downloads/prodfiler/symbtool-{{version}}-linux-x86_64.tar.gz)
-* [ARM64](https://artifacts.elastic.co/downloads/prodfiler/symbtool-{{version}}-linux-arm64.tar.gz)
+* [x86_64](https://artifacts.elastic.co/downloads/prodfiler/symbtool-{{version.stack}}-linux-x86_64.tar.gz)
+* [ARM64](https://artifacts.elastic.co/downloads/prodfiler/symbtool-{{version.stack}}-linux-arm64.tar.gz)
 
 ::::{note}
 The `symbtool` binary currently requires a Linux machine.
diff --git a/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md b/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
index 4e4cf575fb..3ba9d6654b 100644
--- a/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
+++ b/solutions/observability/infra-and-hosts/step-4-run-backend-applications.md
@@ -502,15 +502,15 @@ docker logs pf-elastic-symbolizer
     For x86_64
 
     ```shell subs=true
-    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{version}}-linux-x86_64.tar.gz" | tar xzf -
-    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{version}}-linux-x86_64.tar.gz" | tar xzf -
+    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{version.stack}}-linux-x86_64.tar.gz" | tar xzf -
+    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{version.stack}}-linux-x86_64.tar.gz" | tar xzf -
     ```
 
     For ARM64
 
     ```shell subs=true
-    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{version}}-linux-arm64.tar.gz" | tar xzf -
-    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{version}}-linux-arm64.tar.gz" | tar xzf -
+    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-collector-{{version.stack}}-linux-arm64.tar.gz" | tar xzf -
+    wget -O- "https://artifacts.elastic.co/downloads/prodfiler/pf-elastic-symbolizer-{{version.stack}}-linux-arm64.tar.gz" | tar xzf -
     ```
 
 2. Copy the `pf-elastic-collector` and `pf-elastic-symbolizer` binaries to a directory in the machine’s `PATH`.
diff --git a/solutions/observability/logs/ecs-formatted-application-logs.md b/solutions/observability/logs/ecs-formatted-application-logs.md
index 1b5102f77f..f12b64dc6b 100644
--- a/solutions/observability/logs/ecs-formatted-application-logs.md
+++ b/solutions/observability/logs/ecs-formatted-application-logs.md
@@ -79,36 +79,36 @@ Install {{filebeat}} on the server you want to monitor by running the commands t
 
 ::::::{tab-item} DEB
 ```sh subs=true
-curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-amd64.deb
-sudo dpkg -i filebeat-{{version}}-amd64.deb
+curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-amd64.deb
+sudo dpkg -i filebeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```sh subs=true
-curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-x86_64.rpm
-sudo rpm -vi filebeat-{{version}}-x86_64.rpm
+curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi filebeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} macOS
 ```sh subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-darwin-x86_64.tar.gz
-tar xzvf filebeat-{{version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```sh subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-linux-x86_64.tar.gz
-tar xzvf filebeat-{{version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [{{filebeat}} Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-windows-x86_64.zip).
+1. Download the [{{filebeat}} Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-windows-x86_64.zip).
 2. Extract the contents of the zip file into `C:\Program Files`.
-3. Rename the _filebeat-{{version}}-windows-x86\_64_ directory to _Filebeat_:
+3. Rename the _filebeat-{{version.stack}}-windows-x86\_64_ directory to _Filebeat_:
 4. Open a PowerShell prompt as an Administrator (right-click the PowerShell icon and select **Run As Administrator**).
 5. From the PowerShell prompt, run the following commands to install {{filebeat}} as a Windows service:
 
diff --git a/solutions/observability/logs/plaintext-application-logs.md b/solutions/observability/logs/plaintext-application-logs.md
index f57951da67..e1a59ec78b 100644
--- a/solutions/observability/logs/plaintext-application-logs.md
+++ b/solutions/observability/logs/plaintext-application-logs.md
@@ -47,36 +47,36 @@ Install {{filebeat}} on the server you want to monitor by running the commands t
 
 ::::::{tab-item} DEB
 ```sh subs=true
-curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-amd64.deb
-sudo dpkg -i filebeat-{{version}}-amd64.deb
+curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-amd64.deb
+sudo dpkg -i filebeat-{{version.stack}}-amd64.deb
 ```
 ::::::
 
 ::::::{tab-item} RPM
 ```sh subs=true
-curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-x86_64.rpm
-sudo rpm -vi filebeat-{{version}}-x86_64.rpm
+curl -L -O https\://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-x86_64.rpm
+sudo rpm -vi filebeat-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
 ::::::{tab-item} macOS
 ```sh subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-darwin-x86_64.tar.gz
-tar xzvf filebeat-{{version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 ```sh subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-linux-x86_64.tar.gz
-tar xzvf filebeat-{{version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf filebeat-{{version.stack}}-linux-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Windows
-1. Download the [{{filebeat}} Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version}}-windows-x86_64.zip).
+1. Download the [{{filebeat}} Windows zip file](https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-{{version.stack}}-windows-x86_64.zip).
 2. Extract the contents of the zip file into `C:\Program Files`.
-3. Rename the _filebeat-{{version}}-windows-x86_64_ directory to _{{filebeat}}_.
+3. Rename the _filebeat-{{version.stack}}-windows-x86_64_ directory to _{{filebeat}}_.
 4. Open a PowerShell prompt as an Administrator (right-click the PowerShell icon and select **Run As Administrator**).
 5. From the PowerShell prompt, run the following commands to install {{filebeat}} as a Windows service:
 
diff --git a/solutions/observability/logs/stream-any-log-file.md b/solutions/observability/logs/stream-any-log-file.md
index b0ade9702f..6e8a63445b 100644
--- a/solutions/observability/logs/stream-any-log-file.md
+++ b/solutions/observability/logs/stream-any-log-file.md
@@ -68,16 +68,16 @@ On your host, download and extract the installation package that corresponds wit
 ::::::{tab-item} macOS
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-darwin-x86_64.tar.gz
-tar xzvf elastic-agent-{{stack-version}}-darwin-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-darwin-x86_64.tar.gz
+tar xzvf elastic-agent-{{version.stack}}-darwin-x86_64.tar.gz
 ```
 ::::::
 
 ::::::{tab-item} Linux
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-linux-x86_64.tar.gz
-tar xzvf elastic-agent-{{stack-version}}-linux-x86_64.tar.gz
+curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-linux-x86_64.tar.gz
+tar xzvf elastic-agent-{{version.stack}}-linux-x86_64.tar.gz
 ```
 
 ::::::
@@ -86,8 +86,8 @@ tar xzvf elastic-agent-{{stack-version}}-linux-x86_64.tar.gz
 
 ```powershell subs=true
 # PowerShell 5.0+
-wget https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-windows-x86_64.zip -OutFile elastic-agent-{{stack-version}}-windows-x86_64.zip
-Expand-Archive .\elastic-agent-{{stack-version}}-windows-x86_64.zip
+wget https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-windows-x86_64.zip -OutFile elastic-agent-{{version.stack}}-windows-x86_64.zip
+Expand-Archive .\elastic-agent-{{version.stack}}-windows-x86_64.zip
 
 ```
 
@@ -102,8 +102,8 @@ You can install Elastic Agent in an unprivileged mode that does not require root
 :::
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-amd64.deb
-sudo dpkg -i elastic-agent-{{stack-version}}-amd64.deb
+curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-amd64.deb
+sudo dpkg -i elastic-agent-{{version.stack}}-amd64.deb
 ```
 ::::::
 
@@ -115,8 +115,8 @@ You can install Elastic Agent in an unprivileged mode that does not require root
 :::
 
 ```shell subs=true
-curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{stack-version}}-x86_64.rpm
-sudo rpm -vi elastic-agent-{{stack-version}}-x86_64.rpm
+curl -L -O https://artifacts.elastic.co/downloads/beats/elastic-agent/elastic-agent-{{version.stack}}-x86_64.rpm
+sudo rpm -vi elastic-agent-{{version.stack}}-x86_64.rpm
 ```
 ::::::
 
diff --git a/solutions/observability/uptime/get-started.md b/solutions/observability/uptime/get-started.md
index 05f4626583..b6ba57fdf2 100644
--- a/solutions/observability/uptime/get-started.md
+++ b/solutions/observability/uptime/get-started.md
@@ -41,7 +41,7 @@ If you’ve used the Elastic Synthetics integration to create monitors in the pa
 Elastic provides Docker images that you can use to run monitors. Start by pulling the {{heartbeat}} Docker image.
 
 ```sh subs=true
-docker pull docker.elastic.co/beats/heartbeat:{{version}}
+docker pull docker.elastic.co/beats/heartbeat:{{version.stack}}
 ```
 
 ## Configure [uptime-set-up-config]
@@ -91,7 +91,7 @@ docker run \
   --user=heartbeat \
   --volume="$PWD/heartbeat.yml:/usr/share/heartbeat/heartbeat.yml:ro" \
   --cap-add=NET_RAW \
-  docker.elastic.co/beats/heartbeat:{{version}} heartbeat -e \
+  docker.elastic.co/beats/heartbeat:{{version.stack}} heartbeat -e \
   -E cloud.id={cloud-id} \
   -E cloud.auth=elastic:{cloud-pass}
 ```
@@ -106,7 +106,7 @@ docker run \
   --user=heartbeat \
   --volume="$PWD/heartbeat.yml:/usr/share/heartbeat/heartbeat.yml:ro" \
   --cap-add=NET_RAW \
-  docker.elastic.co/beats/heartbeat:{{version}} heartbeat -e \
+  docker.elastic.co/beats/heartbeat:{{version.stack}} heartbeat -e \
   -E output.elasticsearch.hosts=["localhost:9200"] \
   -E output.elasticsearch.username=elastic \
   -E output.elasticsearch.password=changeme
diff --git a/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md b/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
index fad2a10600..bc3000ea61 100644
--- a/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
+++ b/solutions/security/configure-elastic-defend/configure-offline-endpoints-air-gapped-environments.md
@@ -186,7 +186,7 @@ Download the most recent artifact files from the Elastic global artifact server,
 Below is an example script that downloads all the global artifact updates. There are different artifact files for each version of {{elastic-endpoint}}. Change the value of the `ENDPOINT_VERSION` variable in the example script to match the deployed version of {{elastic-endpoint}}.
 
 ```sh subs=true
-export ENDPOINT_VERSION={{version}} && wget -P downloads/endpoint/manifest https://artifacts.security.elastic.co/downloads/endpoint/manifest/artifacts-$ENDPOINT_VERSION.zip && zcat -q downloads/endpoint/manifest/artifacts-$ENDPOINT_VERSION.zip | jq -r '.artifacts | to_entries[] | .value.relative_url' | xargs -I@ curl "https://artifacts.security.elastic.co@" --create-dirs -o ".@"
+export ENDPOINT_VERSION={{version.stack}} && wget -P downloads/endpoint/manifest https://artifacts.security.elastic.co/downloads/endpoint/manifest/artifacts-$ENDPOINT_VERSION.zip && zcat -q downloads/endpoint/manifest/artifacts-$ENDPOINT_VERSION.zip | jq -r '.artifacts | to_entries[] | .value.relative_url' | xargs -I@ curl "https://artifacts.security.elastic.co@" --create-dirs -o ".@"
 ```
 
 This command will download files and directory structure that should be directly copied to the file server.
@@ -201,7 +201,7 @@ Each new global artifact update release increments a version identifier that you
 To confirm the latest version of the artifacts for a given {{elastic-endpoint}} version, check the published version. This example script checks the version:
 
 ```sh subs=true
-curl -s https://artifacts.security.elastic.co/downloads/endpoint/manifest/artifacts-{{version}}.zip | zcat -q | jq -r .manifest_version
+curl -s https://artifacts.security.elastic.co/downloads/endpoint/manifest/artifacts-{{version.stack}}.zip | zcat -q | jq -r .manifest_version
 ```
 
 Replace `https://artifacts.security.elastic.co` in the command above with your local mirror server to validate that the artifacts are served correctly.
diff --git a/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md b/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
index f1b4a454d8..7da563dc52 100644
--- a/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
+++ b/troubleshoot/ingest/beats-loggingplugin/elastic-logging-plugin-for-docker.md
@@ -15,13 +15,13 @@ You can set the debug level to capture debugging output about the Elastic Loggin
 1. Disable the plugin:
 
     ```sh subs=true
-    docker plugin disable elastic/elastic-logging-plugin:{{version}}
+    docker plugin disable elastic/elastic-logging-plugin:{{version.stack}}
     ```
 
 2. Set the debug level:
 
     ```sh subs=true
-    docker plugin set elastic/elastic-logging-plugin:{{version}} LOG_DRIVER_LEVEL=debug
+    docker plugin set elastic/elastic-logging-plugin:{{version.stack}} LOG_DRIVER_LEVEL=debug
     ```
 
     Where valid settings for `LOG_DRIVER_LEVEL` are `debug`, `info`, `warning`, or `error`.
@@ -29,7 +29,7 @@ You can set the debug level to capture debugging output about the Elastic Loggin
 3. Enable the plugin:
 
     ```sh subs=true
-    docker plugin enable elastic/elastic-logging-plugin:{{version}}
+    docker plugin enable elastic/elastic-logging-plugin:{{version.stack}}
     ```
 
 
diff --git a/troubleshoot/kibana/alerts.md b/troubleshoot/kibana/alerts.md
index fae34eb2e3..e8c7d4038d 100644
--- a/troubleshoot/kibana/alerts.md
+++ b/troubleshoot/kibana/alerts.md
@@ -205,7 +205,7 @@ This approach should be used only temporarily as a last resort to restore functi
 
 ## Limitations [alerting-limitations]
 
-The following limitations and known problems apply to the {{version}} release of the {{kib}} {{alert-features}}:
+The following limitations and known problems apply to the {{version.stack}} release of the {{kib}} {{alert-features}}:
 
 
 ### Alert visibility [_alert_visibility]