diff --git a/docs/manuals/cli/overview.md b/docs/manuals/cli/overview.md
index 5e45c4e0..2ddc434c 100644
--- a/docs/manuals/cli/overview.md
+++ b/docs/manuals/cli/overview.md
@@ -6,7 +6,6 @@ description: Install Crossplane, interact with the Upbound Marketplace and Manag
   Control Planes with the Upbound Up CLI.
 ---
 
-import Version from "@site/src/components/Version.js"
 import { versions } from "@site/src/components/Version.js"
 import CodeBlock from '@theme/CodeBlock';
 
@@ -33,7 +32,7 @@ curl -sL "https://cli.upbound.io" | sh
 
 :::note
 Install a specific version of `up` by providing the version.
-For example, to install version <Version type="cli" /> use the following command:
+For example, to install version {versions.cli} use the following command:
 
 <CodeBlock language="bash">
 {`curl -sL "https://cli.upbound.io" | VERSION=v${versions.cli} sh`}
diff --git a/self-hosted-spaces-docs/howtos/certs.md b/self-hosted-spaces-docs/howtos/certs.md
index e517c250..aedfdf56 100644
--- a/self-hosted-spaces-docs/howtos/certs.md
+++ b/self-hosted-spaces-docs/howtos/certs.md
@@ -4,6 +4,9 @@ sidebar_position: 20
 description: Install self hosted spaces using istio ingress gateway in a Kind cluster
 ---
 
+import CodeBlock from '@theme/CodeBlock';
+import { versions } from '@site/src/components/Version.js';
+
 :::important
 Prerequisites
 
@@ -209,14 +212,14 @@ EOF
 
 2. Set the required environment variables
 
-```shell
-# Update these according to your account/token file
+<CodeBlock language="shell">
+{`# Update these according to your account/token file
 export SPACES_TOKEN_PATH=<token file path>
 export UPBOUND_ACCOUNT=<account>
 # Replace SPACES_ROUTER_HOST with your Spaces ingress hostname
 export SPACES_ROUTER_HOST="proxy.upbound-127.0.0.1.nip.io"
-export SPACES_VERSION="1.14.1"
-```
+export SPACES_VERSION="${versions.spaces}"`}
+</CodeBlock>
 
 3. Create an image pull secret for Spaces
 
diff --git a/self-hosted-spaces-docs/howtos/ingress-nginx-migration.md b/self-hosted-spaces-docs/howtos/ingress-nginx-migration.md
index be707aee..9925f4b8 100644
--- a/self-hosted-spaces-docs/howtos/ingress-nginx-migration.md
+++ b/self-hosted-spaces-docs/howtos/ingress-nginx-migration.md
@@ -6,6 +6,8 @@ tier: "business"
 ---
 
 import GlobalLanguageSelector, { CodeBlock } from '@site/src/components/GlobalLanguageSelector';
+import ThemeCodeBlock from '@theme/CodeBlock';
+import { versions } from '@site/src/components/Version.js';
 
 <GlobalLanguageSelector />
 
@@ -24,10 +26,10 @@ Options vary by Spaces version. Select your Spaces version:
 
 Set environment variables used throughout this guide:
 
-```bash
-export SPACES_VERSION=<version>  # Example: 1.16.0
-export SPACES_ROUTER_HOST=<hostname>  # Example: proxy.example.com
-```
+<ThemeCodeBlock language="bash">
+{`export SPACES_VERSION=<version>  # Example: ${versions.spaces}
+export SPACES_ROUTER_HOST=<hostname>  # Example: proxy.example.com`}
+</ThemeCodeBlock>
 
 Export your current Helm values to a file (or use an existing version-controlled
 file):
diff --git a/self-hosted-spaces-docs/howtos/mirror-images.md b/self-hosted-spaces-docs/howtos/mirror-images.md
index ed9fcdf9..ead9e315 100644
--- a/self-hosted-spaces-docs/howtos/mirror-images.md
+++ b/self-hosted-spaces-docs/howtos/mirror-images.md
@@ -4,6 +4,9 @@ description: Mirror OCI artifacts for a Spaces version to local storage or a
   private registry.
 ---
 
+import CodeBlock from '@theme/CodeBlock';
+import { versions } from '@site/src/components/Version.js';
+
 `up space mirror` copies all OCI artifacts for a given Spaces version to a local
 directory (as `.tar.gz` files) or a container registry.
 
@@ -33,9 +36,9 @@ up space mirror -v <version> --output-dir=<path> --token-file=<path-to-token.jso
 
 Example:
 
-```bash
-up space mirror -v 1.17.0 --output-dir=/tmp/spaces-artifacts --token-file=upbound-token.json
-```
+<CodeBlock language="bash">
+{`up space mirror -v ${versions.spaces} --output-dir=/tmp/spaces-artifacts --token-file=upbound-token.json`}
+</CodeBlock>
 
 ## Specify your internal registry
 
@@ -71,9 +74,9 @@ up space mirror -v <version> --destination-registry=<registry> --token-file=<pat
 
 Example:
 
-```bash
-up space mirror -v 1.17.0 --destination-registry=myregistry.io --token-file=upbound-token.json
-```
+<CodeBlock language="bash">
+{`up space mirror -v ${versions.spaces} --destination-registry=myregistry.io --token-file=upbound-token.json`}
+</CodeBlock>
 
 :::tip
 Use `--dry-run` to list artifacts the command would mirror without copying them. This verifies you have proper access to the Upbound registry.
diff --git a/self-hosted-spaces-docs/howtos/self-hosted-spaces-deployment.md b/self-hosted-spaces-docs/howtos/self-hosted-spaces-deployment.md
index a783bba1..d3241efc 100644
--- a/self-hosted-spaces-docs/howtos/self-hosted-spaces-deployment.md
+++ b/self-hosted-spaces-docs/howtos/self-hosted-spaces-deployment.md
@@ -5,6 +5,8 @@ description: A quickstart guide for Upbound Spaces
 tier: "business"
 ---
 import GlobalLanguageSelector, { CodeBlock } from '@site/src/components/GlobalLanguageSelector';
+import ThemeCodeBlock from '@theme/CodeBlock';
+import { versions } from '@site/src/components/Version.js';
 
 <GlobalLanguageSelector />
 
@@ -213,9 +215,9 @@ export SPACES_TOKEN_PATH="/path/to/token.json"
 Set the version of Spaces software you want to install.
 
 
-```ini
-export SPACES_VERSION="1.16.0"
-```
+<ThemeCodeBlock language="ini">
+{`export SPACES_VERSION="${versions.spaces}"`}
+</ThemeCodeBlock>
 
 Set the router host and cluster type. The `SPACES_ROUTER_HOST` is the domain name that's used to access the control plane instances. It's used by the load balancer or ingress to route requests.
 
diff --git a/self-hosted-spaces_versioned_sidebars/version-1.16-sidebars.json b/self-hosted-spaces_versioned_sidebars/version-1.16-sidebars.json
index 527c32a2..5f432859 100644
--- a/self-hosted-spaces_versioned_sidebars/version-1.16-sidebars.json
+++ b/self-hosted-spaces_versioned_sidebars/version-1.16-sidebars.json
@@ -25,6 +25,7 @@
         "howtos/self-hosted-spaces-deployment",
         "howtos/certs",
         "howtos/attach-detach",
+        "howtos/ingress-nginx-migration",
         "howtos/query-api",
         "howtos/mirror-images"
       ]
diff --git a/src/components/Version.js b/src/components/Version.js
index e448a768..4fdaaa6b 100644
--- a/src/components/Version.js
+++ b/src/components/Version.js
@@ -1,14 +1,10 @@
 export const versions = {
-  cli: '0.46.0',
+  cli: '0.48.2',
   spaces: '1.17.0',
-  aws: '1.23.0',
-  azure: '1.13.0',
-  gcp: '1.14.0',
-  helm: '0.21.1',
-  kubernetes: '0.18.0',
-  mcpconnector: 'v0.10.0'
+  aws: '2.6.1',
+  azure: '2.6.0',
+  gcp: '2.6.0',
+  helm: '1.3.0',
+  kubernetes: '1.2.6',
+  mcpconnector: '0.10.0'
 };
-
-export default function Version({type = 'cli'}) {
-  return <span>{versions[type]}</span>;
-}
diff --git a/src/sidebars/self-hosted-spaces.js b/src/sidebars/self-hosted-spaces.js
index 4cfb32f7..a3eda33f 100644
--- a/src/sidebars/self-hosted-spaces.js
+++ b/src/sidebars/self-hosted-spaces.js
@@ -25,6 +25,7 @@ module.exports = {
         'howtos/self-hosted-spaces-deployment',
         'howtos/certs',
         'howtos/attach-detach',
+        'howtos/ingress-nginx-migration',
         'howtos/query-api',
         'howtos/mirror-images',
       ],