diff --git a/deploy-manage/deploy/cloud-on-k8s/_snippets/kib-config.md b/deploy-manage/deploy/cloud-on-k8s/_snippets/kib-config.md
index fb6209c224..3e26002d8a 100644
--- a/deploy-manage/deploy/cloud-on-k8s/_snippets/kib-config.md
+++ b/deploy-manage/deploy/cloud-on-k8s/_snippets/kib-config.md
@@ -2,13 +2,13 @@ You can add your own {{kib}} settings to the `spec.config` section.
 
 The following example demonstrates how to set the [`elasticsearch.requestHeadersWhitelist`](kibana://reference/configuration-reference/general-settings.md#elasticsearch-requestheaderswhitelist) configuration option.
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
diff --git a/deploy-manage/deploy/cloud-on-k8s/accessing-services.md b/deploy-manage/deploy/cloud-on-k8s/accessing-services.md
index ff01de6304..1facb638e4 100644
--- a/deploy-manage/deploy/cloud-on-k8s/accessing-services.md
+++ b/deploy-manage/deploy/cloud-on-k8s/accessing-services.md
@@ -71,13 +71,13 @@ By default, the {{es}} service created by ECK is configured to route traffic to
 When you change the `clusterIP` setting of the service, ECK will delete and re-create the service as `clusterIP` is an immutable field. Depending on your client implementation, this might result in a short disruption until the service DNS entries refresh to point to the new endpoints.
 ::::
 
-```yaml
+```yaml subs=true
 apiVersion: <kind>.k8s.elastic.co/v1
 kind: <Kind>
 metadata:
   name: hulk
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   http:
     service:
       spec:
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
index 8ad7e854bd..25867ab287 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-logstash.md
@@ -41,7 +41,7 @@ You can specify sensitive settings with Kubernetes secrets. ECK automatically in
 
 The Logstash Keystore can be password protected by setting an environment variable called `LOGSTASH_KEYSTORE_PASS`. Check out [Logstash Keystore](logstash://reference/keystore.md#keystore-password) documentation for details.
 
-```yaml
+```yaml subs=true
 apiVersion: v1
 kind: Secret
 metadata:
@@ -54,7 +54,7 @@ kind: Logstash
 metadata:
   name: logstash-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   pipelines:
     - pipeline.id: main
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
index 9e8cf703e7..f3ca527a92 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration-maps-server.md
@@ -27,13 +27,13 @@ You can add any valid Elastic Maps Server setting as documented on the [product]
 
 The following example demonstrates how to set the log level to `debug`:
 
-```yaml
+```yaml subs=true
 apiVersion: maps.k8s.elastic.co/v1alpha1
 kind: ElasticMapsServer
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   config:
      logging.level: debug
@@ -41,13 +41,13 @@ spec:
 
 Alternatively, settings can be provided through a Secret specified in the `configRef` element:
 
-```yaml
+```yaml subs=true
 apiVersion: maps.k8s.elastic.co/v1alpha1
 kind: ElasticMapsServer
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   configRef:
     secretName: maps-config
 ---
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
index 08ce1a92f1..241a73fb2e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-configuration.md
@@ -25,7 +25,7 @@ APM Agent central configuration was added in 7.5.1.
 
 [APM Agent configuration management](/solutions/observability/apm/apm-agent-central-configuration.md) allows you to configure your APM Agents centrally from the {{kib}} APM app. To use this feature, the APM Server needs to be configured with connection details of the {{kib}} instance. If {{kib}} is managed by ECK, you can simply add a `kibanaRef` attribute to the APM Server specification:
 
-```yaml
+```yaml subs=true
 cat <<EOF | kubectl apply -f -
 apiVersion: apm.k8s.elastic.co/v1
 kind: ApmServer
@@ -33,7 +33,7 @@ metadata:
   name: apm-server-quickstart
   namespace: default
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: quickstart
@@ -58,14 +58,14 @@ config:
 
 To customize the configuration of the APM Server, use the `config` element in the specification:
 
-```yaml
+```yaml subs=true
 apiVersion: apm.k8s.elastic.co/v1
 kind: ApmServer
 metadata:
   name: apm-server-quickstart
   namespace: default
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   config:
     output:
@@ -94,14 +94,14 @@ The APM Server keystore can be used to store sensitive settings in the APM Serve
 
 2. In the `spec.secureSettings` section, add a reference to the secret you previously created.
 
-    ```yaml
+    ```yaml subs=true
     apiVersion: apm.k8s.elastic.co/v1
     kind: ApmServer
     metadata:
       name: apm-server-quickstart
       namespace: default
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       count: 1
       secureSettings:
       - secretName: apm-secret-settings
@@ -134,14 +134,14 @@ Now that you know how to use the APM keystore and customize the server configura
 
     Here is a complete example with a password stored in the Keystore, as described in the previous section:
 
-    ```yaml
+    ```yaml subs=true
     apiVersion: apm.k8s.elastic.co/v1
     kind: ApmServer
     metadata:
       name: apm-server-quickstart
       namespace: default
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       count: 1
       secureSettings:
       - secretName: apm-secret-settings
diff --git a/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md b/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
index 6802e11b12..00406cdb35 100644
--- a/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
+++ b/deploy-manage/deploy/cloud-on-k8s/advanced-elasticsearch-node-scheduling.md
@@ -30,13 +30,13 @@ You can use [YAML anchors](https://yaml.org/spec/1.2/spec.html#id2765878) to dec
 
 This allows you to describe an {{es}} cluster with 3 dedicated master nodes, for example:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   # 3 dedicated master nodes
   - name: master
@@ -59,13 +59,13 @@ You can set up various [affinity and anti-affinity options](https://kubernetes.i
 
 To avoid scheduling several {{es}} nodes from the same cluster on the same host, use a `podAntiAffinity` rule based on the hostname and the cluster name label:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -84,13 +84,13 @@ spec:
 
 This is ECK default behavior if you don’t specify any `affinity` option. To explicitly disable the default behavior, set an empty affinity object:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -101,13 +101,13 @@ spec:
 
 The default affinity is using `preferredDuringSchedulingIgnoredDuringExecution`, which acts as best effort and won’t prevent an {{es}} node from being scheduled on a host if there are no other hosts available. Scheduling a 4-nodes {{es}} cluster on a 3-host Kubernetes cluster would then successfully schedule 2 {{es}} nodes on the same host. To enforce a strict single node per host, specify `requiredDuringSchedulingIgnoredDuringExecution` instead:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -143,13 +143,13 @@ volumeBindingMode: WaitForFirstConsumer
 
 To restrict the scheduling to a particular set of Kubernetes nodes based on labels, use a [NodeSelector](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector). The following example schedules {{es}} Pods on Kubernetes nodes tagged with both labels `diskType: ssd` and `environment: production`.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -162,13 +162,13 @@ spec:
 
 You can achieve the same (and more) with [node affinity](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature):
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -217,7 +217,7 @@ The following example demonstrates how to use the `topology.kubernetes.io/zone`
 
 Note that by default ECK creates a `k8s_node_name` attribute with the name of the Kubernetes node running the Pod, and configures {{es}} to use this attribute. This ensures that {{es}} allocates primary and replica shards to Pods running on different Kubernetes nodes and never to Pods that are scheduled onto the same Kubernetes node. To preserve this behavior while making {{es}} aware of the availability zone, include the `k8s_node_name` attribute in the comma-separated `cluster.routing.allocation.awareness.attributes` list.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
@@ -225,7 +225,7 @@ metadata:
     eck.k8s.elastic.co/downward-node-labels: "topology.kubernetes.io/zone"
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -263,13 +263,13 @@ This example relies on:
 
 By combining [{{es}} shard allocation awareness](elasticsearch://reference/elasticsearch/configuration-reference/cluster-level-shard-allocation-routing-settings.md) with [Kubernetes node affinity](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature), you can set up an {{es}} cluster with hot-warm topology:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   # hot nodes, with high CPU and fast IO
   - name: hot
diff --git a/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md b/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
index 92e5161e6e..430a90a3b2 100644
--- a/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
+++ b/deploy-manage/deploy/cloud-on-k8s/air-gapped-install.md
@@ -16,14 +16,14 @@ The ECK operator can be run in an air-gapped environment without access to the o
 
 By default ECK does not require you to specify the container image for each {{stack}} application you deploy.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
-  # image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1 // <1>
+  version: {{version.stack}}
+  # image: docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}} // <1>
   nodeSets:
   - name: default
     count: 1
@@ -44,18 +44,30 @@ ECK will automatically set the correct container image for each application. Whe
 
 To deploy the ECK operator in an air-gapped environment, you first have to mirror the operator image itself from `docker.elastic.co` to a private container registry, for example `my.registry`.
 
-Once the ECK operator image is copied internally, replace the original image name `docker.elastic.co/eck/eck-operator:{{version.eck}}` with the private name of the image, for example `my.registry/eck/eck-operator:{{version.eck}}`, in the [operator manifests](../../../deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md). When using [Helm charts](../../../deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md), replace the `image.repository` Helm value with, for example, `my.registry/eck/eck-operator`.
+Once the ECK operator image is copied internally, replace the original image name with the private name of the image in the [operator manifests](../../../deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md). For example:
+
+Before:
+```text subs=true
+docker.elastic.co/eck/eck-operator:{{version.eck}}
+```
+
+After:
+```text subs=true
+my.registry/eck/eck-operator:{{version.eck}}
+```
+
+When using [Helm charts](../../../deploy-manage/deploy/cloud-on-k8s/install-using-helm-chart.md), replace the `image.repository` Helm value with, for example, `my.registry/eck/eck-operator`.
 
 
 ## Override the default container registry [k8s-container-registry-override]
 
 When creating custom resources ({{eck_resources_list}}), the operator defaults to using container images pulled from the `docker.elastic.co` registry. If you are in an environment where external network access is restricted, you can configure the operator to use a different default container registry by starting the operator with the `--container-registry` command-line flag. Check [*Configure ECK*](../../../deploy-manage/deploy/cloud-on-k8s/configure-eck.md) for more information on how to configure the operator using command-line flags and environment variables.
 
-The operator expects container images to be located at specific repositories in the default container registry. Make sure that your container images are stored in the right repositories and are tagged correctly with the Stack version number. For example, if your private registry is `my.registry` and you wish to deploy components from Stack version 8.16.1, the following image names should exist:
+The operator expects container images to be located at specific repositories in the default container registry. Make sure that your container images are stored in the right repositories and are tagged correctly with the Stack version number. For example, if your private registry is `my.registry` and you wish to deploy components from Stack version {{version.stack}}, the following image names should exist:
 
-* `my.registry/elasticsearch/elasticsearch:8.16.1`
-* `my.registry/kibana/kibana:8.16.1`
-* `my.registry/apm/apm-server:8.16.1`
+* my.registry/elasticsearch/elasticsearch:{{version.stack}}
+* my.registry/kibana/kibana:{{version.stack}}
+* my.registry/apm/apm-server:{{version.stack}}
 
 
 ## Use a global container repository [k8s-container-repository-override]
@@ -64,9 +76,9 @@ If you cannot follow the default Elastic image repositories naming scheme, you c
 
 For example, if your private registry is `my.registry` and all Elastic images are located under the `elastic` repository, the following image names should exist:
 
-* `my.registry/elastic/elasticsearch:8.16.1`
-* `my.registry/elastic/kibana:8.16.1`
-* `my.registry/elastic/apm-server:8.16.1`
+* my.registry/elastic/elasticsearch:{{version.stack}}
+* my.registry/elastic/kibana:{{version.stack}}
+* my.registry/elastic/apm-server:{{version.stack}}
 
 
 ## ECK Diagnostics in air-gapped environments [k8s-eck-diag-air-gapped]
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md b/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
index 9fbd8b794b..0c4043a801 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-beats.md
@@ -19,14 +19,14 @@ You can upgrade the Beat version or change settings by editing the YAML specific
 
 The Beat configuration is defined in the `config` element:
 
-```yaml
+```yaml subs=true
 apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: quickstart
 spec:
   type: heartbeat
-  version: 8.16.1
+  version: {{version.stack}}
   elasticsearchRef:
     name: quickstart
   config:
@@ -44,14 +44,14 @@ spec:
 
 Alternatively, it can be provided through a Secret specified in the `configRef` element:
 
-```yaml
+```yaml subs=true
 apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: heartbeat-quickstart
 spec:
   type: heartbeat
-  version: 8.16.1
+  version: {{version.stack}}
   elasticsearchRef:
     name: quickstart
   configRef:
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md b/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
index 12b299c114..dfe1e0e3de 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-fleet.md
@@ -175,13 +175,13 @@ Depending on the use case, {{agent}} may need to be deployed as a [Deployment](h
 
 Similarly, you can set the [update strategy](https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/) when deploying as a DaemonSet. This allows you to control the rollout speed for new configuration by modifying the `maxUnavailable` setting:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: elastic-agent-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   daemonSet:
     strategy:
       type: RollingUpdate
@@ -197,13 +197,13 @@ Refer to [Set compute resources for Beats and Elastic Agent](manage-compute-reso
 
 Some {{agent}} features, such as the [{{k8s}} integration](https://epr.elastic.co/package/kubernetes/0.2.8/), require that Agent Pods interact with {{k8s}} APIs. This functionality requires specific permissions. Standard {{k8s}} [RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) rules apply. For example, to allow API interactions:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: elastic-agent-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   elasticsearchRefs:
   - name: elasticsearch-sample
   daemonSet:
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md b/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
index 665fa3b5ee..b5c3a7eea2 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-logstash.md
@@ -19,13 +19,13 @@ You can upgrade the Logstash version or change settings by editing the YAML spec
 
 Define the Logstash configuration (the ECK equivalent to `logstash.yml`) in the `spec.config` section:
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:
   - name: quickstart
@@ -40,13 +40,13 @@ spec:
 
 Alternatively, you can provide the configuration through a Secret specified in the `spec.configRef` section. The Secret must have a `logstash.yml` entry with your settings:
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:
   - name: quickstart
@@ -69,13 +69,13 @@ stringData:
 
 Define Logstash pipelines in the `spec.pipelines` section (the ECK equivalent to `pipelines.yml`):
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:
     - clusterName: qs
@@ -100,13 +100,13 @@ spec:
 
 Alternatively, you can provide the pipelines configuration through a Secret specified in the `spec.pipelinesRef` field. The Secret must have a `pipelines.yml` entry with your configuration:
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:
     - clusterName: qs
@@ -139,13 +139,13 @@ stringData:
 
 Logstash on ECK supports all options present in `pipelines.yml`, including settings to update the number of workers, and the size of the batch that the pipeline will process. This also includes using `path.config` to point to volumes mounted on the Logstash container:
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:
     - clusterName: qs
@@ -432,13 +432,13 @@ where NORMALIZED_CLUSTERNAME is the value taken from the `clusterName` field of
 
 This example demonstrates how to create a Logstash deployment that connects to different {{es}} instances, one of which is in a separate namespace:
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:        <1>
     - clusterName: prod-es  <2>
@@ -481,7 +481,7 @@ spec:
 
 Logstash can connect to external {{es}} cluster that is not managed by ECK. You can reference a Secret instead of an {{es}} cluster in the `elasticsearchRefs` section through the `secretName` attribute:
 
-```yaml
+```yaml subs=true
 apiVersion: v1
 kind: Secret
 metadata:
@@ -497,7 +497,7 @@ kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:
     - clusterName: prod-es
@@ -561,13 +561,13 @@ You can [customize the {{ls}} Pod](customize-pods.md) using a Pod template, defi
 
 This example demonstrates how to create a {{ls}} deployment with increased heap size and resource limits.
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRefs:
     - name: "elasticsearch-sample"
diff --git a/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md b/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
index e03d961434..cd50a59307 100644
--- a/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
+++ b/deploy-manage/deploy/cloud-on-k8s/configuration-standalone.md
@@ -19,13 +19,13 @@ You can upgrade the Elastic Agent version or change settings by editing the YAML
 
 The Elastic Agent configuration is defined in the `config` element:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   elasticsearchRefs:
   - name: quickstart
   daemonSet:
@@ -63,13 +63,13 @@ spec:
 
 Alternatively, it can be provided through a Secret specified in the `configRef` element. The Secret must have an `agent.yml` entry with this configuration:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   elasticsearchRefs:
   - name: quickstart
   daemonSet:
@@ -119,13 +119,13 @@ Elastic Agent supports the use of multiple outputs. Therefore, the `elasticsearc
 
 To send Elastic Agent’s internal monitoring and log data to a different {{es}} cluster called `agent-monitoring` in the `elastic-monitoring` namespace, and the harvested metrics to our `quickstart` cluster, you have to define two `elasticsearchRefs` as shown in the following example:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   daemonSet:
     podTemplate:
       spec:
@@ -164,13 +164,13 @@ If the `elasticsearchRefs` element is specified, ECK populates the outputs secti
 
 The outputs can also be set manually. To do that, remove the `elasticsearchRefs` element from the specification and include an appropriate output configuration in the `config`, or indirectly through the `configRef` mechanism.
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   daemonSet:
     podTemplate:
       spec:
@@ -194,13 +194,13 @@ Depending on the use case, Elastic Agent may need to be deployed as a [Deploymen
 
 Similarly, you can set the [update strategy](https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/) when deploying as a DaemonSet. This allows you to control the rollout speed for new configuration by modifying the `maxUnavailable` setting:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   daemonSet:
     podTemplate:
       spec:
@@ -220,13 +220,13 @@ Check [Set compute resources for Beats and Elastic Agent](manage-compute-resourc
 
 Some Elastic Agent features, such as the [Kubernetes integration](https://epr.elastic.co/package/kubernetes/0.2.8/), require that Agent Pods interact with Kubernetes APIs. This functionality requires specific permissions. The standard Kubernetes [RBAC](https://kubernetes.io/docs/reference/access-authn-authz/rbac/) rules apply. For example, to allow API interactions:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: elastic-agent
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   elasticsearchRefs:
   - name: elasticsearch
   daemonSet:
diff --git a/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md b/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
index 313a93ae4c..8d1908ea9d 100644
--- a/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
+++ b/deploy-manage/deploy/cloud-on-k8s/connect-to-external-elastic-resources.md
@@ -35,7 +35,7 @@ spec:
 
 In the case of Elastic Agent you can also specify several named references:
 
-```yaml
+```yaml subs=true
 apiVersion: v1
 kind: Secret
 metadata:
@@ -52,7 +52,7 @@ kind: Agent
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   elasticsearchRefs:
   - outputName: default
     secretName: external-es-ref
diff --git a/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md b/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
index 02a6b553aa..f86e903618 100644
--- a/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
+++ b/deploy-manage/deploy/cloud-on-k8s/create-custom-images.md
@@ -10,35 +10,35 @@ products:
 
 # Create custom images [k8s-custom-images]
 
-You can create your own custom application images ({{eck_resources_list}}) instead of using the base images provided by Elastic. You might want to do this to have a canonical image with all the necessary plugins pre-loaded rather than [installing them through an init container](init-containers-for-plugin-downloads.md) each time a Pod starts.  You must use the official image as the base for custom images. For example, if you want to create an {{es}} 8.16.1 image with the [ICU Analysis Plugin](elasticsearch://reference/elasticsearch-plugins/analysis-icu.md), you can do the following:
+You can create your own custom application images ({{eck_resources_list}}) instead of using the base images provided by Elastic. You might want to do this to have a canonical image with all the necessary plugins pre-loaded rather than [installing them through an init container](init-containers-for-plugin-downloads.md) each time a Pod starts.  You must use the official image as the base for custom images. For example, if you want to create an {{es}} {{version.stack}} image with the [ICU Analysis Plugin](elasticsearch://reference/elasticsearch-plugins/analysis-icu.md), you can do the following:
 
 1. Create a `Dockerfile` containing:
 
-    ```
-    FROM docker.elastic.co/elasticsearch/elasticsearch:8.16.1
+    ```sh subs=true
+    FROM docker.elastic.co/elasticsearch/elasticsearch:{{version.stack}}
     RUN bin/elasticsearch-plugin install --batch analysis-icu
     ```
 
 2. Build the image with:
 
-    ```
-    docker build --tag elasticsearch-icu:8.16.1
+    ```sh subs=true
+    docker build --tag elasticsearch-icu:{{version.stack}}
     ```
 
 
 There are various hosting options for your images. If you use Google Kubernetes Engine, it is automatically configured to use the Google Container Registry. Check [Using Container Registry with Google Cloud](https://cloud.google.com/container-registry/docs/using-with-google-cloud-platform#google-kubernetes-engine) for more information. To use the image, you can then [push to the registry](https://cloud.google.com/container-registry/docs/pushing-and-pulling#pushing_an_image_to_a_registry) with:
 
-```
-docker tag elasticsearch-icu:8.16.1 gcr.io/$PROJECT-ID/elasticsearch-icu:8.16.1
-docker push gcr.io/$PROJECT-ID/elasticsearch-icu:8.16.1
+```sh subs=true
+docker tag elasticsearch-icu:{{version.stack}} gcr.io/$PROJECT-ID/elasticsearch-icu:{{version.stack}}
+docker push gcr.io/$PROJECT-ID/elasticsearch-icu:{{version.stack}}
 ```
 
 Configure your {{es}} specification to use the newly pushed image, for example:
 
-```yaml
+```yaml subs=true
 spec:
-  version: 8.16.1
-  image: gcr.io/$PROJECT-ID/elasticsearch-icu:8.16.1
+  version: {{version.stack}}
+  image: gcr.io/$PROJECT-ID/elasticsearch-icu:{{version.stack}}
 ```
 
 ::::{note}
diff --git a/deploy-manage/deploy/cloud-on-k8s/customize-pods.md b/deploy-manage/deploy/cloud-on-k8s/customize-pods.md
index f06621ce38..0830f857df 100644
--- a/deploy-manage/deploy/cloud-on-k8s/customize-pods.md
+++ b/deploy-manage/deploy/cloud-on-k8s/customize-pods.md
@@ -14,13 +14,13 @@ You can customize the Pods created for each {{stack}} application by modifying t
 
 The following example illustrates how to add a custom label, annotation, and an environment variable using the `podTemplate` field.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 1
@@ -38,13 +38,13 @@ spec:
                 value: "-Xms4g -Xmx4g"
 ```
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   podTemplate:
     metadata:
@@ -67,13 +67,13 @@ Configuration for other {{stack}} applications, like APM Server, or Beats, is id
 
 The following example shows how it’s also possible to customize the init containers created as part of the Pods to initialize the filesystem or to manage the keystores.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
     - name: default
       count: 3
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md b/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
index 7f365f98bc..3f02e5ec4e 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-eck-on-gke-autopilot.md
@@ -37,14 +37,14 @@ Refer to [*Install ECK*](install.md) for more information on installation option
 
 Create an {{es}} cluster. If you are using the `Daemonset` described in the [Virtual memory](virtual-memory.md) section to set `max_map_count` you can add the `initContainer` below is also used to ensure the setting is set prior to starting {{es}}.
 
-```shell
+```shell subs=true
 cat <<EOF | kubectl apply -f -
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 1
diff --git a/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md b/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
index cda31214a4..f1ff019edb 100644
--- a/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
+++ b/deploy-manage/deploy/cloud-on-k8s/deploy-elastic-maps-server.md
@@ -17,17 +17,17 @@ This functionality is in technical preview and may be changed or removed in a fu
 
 Deploying Elastic Maps Server can be done with a simple manifest:
 
-```yaml
+```yaml subs=true
 apiVersion: maps.k8s.elastic.co/v1alpha1
 kind: ElasticMapsServer
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
 ```
 
-Versions of Elastic Maps Server prior to 7.14 need a connection to Elasticseach to verify the installed license. You define the connection with the `elasticsearchRef` attribute:
+Versions of Elastic Maps Server prior to 7.14 need a connection to {{es}} to verify the installed license. You define the connection with the `elasticsearchRef` attribute:
 
 ```yaml
 apiVersion: maps.k8s.elastic.co/v1alpha1
diff --git a/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md b/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
index 38e2763768..d06207f9ba 100644
--- a/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/elasticsearch-deployment-quickstart.md
@@ -13,14 +13,14 @@ products:
 
 To deploy a simple [{{es}}](/solutions/search/get-started.md) cluster specification, with one {{es}} node:
 
-```yaml
+```yaml subs=true
 cat <<EOF | kubectl apply -f -
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 1
@@ -63,9 +63,9 @@ kubectl get elasticsearch
 
 When you first create the Kubernetes cluster, there is no `HEALTH` status and the `PHASE` is empty. After the pod and service start-up, the `PHASE` turns into `Ready`, and `HEALTH` becomes `green`. The `HEALTH` status comes from {{es}}'s [cluster health API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-health).
 
-```sh
+```sh subs=true
 NAME          HEALTH    NODES     VERSION   PHASE         AGE
-quickstart              1         8.16.1               1s
+quickstart              1         {{version.stack}}               1s
 ```
 
 While the {{es}} pod is in the process of being started it will report `Pending` as checked with [`get`](https://kubernetes.io/docs/reference/kubectl/generated/kubectl_get/):
@@ -89,9 +89,9 @@ kubectl logs -f quickstart-es-default-0
 
 Once the pod has finished coming up, our original [`get`](https://kubernetes.io/docs/reference/kubectl/generated/kubectl_get/) request will now report:
 
-```sh
+```sh subs=true
 NAME          HEALTH    NODES     VERSION   PHASE         AGE
-quickstart    green     1         8.16.1     Ready         1m
+quickstart    green     1         {{version.stack}}     Ready         1m
 ```
 
 
diff --git a/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md b/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
index abc184d362..0a95264d85 100644
--- a/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/install-using-yaml-manifest-quickstart.md
@@ -53,7 +53,6 @@ To deploy the ECK operator:
     customresourcedefinition.apiextensions.k8s.io/beats.beat.k8s.elastic.co created
     customresourcedefinition.apiextensions.k8s.io/elasticmapsservers.maps.k8s.elastic.co created
     customresourcedefinition.apiextensions.k8s.io/elasticsearches.elasticsearch.k8s.elastic.co created
-    customresourcedefinition.apiextensions.k8s.io/enterprisesearches.enterprisesearch.k8s.elastic.co created
     customresourcedefinition.apiextensions.k8s.io/kibanas.kibana.k8s.elastic.co created
     customresourcedefinition.apiextensions.k8s.io/logstashes.logstash.k8s.elastic.co created
     ```
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
index e7aa9f6180..d358fe43f8 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-advanced-configuration.md
@@ -24,13 +24,13 @@ You can [customize the {{kib}} Pod](customize-pods.md) using a [Pod Template](ht
 
 The following example demonstrates how to create a {{kib}} deployment with custom node affinity, increased heap size, and resource limits.
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
index f2b4d62f0c..17cb6d45a9 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-es.md
@@ -16,13 +16,13 @@ You can connect an {{es}} cluster that is either managed by ECK or not managed b
 
 It is quite straightforward to connect a {{kib}} instance to an {{es}} cluster managed by ECK:
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: quickstart
@@ -55,13 +55,13 @@ For example, use the [secure settings](../../security/k8s-secure-settings.md) me
 kubectl create secret generic kibana-elasticsearch-credentials --from-literal=elasticsearch.password=$PASSWORD
 ```
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   config:
     elasticsearch.hosts:
@@ -73,13 +73,13 @@ spec:
 
 If the external {{es}} cluster is using a self-signed certificate, create a [`Secret`](https://kubernetes.io/docs/concepts/configuration/secret/) containing the CA certificate and mount it to the {{kib}} container as follows:
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   config:
     elasticsearch.hosts:
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
index 0dcbdf596b..f3e059959b 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-kibana-plugins.md
@@ -14,8 +14,8 @@ You can override the {{kib}} container image to use your own image with the plug
 
 This is a Dockerfile example:
 
-```
-FROM docker.elastic.co/kibana/kibana:8.16.1
+```sh subs=true
+FROM docker.elastic.co/kibana/kibana:{{version.stack}}
 RUN /usr/share/kibana/bin/kibana-plugin install $PLUGIN_URL
 RUN /usr/share/kibana/bin/kibana --optimize
 ```
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
index 7a0d3504fa..a10b9b1118 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-agent.md
@@ -33,13 +33,13 @@ If you used the examples from the [recipes directory](https://github.com/elastic
 
 3. Update the Elastic Agent manifest to use the new ServiceAccount, for example:
 
-    ```yaml
+    ```yaml subs=true
     apiVersion: agent.k8s.elastic.co/v1alpha1
     kind: Agent
     metadata:
       name: my-agent
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       daemonSet:
         podTemplate:
           spec:
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
index c091a961ba..0954ca6883 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-anyuid-workaround.md
@@ -10,7 +10,7 @@ products:
 
 # Deploy Docker images with anyuid SCC [k8s-openshift-anyuid-workaround]
 
-Starting with version 7.9, it is possible to run the APM Server with the `restricted` SCC. For APM versions older than 7.9, you can use this workaround which allows the Pod to run with the default `uid 1000` by assigning it to the `anyuid` SCC:
+Starting with {{stack}} version 7.9, it is possible to run the APM Server with the `restricted` SCC. For APM versions older than 7.9, you can use this workaround which allows the Pod to run with the default `uid 1000` by assigning it to the `anyuid` SCC:
 
 1. Create a service account to run the APM Server:
 
@@ -30,14 +30,16 @@ Starting with version 7.9, it is possible to run the APM Server with the `restri
 
 3. Deploy an APM Server and a `Route` with the following manifest:
 
-    ```shell
+    % this example might require an older stack version
+    
+    ```shell subs=true
     cat <<EOF | oc apply -n elastic -f -
     apiVersion: apm.k8s.elastic.co/v1
     kind: ApmServer
     metadata:
       name: apm-server-sample
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       count: 1
       elasticsearchRef:
         name: "elasticsearch-sample"
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
index daf13f5f10..b57935217f 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-beats.md
@@ -33,14 +33,14 @@ If you used the examples from the [recipes directory](https://github.com/elastic
 
 3. Update the Beat manifest to use the new ServiceAccount, for example:
 
-    ```yaml
+    ```yaml subs=true
     apiVersion: beat.k8s.elastic.co/v1beta1
     kind: Beat
     metadata:
       name: heartbeat
     spec:
       type: heartbeat
-      version: 8.16.1
+      version: {{version.stack}}
       elasticsearchRef:
         name: elasticsearch
       config:
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
index 23d000a281..ddb2cd27cd 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-elasticsearch.md
@@ -17,7 +17,7 @@ A namespace other than the default namespaces (default, kube-system, kube-**, op
 ::::
 
 
-```shell
+```shell subs=true
 cat <<EOF | oc apply -n elastic -f -
 # This sample sets up an Elasticsearch cluster with an OpenShift route
 apiVersion: elasticsearch.k8s.elastic.co/v1
@@ -25,7 +25,7 @@ kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 1
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
index 5c2620c1ca..362e634635 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-openshift-deploy-kibana.md
@@ -12,14 +12,14 @@ products:
 
 Use the following code to create a {{kib}} instance and a "passthrough" route to access it:
 
-```shell
+```shell subs=true
 cat <<EOF | oc apply -n elastic -f -
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: kibana-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
index 39ae9c7a04..a84cd1040a 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-istio.md
@@ -77,13 +77,13 @@ If you have configured Istio in [permissive mode](https://istio.io/docs/concepts
 
 ### {{es}} [k8s-service-mesh-istio-elasticsearch]
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elastic-istio
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   http:
     tls: <1>
       selfSignedCertificate:
@@ -134,13 +134,13 @@ There are [known issues with init containers](https://istio.io/docs/setup/additi
 
 To install plugins using an init container, use a manifest similar to the following:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elastic-istio
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   http:
     tls:
       selfSignedCertificate:
@@ -173,13 +173,13 @@ spec:
 
 ### {{kib}} [k8s-service-mesh-istio-kibana]
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: elastic-istio
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: elastic-istio
@@ -199,13 +199,13 @@ spec:
 
 ### APM Server [k8s-service-mesh-istio-apm]
 
-```yaml
+```yaml subs=true
 apiVersion: apm.k8s.elastic.co/v1
 kind: ApmServer
 metadata:
   name: elastic-istio
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: elastic-istio
diff --git a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
index 4d2f38f3ae..4aacde5d50 100644
--- a/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
+++ b/deploy-manage/deploy/cloud-on-k8s/k8s-service-mesh-linkerd.md
@@ -58,13 +58,13 @@ If automatic sidecar injection is enabled and [auto mounting of service account
 
 ### {{es}} [k8s-service-mesh-linkerd-elasticsearch]
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elastic-linkerd
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   http:
     tls: <1>
       selfSignedCertificate:
@@ -92,13 +92,13 @@ spec:
 
 The configuration is almost identical for {{kib}} and APM Server resources.
 
-```yaml
+```yaml subs=true
 apiVersion: ...
 kind: ...
 metadata:
   name: elastic-linkerd
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: elastic-linkerd
diff --git a/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md b/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
index 1da4013eac..8bd4c51916 100644
--- a/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
+++ b/deploy-manage/deploy/cloud-on-k8s/kibana-instance-quickstart.md
@@ -15,14 +15,14 @@ To deploy a simple [{{kib}}](/get-started/the-stack.md#stack-components-kibana)
 
 1. Specify a {{kib}} instance and associate it with your {{es}} `quickstart` cluster created previously under [Deploying an {{es}} cluster](elasticsearch-deployment-quickstart.md):
 
-    ```yaml
+    ```yaml subs=true
     cat <<EOF | kubectl apply -f -
     apiVersion: kibana.k8s.elastic.co/v1
     kind: Kibana
     metadata:
       name: quickstart
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       count: 1
       elasticsearchRef:
         name: quickstart
diff --git a/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md b/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
index e890476f91..53ce7781c8 100644
--- a/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
+++ b/deploy-manage/deploy/cloud-on-k8s/logstash-plugins.md
@@ -206,8 +206,8 @@ This example downloads the same `postgres` JDBC driver, and adds it to the {{ls}
 
 First, create a Dockerfile based on the {{ls}} Docker image. Download the JDBC driver, and save it alongside the other JAR files in the {{ls}} classpath:
 
-```shell
-FROM docker.elastic.co/logstash/logstash:8.16.1
+```shell subs=true
+FROM docker.elastic.co/logstash/logstash:{{version.stack}}
 RUN curl -o /usr/share/logstash/logstash-core/lib/jars/postgresql.jar -L https://jdbc.postgresql.org/download/postgresql-42.6.0.jar <1>
 ```
 
@@ -323,13 +323,13 @@ Plugin categories that require special considerations are:
 
 If the pipeline *does not* contain any plugins from these categories, you can increase the number of {{ls}} instances by setting the `count` property in the {{ls}} resource:
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 3
 ```
 
@@ -460,17 +460,17 @@ If you need plugins in addition to those included in the standard {{ls}} distrib
 
 This sample Dockerfile installs the [`logstash-filter-tld`](logstash-docs-md://lsr/plugins-filters-tld.md) plugin to the official {{ls}} Docker image:
 
-```shell
-FROM docker.elastic.co/logstash/logstash:8.16.1
+```shell subs=true
+FROM docker.elastic.co/logstash/logstash:{{version.stack}}
 RUN bin/logstash-plugin install logstash-filter-tld
 ```
 
 Then after building and deploying the custom image (refer to [*Create custom images*](create-custom-images.md) for more details), include it in the {{ls}} manifest:
 
-```shell
+```shell subs=true
 spec:
   count: 1
-  version: 8.16.1 <1>
+  version: {{version.stack}} <1>
   image: <CUSTOM_IMAGE>
 ```
 
diff --git a/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md b/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
index 92f6255212..7b91bd8127 100644
--- a/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
+++ b/deploy-manage/deploy/cloud-on-k8s/manage-compute-resources.md
@@ -29,13 +29,13 @@ You can set compute resource constraints in the `podTemplate` of objects managed
 
 ### Set compute resources for {{es}} [k8s-compute-resources-elasticsearch]
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 1
@@ -58,13 +58,13 @@ Starting with {{es}} 7.11, the heap size of the JVM is automatically calculated
 
 For {{es}} before 7.11, or if you want to override the default calculated heap size on newer versions, set the `ES_JAVA_OPTS` environment variable in the `podTemplate` to an appropriate value:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 1
@@ -109,13 +109,13 @@ A [known Kubernetes issue](https://github.com/kubernetes/kubernetes/issues/51135
 
 ### Set compute resources for {{kib}}, Elastic Maps Server, APM Server and Logstash [k8s-compute-resources-kibana-and-apm]
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   podTemplate:
     spec:
       containers:
@@ -132,13 +132,13 @@ spec:
             cpu: 2
 ```
 
-```yaml
+```yaml subs=true
 apiVersion: maps.k8s.elastic.co/v1alpha1
 kind: ElasticMapsServer
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   podTemplate:
     spec:
       containers:
@@ -155,13 +155,13 @@ spec:
             cpu: 1
 ```
 
-```yaml
+```yaml subs=true
 apiVersion: apm.k8s.elastic.co/v1
 kind: ApmServer
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   podTemplate:
     spec:
       containers:
@@ -175,13 +175,15 @@ spec:
             cpu: 2
 ```
 
+% enterprise search not available in 9.0+ so this uses a hardcoded version
+
 ```yaml
 apiVersion: enterprisesearch.k8s.elastic.co/v1
 kind: EnterpriseSearch
 metadata:
   name: enterprise-search-quickstart
 spec:
-  version: 8.16.1
+  version: 8.19.1
   podTemplate:
     spec:
       containers:
@@ -198,13 +200,13 @@ spec:
           value: -Xms3500m -Xmx3500m
 ```
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1
 kind: logstash
 metadata:
   name: logstash-quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   podTemplate:
     spec:
       containers:
@@ -230,14 +232,14 @@ For Beats or Elastic Agent objects, the `podTemplate` can be configured as follo
 
 When deploying as a Kubernetes Deployment:
 
-```yaml
+```yaml subs=true
 apiVersion: beat.k8s.elastic.co/v1beta1
 kind: Beat
 metadata:
   name: quickstart
 spec:
   type: filebeat
-  version: 8.16.1
+  version: {{version.stack}}
   deployment:
     podTemplate:
       spec:
@@ -254,13 +256,13 @@ spec:
 
 When deploying as a Kubernetes DaemonSet:
 
-```yaml
+```yaml subs=true
 apiVersion: agent.k8s.elastic.co/v1alpha1
 kind: Agent
 metadata:
   name: elastic-agent
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   daemonSet:
     podTemplate:
       spec:
diff --git a/deploy-manage/deploy/cloud-on-k8s/map-data.md b/deploy-manage/deploy/cloud-on-k8s/map-data.md
index ad715a0ad9..c6224d03a9 100644
--- a/deploy-manage/deploy/cloud-on-k8s/map-data.md
+++ b/deploy-manage/deploy/cloud-on-k8s/map-data.md
@@ -85,13 +85,13 @@ You can [customize the Elastic Maps Server Pod](customize-pods.md) using a Pod t
 
 The following example demonstrates how to create a Elastic Maps Server deployment which mounts a data volume with the complete basemap.
 
-```yaml
+```yaml subs=true
 apiVersion: maps.k8s.elastic.co/v1alpha1
 kind: ElasticMapsServer
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   podTemplate:
     spec:
diff --git a/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md b/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
index cf12350b47..8b364301bb 100644
--- a/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
+++ b/deploy-manage/deploy/cloud-on-k8s/nodes-orchestration.md
@@ -28,13 +28,13 @@ You can use [YAML anchors](https://yaml.org/spec/1.2/spec.html#id2765878) to dec
 ::::
 
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: master-nodes
     count: 3
diff --git a/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md b/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
index 9ad648c6f4..b81464e92d 100644
--- a/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
+++ b/deploy-manage/deploy/cloud-on-k8s/pod-disruption-budget.md
@@ -22,7 +22,7 @@ kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -43,14 +43,14 @@ spec:
 
 You can specify a PDB per nodeset or node role.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
   podDisruptionBudget: {} <1>
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
     - name: master
       count: 3
diff --git a/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md b/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
index 98a2b6fa08..4a0c2eef65 100644
--- a/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
+++ b/deploy-manage/deploy/cloud-on-k8s/pod-prestop-hook.md
@@ -24,7 +24,7 @@ The exact behavior is configurable using an environment variable, for example:
 
 ```yaml
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
     - name: default
       count: 1
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
index 4ba79a0469..a4961966fc 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-beats.md
@@ -20,7 +20,7 @@ products:
       name: quickstart
     spec:
       type: filebeat
-      version: 8.16.1
+      version: {{version.stack}}
       elasticsearchRef:
         name: quickstart
       config:
@@ -67,9 +67,9 @@ products:
     kubectl get beat
     ```
 
-    ```sh
+    ```sh subs=true
     NAME                  HEALTH   AVAILABLE   EXPECTED   TYPE       VERSION   AGE
-    quickstart            green    3           3          filebeat   8.16.1     2m
+    quickstart            green    3           3          filebeat   {{version.stack}}     2m
     ```
 
 3. List all the Pods belonging to a given Beat.
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
index 080ffb9d5f..a3d8f912c3 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-fleet.md
@@ -20,7 +20,7 @@ products:
       name: fleet-server-quickstart
       namespace: default
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       kibanaRef:
         name: kibana-quickstart
       elasticsearchRefs:
@@ -43,7 +43,7 @@ products:
       name: elastic-agent-quickstart
       namespace: default
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       kibanaRef:
         name: kibana-quickstart
       fleetServerRef:
@@ -67,7 +67,7 @@ products:
       name: kibana-quickstart
       namespace: default
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       count: 1
       elasticsearchRef:
         name: elasticsearch-quickstart
@@ -115,7 +115,7 @@ products:
       name: elasticsearch-quickstart
       namespace: default
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       nodeSets:
       - name: default
         count: 3
@@ -191,10 +191,10 @@ ECK automatically configures secure connections between all components. {{fleet}
     kubectl get agent
     ```
 
-    ```sh
+    ```sh subs=true
     NAME                       HEALTH   AVAILABLE   EXPECTED   VERSION      AGE
-    elastic-agent-quickstart   green    3           3          8.16.1    14s
-    fleet-server-quickstart    green    1           1          8.16.1    19s
+    elastic-agent-quickstart   green    3           3          {{version.stack}}    14s
+    fleet-server-quickstart    green    1           1          {{version.stack}}    19s
     ```
 
 2. List all the Pods belonging to a given {{agent}} specification.
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
index 55f88ec2f7..90dd27a813 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-logstash.md
@@ -12,7 +12,7 @@ products:
 
 Add the following specification to create a minimal {{ls}} deployment that will listen to a Beats agent or Elastic Agent configured to send to Logstash on port 5044, create the service and write the output to an {{es}} cluster named `quickstart`, created in the [{{es}} quickstart](deploy-an-orchestrator.md).
 
-```yaml
+```yaml subs=true
 cat <<'EOF' | kubectl apply -f -
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
@@ -23,7 +23,7 @@ spec:
   elasticsearchRefs:
     - name: quickstart
       clusterName: qs
-  version: 8.16.1
+  version: {{version.stack}}
   pipelines:
     - pipeline.id: main
       config.string: |
@@ -61,9 +61,9 @@ Check [Configuration examples](configuration-examples-logstash.md) for more read
     kubectl get logstash
     ```
 
-    ```sh
+    ```sh subs=true
     NAME              AVAILABLE   EXPECTED   AGE   VERSION
-    quickstart        3           3          4s    8.16.1
+    quickstart        3           3          4s    {{version.stack}}
     ```
 
 2. List all the Pods that belong to a given Logstash specification.
diff --git a/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md b/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
index a4b290a3a6..479364eff4 100644
--- a/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
+++ b/deploy-manage/deploy/cloud-on-k8s/quickstart-standalone.md
@@ -12,14 +12,14 @@ products:
 
 1. Apply the following specification to deploy Elastic Agent with the System metrics integration to harvest CPU metrics from the Agent Pods. ECK automatically configures the secured connection to an {{es}} cluster named `quickstart`, created in the [{{es}} quickstart](deploy-an-orchestrator.md).
 
-    ```yaml
+    ```yaml subs=true
     cat <<EOF | kubectl apply -f -
     apiVersion: agent.k8s.elastic.co/v1alpha1
     kind: Agent
     metadata:
       name: quickstart
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       elasticsearchRefs:
       - name: quickstart
       daemonSet:
@@ -64,9 +64,9 @@ products:
     kubectl get agent
     ```
 
-    ```sh
+    ```sh subs=true
     NAME            HEALTH   AVAILABLE   EXPECTED   VERSION   AGE
-    quickstart      green    3           3          8.16.1    15s
+    quickstart      green    3           3          {{version.stack}}    15s
     ```
 
 3. List all the Pods that belong to a given Elastic Agent specification.
diff --git a/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md b/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
index 0a6cecd701..292ec256f7 100644
--- a/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
+++ b/deploy-manage/deploy/cloud-on-k8s/readiness-probe.md
@@ -16,9 +16,9 @@ By default, the readiness probe checks that the Pod responds to HTTP requests wi
 
 This example describes how to increase the API call timeout to ten seconds and the overall check time to twelve seconds:
 
-```yaml
+```yaml subs=true
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
     - name: default
       count: 1
diff --git a/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md b/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
index 9e6f03b589..dd84d3545b 100644
--- a/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
+++ b/deploy-manage/deploy/cloud-on-k8s/requests-routing-to-elasticsearch-nodes.md
@@ -23,13 +23,13 @@ If ingress configuration is challenging or unsupported in your environment, cons
 
 The service configurations shown in these sections are based on the following {{es}} cluster definition:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: hulk
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   # Dedicated master nodes
   - name: master
@@ -128,13 +128,13 @@ spec:
 
 You can then use your custom service in the `elasticsearchRef` element when specifying connections between {{es}} and other stack applications. This is an example on how to target only coordinating node from {{kib}}:
 
-```yaml
+```yaml subs=true
 apiVersion: kibana.k8s.elastic.co/v1
 kind: Kibana
 metadata:
   name: hulk
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: "hulk"
diff --git a/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md b/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
index 5827bc1665..4772ad5811 100644
--- a/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
+++ b/deploy-manage/deploy/cloud-on-k8s/securing-logstash-api.md
@@ -16,7 +16,7 @@ Access to the [Logstash Monitoring APIs](logstash://reference/monitoring-logstas
 
 You can further secure the {{ls}} Monitoring APIs by requiring HTTP Basic authentication by setting `api.auth.type: basic`, and providing the relevant credentials `api.auth.basic.username` and `api.auth.basic.password`:
 
-```yaml
+```yaml subs=true
 apiVersion: v1
 kind: Secret
 metadata:
@@ -30,7 +30,7 @@ kind: Logstash
 metadata:
   name: logstash-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   config:
     api.auth.type: basic
@@ -62,14 +62,14 @@ The variable substitution in `config` does not support the default value syntax.
 
 The TLS Keystore is automatically generated and includes a certificate and a private key, with default password protection set to `changeit`. This password can be modified by configuring the `api.ssl.keystore.password` value.
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash-sample
 spec:
   count: 1
-  version: 8.16.1
+  version: {{version.stack}}
   config:
     api.ssl.keystore.password: "${SSL_KEYSTORE_PASSWORD}"
 ```
@@ -79,13 +79,13 @@ spec:
 
 If you want to use your own certificate, the required configuration is similar to {{es}}. Configure the certificate in `api` Service. Check [Custom HTTP certificate](../../security/secure-cluster-communications.md).
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
@@ -104,13 +104,13 @@ spec:
 
 You can disable TLS by disabling the generation of the self-signed certificate in the API service definition
 
-```yaml
+```yaml subs=true
 apiVersion: logstash.k8s.elastic.co/v1alpha1
 kind: Logstash
 metadata:
   name: logstash-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   count: 1
   elasticsearchRef:
     name: "elasticsearch-sample"
diff --git a/deploy-manage/deploy/cloud-on-k8s/security-context.md b/deploy-manage/deploy/cloud-on-k8s/security-context.md
index 2e37d01605..1afd190267 100644
--- a/deploy-manage/deploy/cloud-on-k8s/security-context.md
+++ b/deploy-manage/deploy/cloud-on-k8s/security-context.md
@@ -45,13 +45,13 @@ Kubernetes recursively changes ownership and permissions for the contents of eac
 
 For example, if you force the Pod to run as user `1234`, you need to set `fsGroup` accordingly to `1234`:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
 spec:
   nodeSets:
   - name: default
diff --git a/deploy-manage/deploy/cloud-on-k8s/update-deployments.md b/deploy-manage/deploy/cloud-on-k8s/update-deployments.md
index ae8872ae1d..572879ef6d 100644
--- a/deploy-manage/deploy/cloud-on-k8s/update-deployments.md
+++ b/deploy-manage/deploy/cloud-on-k8s/update-deployments.md
@@ -15,14 +15,14 @@ You can add and modify most elements of the original Kubernetes cluster specific
 
 For example, you can grow the cluster to three {{es}} nodes from the [deployed {{es}} cluster](elasticsearch-deployment-quickstart.md) example by updating the `count` with [`apply`](https://kubernetes.io/docs/reference/kubectl/generated/kubectl_apply/):
 
-```yaml
+```yaml subs=true
 cat <<EOF | kubectl apply -f -
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
diff --git a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
index 653b763744..2a3e332f89 100644
--- a/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
+++ b/deploy-manage/deploy/cloud-on-k8s/use-an-elasticsearch-cluster-managed-by-eck.md
@@ -14,7 +14,7 @@ Managing APM Server, {{kib}} and {{es}} with ECK allows a smooth and secured int
 
 1. To deploy an APM Server and connect it to the {{es}} cluster and {{kib}} instance you created in the [quickstart](deploy-an-orchestrator.md), apply the following specification:
 
-    ```yaml
+    ```yaml subs=true
     cat <<EOF | kubectl apply -f -
     apiVersion: apm.k8s.elastic.co/v1
     kind: ApmServer
@@ -22,7 +22,7 @@ Managing APM Server, {{kib}} and {{es}} with ECK allows a smooth and secured int
       name: apm-server-quickstart
       namespace: default
     spec:
-      version: 8.16.1
+      version: {{version.stack}}
       count: 1
       elasticsearchRef:
         name: quickstart
@@ -58,9 +58,9 @@ By default `elasticsearchRef` targets all nodes in your {{es}} cluster. If you w
     kubectl get apmservers
     ```
 
-    ```sh
+    ```sh subs=true
     NAME                     HEALTH    NODES    VERSION   AGE
-    apm-server-quickstart    green     1        8.16.1      8m
+    apm-server-quickstart    green     1        {{version.stack}}      8m
     ```
 
     And you can list all the Pods belonging to a given deployment:
diff --git a/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md b/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
index bc11b0c4d7..98292602d4 100644
--- a/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
+++ b/deploy-manage/deploy/cloud-on-k8s/virtual-memory.md
@@ -31,14 +31,14 @@ spec:
 
 To add an init container that changes the host kernel setting before your {{es}} container starts, you can use the following example {{es}} spec:
 
-```yaml
+```yaml subs=true
 cat <<EOF | kubectl apply -f -
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -97,14 +97,14 @@ EOF
 
 To run an {{es}} instance that waits for the kernel setting to be in place:
 
-```yaml
+```yaml subs=true
 cat <<'EOF' | kubectl apply -f -
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: elasticsearch-sample
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 1
diff --git a/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md b/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
index 7a35a68711..e7e66a11ea 100644
--- a/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
+++ b/deploy-manage/deploy/cloud-on-k8s/volume-claim-templates.md
@@ -43,13 +43,13 @@ ECK automatically deletes PersistentVolumeClaim resources if the owning {{es}} n
 
 In addition, you can control what ECK should do with the PersistentVolumeClaims if you delete the {{es}} cluster altogether through the `volumeClaimDeletePolicy` attribute.
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: es
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   volumeClaimDeletePolicy: DeleteOnScaledownOnly
   nodeSets:
   - name: default
diff --git a/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md b/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md
index b8a710ac87..e7bd5f2cc7 100644
--- a/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md
+++ b/troubleshoot/deployments/cloud-on-k8s/troubleshooting-methods.md
@@ -234,13 +234,13 @@ To increase or decrease the size of a disk, you cannot change the size of the vo
 
 For a concrete example, imagine you started with this:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default
     count: 3
@@ -260,13 +260,13 @@ spec:
 
 and want to increase it to 10Gi of storage. You can change the nodeSet name and the volume size like so:
 
-```yaml
+```yaml subs=true
 apiVersion: elasticsearch.k8s.elastic.co/v1
 kind: Elasticsearch
 metadata:
   name: quickstart
 spec:
-  version: 8.16.1
+  version: {{version.stack}}
   nodeSets:
   - name: default-10gi
     count: 3