diff --git a/sites/platform/src/add-services/elasticsearch.md b/sites/platform/src/add-services/elasticsearch.md
index 21145b8511..d9717fcd56 100644
--- a/sites/platform/src/add-services/elasticsearch.md
+++ b/sites/platform/src/add-services/elasticsearch.md
@@ -29,9 +29,32 @@ From version 7.11 onward:
 
 The following premium versions are supported:
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="elasticsearch" status="supported" environment="grid" >}} | {{< image-versions image="elasticsearch" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="elasticsearch" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="elasticsearch" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="elasticsearch" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="elasticsearch" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="elasticsearch" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% major-minor-versions-note configMinor="true" %}}
 
@@ -40,9 +63,32 @@ The following premium versions are supported:
 The following versions are still available in your projects for free,
 but they're at their end of life and are no longer receiving security updates from upstream.
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="elasticsearch" status="deprecated" environment="grid" >}} | {{< image-versions image="elasticsearch" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="elasticsearch" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="elasticsearch" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="elasticsearch" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="elasticsearch" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="elasticsearch" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 To ensure your project remains stable in the future,
 switch to [a premium version](#supported-versions).
diff --git a/sites/platform/src/add-services/headless-chrome.md b/sites/platform/src/add-services/headless-chrome.md
index fbd0a3c497..034bc1e2ae 100644
--- a/sites/platform/src/add-services/headless-chrome.md
+++ b/sites/platform/src/add-services/headless-chrome.md
@@ -15,9 +15,32 @@ Puppeteer can be used to generate PDFs and screenshots of web pages, automate fo
 
 {{% major-minor-versions-note %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="chrome-headless" status="supported" environment="grid" >}} | {{< image-versions image="chrome-headless" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="chrome-headless" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="chrome-headless" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="chrome-headless" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="chrome-headless" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="chrome-headless" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% relationship-ref-intro %}}
 
diff --git a/sites/platform/src/add-services/influxdb.md b/sites/platform/src/add-services/influxdb.md
index 4c485481ac..11ac362cd5 100644
--- a/sites/platform/src/add-services/influxdb.md
+++ b/sites/platform/src/add-services/influxdb.md
@@ -14,9 +14,32 @@ It exposes an HTTP API for client interaction. See the [InfluxDB documentation](
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="influxdb" status="supported" environment="grid" >}} | {{< image-versions image="influxdb" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="influxdb" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="influxdb" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="influxdb" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="influxdb" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="influxdb" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% image-versions-legacy "influxdb" %}}
 
@@ -25,9 +48,32 @@ It exposes an HTTP API for client interaction. See the [InfluxDB documentation](
 The following versions are still available in your projects,
 but they're at their end of life and are no longer receiving security updates from upstream.
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="influxdb" status="deprecated" environment="grid" >}} | {{< image-versions image="influxdb" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="influxdb" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="influxdb" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="influxdb" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="influxdb" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="influxdb" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 To ensure your project remains stable in the future,
 switch to a [supported version](#supported-versions).
diff --git a/sites/platform/src/add-services/kafka.md b/sites/platform/src/add-services/kafka.md
index 542119cf19..bcf79de5af 100644
--- a/sites/platform/src/add-services/kafka.md
+++ b/sites/platform/src/add-services/kafka.md
@@ -14,9 +14,32 @@ It is a framework for storing, reading and analyzing streaming data. See the [Ka
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="kafka" status="supported" environment="grid" >}} | {{< image-versions image="kafka" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="kafka" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="kafka" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="kafka" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="kafka" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="kafka" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% relationship-ref-intro %}}
 
diff --git a/sites/platform/src/add-services/memcached.md b/sites/platform/src/add-services/memcached.md
index 3fadfb89c4..f57b8237e9 100644
--- a/sites/platform/src/add-services/memcached.md
+++ b/sites/platform/src/add-services/memcached.md
@@ -22,9 +22,32 @@ Both Memcached and Redis can be used for application caching. As a general rule,
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="memcached" status="supported" environment="grid" >}} | {{< image-versions image="memcached" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="memcached" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="memcached" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="memcached" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="memcached" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="memcached" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% relationship-ref-intro %}}
 
diff --git a/sites/platform/src/add-services/mongodb.md b/sites/platform/src/add-services/mongodb.md
index 1f1cfdec77..4a048af2bd 100644
--- a/sites/platform/src/add-services/mongodb.md
+++ b/sites/platform/src/add-services/mongodb.md
@@ -23,15 +23,61 @@ premium: true
 
 {{< premium-features/add-on feature="MongoDB Enterprise" >}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="mongodb-enterprise" status="supported" environment="grid" >}} | {{< image-versions image="mongodb-enterprise" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="mongodb-enterprise" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="mongodb-enterprise" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="mongodb-enterprise" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="mongodb-enterprise" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="mongodb-enterprise" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% deprecated-versions %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="mongodb-enterprise" status="deprecated" environment="grid" >}} | {{< image-versions image="mongodb-enterprise" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="mongodb-enterprise" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="mongodb-enterprise" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="mongodb-enterprise" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="mongodb-enterprise" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="mongodb-enterprise" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ### Legacy edition
 
@@ -49,9 +95,7 @@ If you want to experiment with a later version without committing to it use a no
 
 {{% deprecated-versions %}}
 
-| **Grid** |
-|----------------------------------|
-|  {{< image-versions image="mongodb" status="deprecated" environment="grid" >}} |
+{{< image-versions image="mongodb" status="deprecated" environment="grid" >}}
 
 {{% relationship-ref-intro %}}
 
diff --git a/sites/platform/src/add-services/mysql/_index.md b/sites/platform/src/add-services/mysql/_index.md
index 7b30038f42..006d386c05 100644
--- a/sites/platform/src/add-services/mysql/_index.md
+++ b/sites/platform/src/add-services/mysql/_index.md
@@ -32,6 +32,9 @@ MySQL and MariaDB have the same behavior and the rest of this page applies to bo
 |---------------|-------------|--------------------|
 |  {{< image-versions image="mariadb" status="supported" >}} | {{< image-versions image="mysql" status="supported" >}} | {{< image-versions image="oracle-mysql" status="supported" >}} |
 
+{{% version/specific %}}
+<!-- API Version 1 -->
+
 ### Supported versions on Dedicated environments
 
 `oracle-mysql` is not yet available for {{% names/dedicated-gen-3 %}} environments.
@@ -48,6 +51,11 @@ Dedicated environments only support the InnoDB storage engine.
 Tables created on Dedicated environments using the MyISAM storage engine don't replicate between all hosts in the cluster.
 See how to [convert tables to the InnoDB engine](#storage-engine).
 
+<--->
+<!-- API Version 2 -->
+
+{{% /version/specific %}}
+
 {{% deprecated-versions %}}
 
 | **`mariadb`** | **`mysql`** | **`oracle-mysql`** |
@@ -366,13 +374,20 @@ For further details, see the [MariaDB documentation](https://mariadb.com/kb/en/c
 
 ## Storage Engine
 
+{{% version/specific %}}
 It's best to use the InnoDB storage engine wherever possible.
 MyISAM is only properly supported in non-Dedicated environments.
 In Dedicated environments, there is no replication of MyISAM tables.
 
 If MyISAM tables have been inadvertently created or imported in a Dedicated environment
-(if you see `ENGINE=MyISAM` in the response to `SHOW CREATE TABLE {{< variable "EXISTING_TABLE" >}}`),
+(if you see `ENGINE=MyISAM` in the response to `SHOW CREATE TABLE EXISTING_TABLE`),
 convert them to use the InnoDB storage engine as follows:
+<--->
+It's best to use the InnoDB storage engine wherever possible instead of MyISAM.
+If MyISAM tables have been inadvertently created or imported in your environments
+(if you see `ENGINE=MyISAM` in the response to `SHOW CREATE TABLE EXISTING_TABLE`),
+convert them to use the InnoDB storage engine as follows:
+{{% /version/specific %}}
 
 1. Rename the existing table.
 
@@ -460,8 +475,12 @@ To ensure people who review code changes can't access personally identifiable in
 
 ## Replication
 
+{{% version/specific %}}
 In non-Dedicated environments, there is no on-site primary/replica supports.
 In Dedicated environments, it's provided automatically as part of the default configuration.
+<--->
+There is no on-site primary/replica support in your environments.
+{{% /version/specific %}}
 
 In rare cases (such as for certain backup purposes),
 you can also enable [remote replication](./mysql-replication.md) to your own replica data.
diff --git a/sites/platform/src/add-services/network-storage.md b/sites/platform/src/add-services/network-storage.md
index ad5fc47832..128b784f3b 100644
--- a/sites/platform/src/add-services/network-storage.md
+++ b/sites/platform/src/add-services/network-storage.md
@@ -23,9 +23,32 @@ If your app does this regularly, a local mount is more effective.
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="network-storage" status="supported" environment="grid" >}} | {{< image-versions image="network-storage" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="network-storage" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="network-storage" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="network-storage" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="network-storage" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="network-storage" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 This service is the {{< vendor/name >}} network storage implementation, not to a version of a third-party application.
 
@@ -39,9 +62,32 @@ Any change to the service version results in existing data becoming inaccessible
 
 {{% deprecated-versions %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="network-storage" status="deprecated" environment="grid" >}} | {{< image-versions image="network-storage" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="network-storage" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="network-storage" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="network-storage" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="network-storage" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="network-storage" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ## Usage example
 
diff --git a/sites/platform/src/add-services/opensearch.md b/sites/platform/src/add-services/opensearch.md
index 906f501b3b..774026b156 100644
--- a/sites/platform/src/add-services/opensearch.md
+++ b/sites/platform/src/add-services/opensearch.md
@@ -14,18 +14,45 @@ To switch from Elasticsearch, follow the same procedure as for [upgrading](#upgr
 
 ## Supported versions
 
+{{% version/specific %}}
+<!-- API Version 1 -->
 <!--
 To update the versions in this table, use docs/data/registry.json
 -->
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="opensearch" status="supported" environment="grid" >}} | {{< image-versions image="opensearch" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="opensearch" status="supported" environment="dedicated-gen-2" >}} |
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="opensearch" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="opensearch" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="opensearch" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
 
 On Grid and {{% names/dedicated-gen-3 %}}, from version 2, you only specify the major version.
+The latest compatible minor version and patches are applied automatically. On Grid, version 1 represents a rolling release - the latest minor version available from the upstream.
+
+<--->
+<!-- API Version 2 -->
+
+In the list below, notice that there you only specify the major version.
+Each version represents a rolling release of the latest minor version available from the upstream.
 The latest compatible minor version and patches are applied automatically.
 
-On Grid, version 1 represents a rolling release - the latest minor version available from the upstream.
-Today, that version is `1.3.x`.
+{{< image-versions image="opensearch" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
+
+You can see the latest minor and patch versions of OpenSearch available from the [`2.x`](https://opensearch.org/lines/2x.html) and [`1.x`](https://opensearch.org/lines/1x.html) release lines.
+
 
 ## Deprecated versions
 
@@ -33,9 +60,32 @@ The following versions are still available in your projects,
 but they're at their end of life and are no longer receiving security updates from upstream,
 or are no longer the recommended way to configure the service on {{< vendor/name >}}.
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="opensearch" status="deprecated" environment="grid" >}} | {{< image-versions image="opensearch" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="opensearch" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="opensearch" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="opensearch" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="opensearch" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="opensearch" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 To ensure your project remains stable in the future,
 switch to [a supported version](#supported-versions).
diff --git a/sites/platform/src/add-services/postgresql.md b/sites/platform/src/add-services/postgresql.md
index 030c02d593..af157f70c5 100644
--- a/sites/platform/src/add-services/postgresql.md
+++ b/sites/platform/src/add-services/postgresql.md
@@ -20,12 +20,35 @@ See the [PostgreSQL documentation](https://www.postgresql.org/docs/9.6/index.htm
 
 {{% major-minor-versions-note %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="postgresql" status="supported" environment="grid" >}} | {{< image-versions image="postgresql" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="postgresql" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="postgresql" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="postgresql" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="postgresql" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
 
 \* No High-Availability on {{% names/dedicated-gen-2 %}}.
 
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="postgresql" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
+
 {{< note >}}
 
 You can't upgrade to PostgreSQL 12 with the `postgis` extension enabled.
@@ -35,9 +58,32 @@ For more details, see how to [upgrade to PostgreSQL 12 with `postgis`](#upgrade-
 
 {{% deprecated-versions %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="postgresql" status="deprecated" environment="grid" >}} | {{< image-versions image="postgresql" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="postgresql" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="postgresql" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="postgresql" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="postgresql" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="postgresql" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% relationship-ref-intro %}}
 
diff --git a/sites/platform/src/add-services/rabbitmq.md b/sites/platform/src/add-services/rabbitmq.md
index 8ffa76bd2d..a63c0b98a2 100644
--- a/sites/platform/src/add-services/rabbitmq.md
+++ b/sites/platform/src/add-services/rabbitmq.md
@@ -20,15 +20,61 @@ and your messages a safe place to live until they're received.
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-| {{< image-versions image="rabbitmq" status="supported" environment="grid" >}} | {{< image-versions image="rabbitmq" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="rabbitmq" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="rabbitmq" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="rabbitmq" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="rabbitmq" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="rabbitmq" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% deprecated-versions %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="rabbitmq" status="deprecated" environment="grid" >}} | {{< image-versions image="rabbitmq" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="rabbitmq" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="rabbitmq" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="rabbitmq" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="rabbitmq" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="rabbitmq" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ## Usage example
 
@@ -100,6 +146,8 @@ You can access this UI with an SSH tunnel.
 
 To open a tunnel, follow these steps.
 
+{{% version/specific %}}
+
 1.  
    a) (On [grid environments](../other/glossary.md#grid)) SSH into your app container with a flag for local port forwarding:
 
@@ -115,6 +163,16 @@ To open a tunnel, follow these steps.
     ssh $({{% vendor/cli %}} ssh --pipe) -L 15672:localhost:15672
     ```
 
+<--->
+
+1.  SSH into your app container with a flag for local port forwarding:
+    ```bash
+    ssh $({{% vendor/cli %}} ssh --pipe) -L 15672:{{< variable "RELATIONSHIP_NAME" >}}.internal:15672
+    ```
+    {{< variable "RELATIONSHIP_NAME" >}} is the [name you defined](#2-add-the-relationship).
+
+{{% /version/specific %}}
+
 2.  Open `http://localhost:15672` in your browser.
     Log in using the username and password from the [relationship](#relationship-reference).
 
diff --git a/sites/platform/src/add-services/redis.md b/sites/platform/src/add-services/redis.md
index eae4eeba36..5a91dcf8a7 100644
--- a/sites/platform/src/add-services/redis.md
+++ b/sites/platform/src/add-services/redis.md
@@ -27,15 +27,61 @@ for high-performance data retrieval and key-value storage.
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-| {{< image-versions image="redis" status="supported" environment="grid" >}} | {{< image-versions image="redis" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="redis" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="redis" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="redis" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="redis" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="redis" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% deprecated-versions %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-| {{< image-versions image="redis" status="deprecated" environment="grid" >}} | {{< image-versions image="redis" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="redis" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="redis" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="redis" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="redis" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="redis" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 Note that versions 3.0 and higher support up to 64 different databases per instance of the service,
 while Redis 2.8 only supports a single database.
@@ -249,8 +295,12 @@ To access your Redis service, run the following command:
 redis-cli -h {{< variable "HOSTNAME" >}} -p {{< variable "PORT" >}}
 ```
 
+{{% version/specific %}}
 If you have a Grid project, note that the `CONFIG GET` and `CONFIG SET` admin commands are restricted.
 To get the current configuration, run the following command:
+<--->
+Note that the `CONFIG GET` and `CONFIG SET` admin commands might be restricted on your project.
+{{% /version/specific %}}
 
 ```bash
 redis-cli -h {{< variable "HOSTNAME" >}} -p {{< variable "PORT" >}} info
diff --git a/sites/platform/src/add-services/solr.md b/sites/platform/src/add-services/solr.md
index 37a21993e2..ac30b1fbf9 100644
--- a/sites/platform/src/add-services/solr.md
+++ b/sites/platform/src/add-services/solr.md
@@ -21,15 +21,61 @@ Solr search with generic schemas provided, and a custom schema is also supported
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="solr" status="supported" environment="grid" >}} | {{< image-versions image="solr" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="solr" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="solr" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="solr" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="solr" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="solr" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% deprecated-versions %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="solr" status="deprecated" environment="grid" >}} | {{< image-versions image="solr" status="deprecated" environment="dedicated-gen-3" >}} | {{< image-versions image="solr" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="solr" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="solr" status="deprecated" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="solr" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="solr" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% relationship-ref-intro %}}
 
@@ -275,8 +321,10 @@ You can now open `http://localhost:30000/solr/` in a browser to access the Solr
 Note that you can't create indexes or users this way,
 but you can browse the existing indexes and manipulate the stored data.
 
-For {{% names/dedicated-gen-2 %}} use `ssh -L 8888:localhost:8983 {{< variable "USER" >}}@{{< variable "CLUSTER_NAME" >}}.ent.platform.sh` to open a tunnel instead,
+{{% version/only "1" %}}
+For {{% names/dedicated-gen-2 %}} use `ssh -L 8888:localhost:8983 USER@CLUSTER_NAME.ent.platform.sh` to open a tunnel instead,
 after which the Solr server administrative interface is available at `http://localhost:8888/solr/`.
+{{% /version/only %}}
 
 ## Available plugins
 
diff --git a/sites/platform/src/add-services/varnish.md b/sites/platform/src/add-services/varnish.md
index 8c77340d33..5b80076abf 100644
--- a/sites/platform/src/add-services/varnish.md
+++ b/sites/platform/src/add-services/varnish.md
@@ -12,9 +12,32 @@ But you can include Varnish as a service.
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="varnish" status="supported" environment="grid" >}} | {{< image-versions image="varnish" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="varnish" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="varnish" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="varnish" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="varnish" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="varnish" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ## How it works
 
diff --git a/sites/platform/src/add-services/vault.md b/sites/platform/src/add-services/vault.md
index 7802cc7f5a..b7c8bbad54 100644
--- a/sites/platform/src/add-services/vault.md
+++ b/sites/platform/src/add-services/vault.md
@@ -16,9 +16,32 @@ To store secrets such as API keys, create sensitive [environment variables](../d
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid | {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|------|-------------------------------|------------------------------ |
-|  {{< image-versions image="vault-kms" status="supported" environment="grid" >}} | {{< image-versions image="vault-kms" status="supported" environment="dedicated-gen-3" >}} | {{< image-versions image="vault-kms" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="vault-kms" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="vault-kms" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="vault-kms" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="vault-kms" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ## Add Vault
 
diff --git a/sites/platform/src/create-apps/app-reference.md b/sites/platform/src/create-apps/app-reference.md
index 3f7194b353..8aacac10e5 100644
--- a/sites/platform/src/create-apps/app-reference.md
+++ b/sites/platform/src/create-apps/app-reference.md
@@ -437,8 +437,12 @@ firewall:
 
 ### Support for rules
 
+{{% version/specific %}}
 Where outbound rules for firewalls are supported in all environments.
 For {{% names/dedicated-gen-2 %}} projects, contact support for configuration.
+<--->
+Where outbound rules for firewalls are supported in all environments.
+{{% /version/specific %}}
 
 ### Multiple rules
 
@@ -642,6 +646,8 @@ See how to [get cron logs](../increase-observability/logs/access-logs.md#contain
 
 The following table shows the properties for each job:
 
+{{% version/specific %}}
+
 | Name               | Type                                         | Required | Description |
 | ------------------ | -------------------------------------------- | -------- | ----------- |
 | `spec`             | `string`                                     | Yes      | The [cron specification](https://en.wikipedia.org/wiki/Cron#Cron_expression). To prevent competition for resources that might hurt performance, on **Grid or {{% names/dedicated-gen-3 %}}** projects use `H` in definitions to indicate an unspecified but invariant time. For example, instead of using `0 * * * *` to indicate the cron job runs at the start of every hour, you can use `H * * * *` to indicate it runs every hour, but not necessarily at the start. This prevents multiple cron jobs from trying to start at the same time. **The `H` syntax isn't available on {{% names/dedicated-gen-2 %}} projects.**|
@@ -649,6 +655,17 @@ The following table shows the properties for each job:
 | `shutdown_timeout` | `integer`                                    | No       | When a cron is canceled, this represents the number of seconds after which a `SIGKILL` signal is sent to the process to force terminate it. The default is `10` seconds. |
 | `timeout`          | `integer`                                    | No       | The maximum amount of time a cron can run before it's terminated. Defaults to the maximum allowed value of `86400` seconds (24 hours).
 
+<--->
+
+| Name               | Type                                         | Required | Description |
+| ------------------ | -------------------------------------------- | -------- | ----------- |
+| `spec`             | `string`                                     | Yes      | The [cron specification](https://en.wikipedia.org/wiki/Cron#Cron_expression). To prevent competition for resources that might hurt performance, use `H` in definitions to indicate an unspecified but invariant time. For example, instead of using `0 * * * *` to indicate the cron job runs at the start of every hour, you can use `H * * * *` to indicate it runs every hour, but not necessarily at the start. This prevents multiple cron jobs from trying to start at the same time. |
+| `commands`         | A [cron commands dictionary](#cron-commands) | Yes      | A definition of what commands to run when starting and stopping the cron job. |
+| `shutdown_timeout` | `integer`                                    | No       | When a cron is canceled, this represents the number of seconds after which a `SIGKILL` signal is sent to the process to force terminate it. The default is `10` seconds. |
+| `timeout`          | `integer`                                    | No       | The maximum amount of time a cron can run before it's terminated. Defaults to the maximum allowed value of `86400` seconds (24 hours).
+
+{{% /version/specific %}}
+
 Note that you can [cancel pending or running crons](../environments/cancel-activity.md).
 
 ### Cron commands
@@ -669,8 +686,13 @@ crons:
 ```
 
 In this example configuration, the [cron specification](#crons) uses the `H` syntax.
+
+{{% version/specific %}}
 Note that this syntax is only supported on Grid and {{% names/dedicated-gen-3 %}} projects.
 On {{% names/dedicated-gen-2 %}} projects, use the [standard cron syntax](https://en.wikipedia.org/wiki/Cron#Cron_expression).
+<--->
+
+{{% /version/specific %}}
 
 ### Example cron jobs
 
@@ -782,7 +804,7 @@ If a new job is triggered while another is running, the new job is paused until
 To minimize conflicts, a random offset is applied to all triggers.
 The offset is a random number of seconds up to 20 minutes or the cron frequency, whichever is smaller.
 
-Crons are also paused while activities such as backups are running.
+Crons are also paused while activities such as [backups](/environments/backup) are running.
 The crons are queued to run after the other activity finishes.
 
 To run cron jobs in a timezone other than UTC, set the [timezone property](#top-level-properties).
diff --git a/sites/platform/src/development/submodules.md b/sites/platform/src/development/submodules.md
index 7d981477ab..5e76df57c5 100644
--- a/sites/platform/src/development/submodules.md
+++ b/sites/platform/src/development/submodules.md
@@ -100,7 +100,7 @@ To specify which submodule needs to be updated, replace `[submodule]` with your
 title= Automated update
 +++
 
-{{< note theme="warning" title="Tier availability" >}}
+{{< note theme="warning" title="Tier availability" version="1" >}}
 
 This feature is available for **Elite** and **Enterprise** customers.
 [Compare the {{< vendor/name >}} tiers](https://platform.sh/pricing/) on our pricing page,
diff --git a/sites/platform/src/domains/steps/_index.md b/sites/platform/src/domains/steps/_index.md
index 2b4f607929..9a9aa172e8 100644
--- a/sites/platform/src/domains/steps/_index.md
+++ b/sites/platform/src/domains/steps/_index.md
@@ -6,10 +6,14 @@ layout: single
 ---
 
 Once your project is ready for production, replace the automatically generated domain with your own custom domain.
-
 Note that adding a domain disables the automatically generated URL for your Production environment only.
+
+{{% version/specific %}}
 If you are an Enterprise or Elite customer and have a Grid or {{% names/dedicated-gen-3 %}} project, you can [customize the URLs for your non-production environments](/domains/steps/custom-non-production-domains).
 {{% names/dedicated-gen-2 %}} customers can also customize the domain for their Staging environment.
+<--->
+You can also [customize the URLs for your non-production environments](/domains/steps/custom-non-production-domains).
+{{% /version/specific %}}
 
 ## Before you begin
 
diff --git a/sites/platform/src/domains/steps/custom-non-production-domains.md b/sites/platform/src/domains/steps/custom-non-production-domains.md
index 82c846468f..87602a1c9e 100644
--- a/sites/platform/src/domains/steps/custom-non-production-domains.md
+++ b/sites/platform/src/domains/steps/custom-non-production-domains.md
@@ -7,7 +7,10 @@ banner:
     type: tiered-feature
 ---
 
+{{% version/specific %}}
 {{< partial "progressive-rollout/body.md" >}}
+<--->
+{{% /version/specific %}}
 
 When a custom domain is [set up on your production environment](../steps/_index.md),
 it can't be used for the other, non-production environments in your project.
@@ -52,6 +55,7 @@ based on the following elements:
 
 You need:
 
+{{% version/specific %}}
 - A Grid or {{% names/dedicated-gen-3 %}} project on which you have **admin rights** <BR> 
 
   {{< note theme="warning" >}}
@@ -62,17 +66,12 @@ You need:
 
   {{< /note >}}
 
-  {{< version/specific >}}
-
   If you use a [Managed Fastly](../cdn/managed-fastly.md) CDN,
   it needs to be configured to operate with custom non-production domains.
   For more information, [contact Support](https://console.platform.sh/-/users/~/tickets/open). 
-
-  <--->
-
-  <!-- Version 2, managed Fastly not included for now -->
-  {{< /version/specific >}}
-
+<--->
+- A {{< vendor/name >}} project on which you have **admin rights** 
+{{% /version/specific %}}
 - A production environment with at least one custom domain already set up
 - At least one non-production (staging or development) environment
 - Optional: The [{{< vendor/name >}} CLI](../../administration/cli/_index.md) (v4.8.0+)
diff --git a/sites/platform/src/increase-observability/integrate-observability/blackfire.md b/sites/platform/src/increase-observability/integrate-observability/blackfire.md
index c0e2c74a30..f657538ff9 100644
--- a/sites/platform/src/increase-observability/integrate-observability/blackfire.md
+++ b/sites/platform/src/increase-observability/integrate-observability/blackfire.md
@@ -20,6 +20,7 @@ you can achieve the following goals:
 Blackfire is installed natively on {{< vendor/name >}} and [works integrally with the {{< vendor/name >}} workflow](https://www.youtube.com/watch?v=Bq-LFjgD6L0).
 This results in an effortless setup process and smooth user experience.
 
+{{% version/specific %}}
 {{< note >}}
 
 Blackfire.io can be bundled with Enterprise and Elite subscriptions as part of the Observability Suite.
@@ -52,21 +53,12 @@ To do so, follow these steps:
 5. Retrieve your Blackfire server ID and server token.
 6. Follow [the instructions from the Blackfire documentation](https://blackfire.io/docs/integrations/paas/platformsh).
 
-{{< version/specific >}}
-<!-- Version 1, where managed Fastly is available -->
 If you're using the [Managed Fastly CDN](../../domains/cdn/managed-fastly.md),
 it's already configured to operate with Blackfire. 
 If you're using a different [Content Delivery Network (CDN)](../../domains/cdn/_index.md), 
 make sure you [configure it](https://blackfire.io/docs/integrations/proxies/index)
 to let Blackfire profile the code running on your servers.
 
-<--->
-<!-- Version 2, where managed Fastly isn't available -->
-If you're using a [Content Delivery Network (CDN)](../../domains/cdn/_index.md), 
-make sure you [configure it](https://blackfire.io/docs/integrations/proxies/index)
-to let Blackfire profile the code running on your servers.
-{{< /version/specific >}}
-
 ### On {{% names/dedicated-gen-2 %}} infrastructure
 
 To install Blackfire on your {{% names/dedicated-gen-2 %}} environments:
@@ -81,8 +73,6 @@ To install Blackfire on your {{% names/dedicated-gen-2 %}} environments:
 5. Retrieve your Blackfire server ID and server token.
 6. Send those credentials to [Support](https://console.platform.sh/-/users/~/tickets/open) so they complete the installation.
 
-{{< version/specific >}}
-<!-- Version 1, where managed Fastly is available -->
 If you're using the [Managed Fastly CDN](../../domains/cdn/managed-fastly.md),
 it's already configured to operate with Blackfire. 
 If you're using a different [Content Delivery Network (CDN)](../../domains/cdn/_index.md), 
@@ -90,35 +80,62 @@ make sure you [configure it](https://blackfire.io/docs/integrations/proxies/inde
 to let Blackfire profile the code running on your servers.
 
 <--->
-<!-- Version 2, where managed Fastly isn't available -->
+## Get started with Blackfire
+You can only access your Blackfire environments after you've been granted access to the related {{< vendor/name >}} project.
+Therefore, to access your Blackfire environments, make sure you log in using your {{< vendor/name >}} account.
+
+To access a Blackfire environment, each project user needs a Blackfire account.
+When a project user doesn't already have a Blackfire account, 
+a new one is automatically created using the user's {{< vendor/name >}} credentials.
+
+{{< note >}}
 If you're using a [Content Delivery Network (CDN)](../../domains/cdn/_index.md), 
 make sure you [configure it](https://blackfire.io/docs/integrations/proxies/index)
 to let Blackfire profile the code running on your servers.
-
-{{< /version/specific >}}
+{{< /note >}}
+{{% /version/specific %}}
 
 ### Automated integration
 
+{{% version/specific %}}
 {{< partial "observability-suite/body.md" >}}
 
 The Blackfire automated integration is available for Grid and {{% names/dedicated-gen-3 %}} environments.
 
+<--->
+The Blackfire automated integration is enabled on your environments by default.
+
+{{% /version/specific %}}
+
 When you create a new environment,
 it automatically triggers the creation of a Blackfire environment with the same settings.
 On this Blackfire environment, you have access to [all the features provided by Blackfire](https://www.blackfire.io/features/).
 This includes monitoring, profiling, alerting, and build-related features.
 
+{{% version/specific %}}
 When a Blackfire environment is created based on a Grid environment,
 user access settings are replicated from the {{< vendor/name >}} Console to Blackfire.
+
+<--->
+Note that Blackfire monitoring is enabled by default on your production environment.
+On other environment types, you need to [enable it](#blackfire-monitoring).
+User access settings are replicated from the {{< vendor/name >}} Console to Blackfire.
+
+{{% /version/specific %}}
+
 This includes all [access levels](https://blackfire.io/docs/up-and-running/access-management).
- 
+
+{{% version/specific %}} 
 To access the Blackfire environment, each project user needs a Blackfire account.
 When a project user doesn't already have a Blackfire account, 
 a new one is automatically created using the user's {{< vendor/name >}} credentials.
+<--->
+{{% /version/specific %}}
  
 You might have Blackfire variables already set on your project.
 In this case, the existing variables override the settings of the automated integration.
 
+{{% version/specific %}}
 Note that to trigger the synchronization of changes to users and their access levels,
 you need to redeploy the environment.
 
@@ -130,6 +147,12 @@ to start monitoring your environment follow these steps:
 1. For Python apps, you need to [activate Blackfire Monitoring](#1-activate-blackfire-monitoring) first.
 2. For both Python and PHP apps, you need to [enable Blackfire Monitoring on the required environments](#2-enable-blackfire-monitoring-on-your-environments).
 
+<--->
+
+{{% /version/specific %}}
+
+
+{{% version/specific %}}
 ### 1. Activate Blackfire Monitoring
 
 If you want to monitor a PHP app, Blackfire Monitoring is available by default on your environments.
@@ -144,12 +167,28 @@ To do so, create the following [environment variable](../../development/variable
 
 If you later need to deactivate Blackfire Monitoring, change the value of the variable to `0`.
 
+<--->
+
+{{< note >}}
+To trigger the synchronization of changes to users and their access levels,
+you need to redeploy the environment.
+{{< /note >}}
+
+{{% /version/specific %}}
+
+{{% version/specific %}}
 ### 2. Enable Blackfire Monitoring on your environments
 
 To enable Blackfire Monitoring on your environments, follow these steps:
 
+<--->
+### Blackfire monitoring
+Blackfire monitoring is enabled by default on your production environment. 
+To enable Blackfire monitoring on your development or staging environments, follow these steps:
+{{% /version/specific %}}
+
 1.  Go to your [organizations list](https://blackfire.io/my/organizations) 
-    and select the organization where you want to enable Blackfire Monitoring.
+    and select the organization where you want to enable Blackfire monitoring.
 
 2.  Click **Organization Monitoring Usage**.
 
@@ -160,7 +199,7 @@ To enable Blackfire Monitoring on your environments, follow these steps:
 
     ![A screenshot of what's seen in Monitoring Activation](/images/integrations/blackfire/blackfire-monitoring-activation.png "0.40")
 
-For more information on Blackfire Monitoring features,
+For more information on Blackfire monitoring features,
 see the [Blackfire documentation](https://blackfire.io/docs/monitoring-cookbooks/index).
 
 ## Blackfire Profiling
diff --git a/sites/platform/src/increase-observability/integrate-observability/new-relic/_index.md b/sites/platform/src/increase-observability/integrate-observability/new-relic/_index.md
index dddb9e643e..ae853e2308 100644
--- a/sites/platform/src/increase-observability/integrate-observability/new-relic/_index.md
+++ b/sites/platform/src/increase-observability/integrate-observability/new-relic/_index.md
@@ -1,6 +1,7 @@
 ---
 title: "New Relic"
 weight: 2
+toc: false
 sectionBefore: Third-party observability tools
 description: |
   {{< vendor/name >}} supports [New Relic application performance monitoring](https://newrelic.com/products/application-monitoring).
@@ -9,6 +10,7 @@ layout: single
 
 {{% description %}}
 
+{{% version/specific %}}
 ## On a {{% names/dedicated-gen-2 %}} cluster
 
 Open a support ticket and let us know what your license key is.
@@ -17,6 +19,9 @@ Our support team will install it and let you know when it's complete.
 ## On a Grid plan or {{% names/dedicated-gen-3 %}} infrastructure
 
 On Grid plans and {{% names/dedicated-gen-3 %}} infrastructure, configure your project.
+<--->
+{{% /version/specific %}}
+
 The configuration for New Relic varies a bit by language.
 See language-specific instructions:
 
diff --git a/sites/platform/src/increase-observability/logs/access-logs.md b/sites/platform/src/increase-observability/logs/access-logs.md
index c8d65b2874..ff8c8e7721 100644
--- a/sites/platform/src/increase-observability/logs/access-logs.md
+++ b/sites/platform/src/increase-observability/logs/access-logs.md
@@ -106,12 +106,14 @@ title=Using SSH directly
    ```
 
 2. Change to the right directory by running `cd /var/log`.
-
+   {{< version/specific >}}
    If you're on a {{% names/dedicated-gen-2 %}} cluster, run
 
    ``` bash
    cd /var/log/{{% vendor/cli %}}/{{% variable "APP_NAME" %}}/
    ```
+   <--->
+   {{< /version/specific >}}
 
 3. Read the desired log, such as by running `tail access.log`.
 
diff --git a/sites/platform/src/languages/dotnet.md b/sites/platform/src/languages/dotnet.md
index a04c95daa8..84aafd1530 100644
--- a/sites/platform/src/languages/dotnet.md
+++ b/sites/platform/src/languages/dotnet.md
@@ -10,9 +10,30 @@ description: |
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="dotnet" status="supported" environment="grid" >}} | {{< image-versions image="dotnet" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="dotnet" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="dotnet" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="dotnet" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% language-specification type="dotnet" display_name=".Net Core" %}}
 
diff --git a/sites/platform/src/languages/elixir.md b/sites/platform/src/languages/elixir.md
index e6ffa42f03..b96809106b 100644
--- a/sites/platform/src/languages/elixir.md
+++ b/sites/platform/src/languages/elixir.md
@@ -9,9 +9,30 @@ description: "{{< vendor/name >}} supports building and deploying applications w
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="elixir" status="supported" environment="grid" >}} | {{< image-versions image="elixir" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="elixir" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="elixir" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="elixir" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% language-specification type="elixir" display_name="Elixir" %}}
 
diff --git a/sites/platform/src/languages/go.md b/sites/platform/src/languages/go.md
index a3d2f02bd2..93b0ad9213 100644
--- a/sites/platform/src/languages/go.md
+++ b/sites/platform/src/languages/go.md
@@ -9,9 +9,32 @@ description: "{{< vendor/name >}} supports building and deploying applications w
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="golang" status="supported" environment="grid" >}} | {{< image-versions image="golang" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="golang" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="golang" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="golang" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="golang" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% language-specification type="golang" display_name="Go" %}}
 
diff --git a/sites/platform/src/languages/java/_index.md b/sites/platform/src/languages/java/_index.md
index a92a61c03d..df676c1ffb 100644
--- a/sites/platform/src/languages/java/_index.md
+++ b/sites/platform/src/languages/java/_index.md
@@ -12,9 +12,30 @@ layout: single
 
 ### OpenJDK versions:
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="java" status="supported" environment="grid" >}} | {{< image-versions image="java" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="java" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="java" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="java" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 These versions refer to the headless packages of OpenJDK.
 To save space and reduce potential vulnerabilities, they don't contain GUI classes, which can't be used on the server.
@@ -53,7 +74,7 @@ hooks:
 
 ## Other JVM languages
 
-It’s worth remembering that the JVM by its specification [doesn't read Java code](https://docs.oracle.com/javase/specs/jvms/se8/html/index.html), but bytecode. So within the JVM, it’s possible to [run several languages](https://en.wikipedia.org/wiki/List_of_JVM_languages). {{< vendor/name >}}supports several of them, such as Kotlin, Groovy, and Scala, so long as that language works with any build automation that {{< vendor/name >}} supports.
+It’s worth remembering that the JVM by its specification [doesn't read Java code](https://docs.oracle.com/javase/specs/jvms/se8/html/index.html), but bytecode. So within the JVM, it’s possible to [run several languages](https://en.wikipedia.org/wiki/List_of_JVM_languages). {{< vendor/name >}} supports several of them, such as Kotlin, Groovy, and Scala, so long as that language works with any build automation that {{< vendor/name >}} supports.
 
 | Article                                                      | Link                                                         |
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
diff --git a/sites/platform/src/languages/lisp.md b/sites/platform/src/languages/lisp.md
index e991def9c9..a655c80c39 100644
--- a/sites/platform/src/languages/lisp.md
+++ b/sites/platform/src/languages/lisp.md
@@ -9,9 +9,30 @@ description: "{{< vendor/name >}} supports building and deploying applications w
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="lisp" status="supported" environment="grid" >}} | {{< image-versions image="lisp" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="lisp" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="lisp" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="ruby" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% language-specification type="lisp" display_name="Lisp" %}}
 
diff --git a/sites/platform/src/languages/nodejs/_index.md b/sites/platform/src/languages/nodejs/_index.md
index 01d6b44d20..154189a4c2 100644
--- a/sites/platform/src/languages/nodejs/_index.md
+++ b/sites/platform/src/languages/nodejs/_index.md
@@ -12,9 +12,30 @@ You can also develop a microservice architecture mixing JavaScript and other app
 
 {{% major-minor-versions-note %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="nodejs" status="supported" environment="grid" >}} | {{< image-versions image="nodejs" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="nodejs" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="nodejs" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="nodejs" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% language-specification type="nodejs" display_name="Node.js" %}}
 
@@ -22,9 +43,30 @@ To use a specific version in a container with a different language, [use a versi
 
 {{% deprecated-versions %}}
 
-| Grid | {{% names/dedicated-gen-2 %}} |
-| ---- | ----------------------------- |
-| {{< image-versions image="nodejs" status="deprecated" environment="grid" >}} | {{< image-versions image="nodejs" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="nodejs" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="nodejs" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="nodejs" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ## Usage example
 
diff --git a/sites/platform/src/languages/php/_index.md b/sites/platform/src/languages/php/_index.md
index 7e65d834ea..cb4a1ecb4c 100644
--- a/sites/platform/src/languages/php/_index.md
+++ b/sites/platform/src/languages/php/_index.md
@@ -8,9 +8,30 @@ layout: single
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="php" status="supported" environment="grid" >}} | {{< image-versions image="php" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="php" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="php" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="php" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 Note that from PHP versions 7.1 to 8.1, the images support the Zend Thread Safe (ZTS) version of PHP.
 
@@ -18,9 +39,30 @@ Note that from PHP versions 7.1 to 8.1, the images support the Zend Thread Safe
 
 {{% deprecated-versions %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="php" status="deprecated" environment="grid" >}} | {{< image-versions image="php" status="deprecated" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="php" status="deprecated" environment="grid" >}}</td>
+            <td>{{< image-versions image="php" status="deprecated" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="php" status="deprecated" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ## Usage example
 
diff --git a/sites/platform/src/languages/php/xdebug.md b/sites/platform/src/languages/php/xdebug.md
index 0e960dfe07..3ee6bc4aa1 100644
--- a/sites/platform/src/languages/php/xdebug.md
+++ b/sites/platform/src/languages/php/xdebug.md
@@ -79,7 +79,7 @@ To use an alternate port, use the `--port` flag.
 
 To close the tunnel and terminate the debug connection, press <kbd>Ctrl</kbd> + <kbd>C</kbd>.
 
-{{< note title="On {{% names/dedicated-gen-3 %}}" >}}
+{{< note title="On {{% names/dedicated-gen-3 %}}" version="1" >}}
 
 Note that because you have several virtual machines running but your tunnel is connected to only one of them,
 your requests don't always reach the same host.
diff --git a/sites/platform/src/languages/python/_index.md b/sites/platform/src/languages/python/_index.md
index 84a5e9787c..b20ec488af 100644
--- a/sites/platform/src/languages/python/_index.md
+++ b/sites/platform/src/languages/python/_index.md
@@ -10,9 +10,30 @@ You can deploy Python apps on {{< vendor/name >}} using a server or a project su
 
 {{% major-minor-versions-note configMinor="true" %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="python" status="supported" environment="grid" >}} | {{< image-versions image="python" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid and {{% names/dedicated-gen-3 %}}</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="python" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="python" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="python" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 {{% language-specification type="python" display_name="Python" %}}
 
diff --git a/sites/platform/src/languages/ruby.md b/sites/platform/src/languages/ruby.md
index d936572b87..bf0d51e2cb 100644
--- a/sites/platform/src/languages/ruby.md
+++ b/sites/platform/src/languages/ruby.md
@@ -12,9 +12,33 @@ description: |
 
 ### Ruby MRI
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="ruby" status="supported" environment="grid" >}} | {{< image-versions image="ruby" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="ruby" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="ruby" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="ruby" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="ruby" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
+
 
 {{% language-specification type="ruby" display_name="Ruby" %}}
 
diff --git a/sites/platform/src/languages/rust.md b/sites/platform/src/languages/rust.md
index 290e236232..7e0183444f 100644
--- a/sites/platform/src/languages/rust.md
+++ b/sites/platform/src/languages/rust.md
@@ -13,9 +13,32 @@ banner:
 
 {{% major-minor-versions-note %}}
 
-| Grid and {{% names/dedicated-gen-3 %}} | {{% names/dedicated-gen-2 %}} |
-|----------------------------------------|------------------------------ |
-| {{< image-versions image="rust" status="supported" environment="grid" >}} | {{< image-versions image="rust" status="supported" environment="dedicated-gen-2" >}} |
+{{% version/specific %}}
+<!-- API Version 1 -->
+
+<table>
+    <thead>
+        <tr>
+            <th>Grid</th>
+            <th>Dedicated Gen 3</th>
+            <th>Dedicated Gen 2</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{{< image-versions image="rust" status="supported" environment="grid" >}}</td>
+            <td>{{< image-versions image="rust" status="supported" environment="dedicated-gen-3" >}}</td>
+            <td>{{< image-versions image="rust" status="supported" environment="dedicated-gen-2" >}}</thd>
+        </tr>
+    </tbody>
+</table>
+
+<--->
+<!-- API Version 2 -->
+
+{{< image-versions image="rust" status="supported" environment="grid" >}}
+
+{{% /version/specific %}}
 
 ## Dependencies
 
diff --git a/sites/platform/src/learn/bestpractices/http-caching.md b/sites/platform/src/learn/bestpractices/http-caching.md
index 8adfcd58ba..f9c2c7d69d 100644
--- a/sites/platform/src/learn/bestpractices/http-caching.md
+++ b/sites/platform/src/learn/bestpractices/http-caching.md
@@ -21,8 +21,12 @@ It's enough for most uses.
 
 ## A Content Delivery Network (CDN)
 
+{{% version/specific %}}
 {{< vendor/name >}} is compatible with most commercial CDNs.
 If you have a Dedicated instance, it comes with the [Fastly CDN](/domains/cdn/fastly.md).
+<--->
+{{< vendor/name >}} is compatible with most commercial CDNs.
+{{% /version/specific %}}
 
 CDNs generally offer the best performance as they're the only option that includes multiple geographic locations.
 But they do tend to be the most expensive option.
diff --git a/sites/platform/src/other/glossary.md b/sites/platform/src/other/glossary.md
index 09663ae629..87d926f3fb 100644
--- a/sites/platform/src/other/glossary.md
+++ b/sites/platform/src/other/glossary.md
@@ -121,12 +121,17 @@ complete with code, data, and running services.
 Your production environment comes from the [default branch](../environments/_index.md#default-environment)
 and you can set up any other branch as a testing environment.
 
+{{% version/specific %}}
 ## Grid
 
 Grid environments are standard for Professional plans.
 They run on shared infrastructure.
 This architecture makes them different from [{{% names/dedicated-gen-2 %}} environments](#dedicated-gen-2).
 
+<--->
+
+{{% /version/specific %}}
+
 ## Inactive environment
 
 An environment that isn't deployed.
diff --git a/themes/psh-docs/layouts/partials/page-content.html b/themes/psh-docs/layouts/partials/page-content.html
index 26478767dd..5577a7204b 100644
--- a/themes/psh-docs/layouts/partials/page-content.html
+++ b/themes/psh-docs/layouts/partials/page-content.html
@@ -1,8 +1,14 @@
 <!-- Page banners -->
+{{ if and ( eq (string .context.Site.Params.vendor.config.version) "1" ) ( eq (string .context.Page.Params.banner.type) "tiered-feature" )}}
 {{ partial "banners/banner.html" .context }}
+{{ else if ( ne (string .context.Page.Params.banner.type) "tiered-feature" )}}
+{{ partial "banners/banner.html" .context }}
+{{ end }}
 
 <!-- Tier-gated features -->
+{{ if eq (string .Site.Params.vendor.config.version) "1"}}
 {{ partial "tiered-features/banner.html" .context }}
+{{ end }}
 
 <!-- If the feature is part of the Observability Suite -->
 {{ partial "observability-suite/banner.html" .context }}
diff --git a/themes/psh-docs/layouts/shortcodes/image-versions.html b/themes/psh-docs/layouts/shortcodes/image-versions.html
index e7d91c60be..e8fd5f4aa5 100644
--- a/themes/psh-docs/layouts/shortcodes/image-versions.html
+++ b/themes/psh-docs/layouts/shortcodes/image-versions.html
@@ -18,19 +18,19 @@
 {{ if (index .Site.Data.registry $image $environment) }}
   {{ if isset (index .Site.Data.registry $image $environment) $status }}
     {{ if gt ( len ( index .Site.Data.registry $image $environment $status ) ) 0 }}
-      <ul>
-      {{ range index .Site.Data.registry $image $environment $status }}
-        <li>{{ . }}</li>
-      {{ end }}
-      </ul>
+<ul>
+{{ range index .Site.Data.registry $image $environment $status }}
+  <li>{{ . }}</li>
+{{ end }}
+</ul>
     {{ else if ne $status "deprecated" }}
-      {{ $notYet }}
+{{ $notYet }}
     {{ end }}
   {{ end }}
 {{ else }}
   {{ if and (eq $envParam "dedicated") (eq $status "supported") }}
-    {{ $notYet }}
+{{ $notYet }}
   {{ else }}
-    None available
+None available
   {{ end }}
 {{ end }}
diff --git a/themes/psh-docs/layouts/shortcodes/premium-features/tiered.html b/themes/psh-docs/layouts/shortcodes/premium-features/tiered.html
index cf03c7ae94..b7ed78d8cc 100644
--- a/themes/psh-docs/layouts/shortcodes/premium-features/tiered.html
+++ b/themes/psh-docs/layouts/shortcodes/premium-features/tiered.html
@@ -1,2 +1,4 @@
 <!-- Shortcode wrapper to place tiered feature banner anywhere on page with shortcode params -->
+{{ if eq (string .Site.Params.vendor.config.version) "1" }}
 {{ partial "tiered-features/body.html" (dict "tiers" .Params ) }}
+{{ end}}