diff --git a/doc/administration/geo/disaster_recovery/index.md b/doc/administration/geo/disaster_recovery/index.md
index 0c160e85570570009328aed44d58a8f01377986c..d6f6211ed4c2cb363627a0c5d73f219ddcc1b9f7 100644
--- a/doc/administration/geo/disaster_recovery/index.md
+++ b/doc/administration/geo/disaster_recovery/index.md
@@ -670,7 +670,9 @@ If the secondary site [has been paused](../../geo/index.md#pausing-and-resuming-
 a point-in-time recovery to the last known state.
 Data that was created on the primary while the secondary was paused is lost.
 
-If you are running GitLab 14.5 and later:
+::Tabs
+
+:::TabTitle For GitLab 14.5 and later
 
 1. For each node (such as PostgreSQL or Gitaly) outside of the **secondary** Kubernetes cluster using the Linux
    package, SSH into the node and run one of the following commands:
@@ -706,7 +708,7 @@ If you are running GitLab 14.5 and later:
    | ---- | ------------- | ------- |
    | `ENABLE_SILENT_MODE` | `false`  | If `true`, enables [Silent Mode](../../silent_mode/index.md) before promotion (GitLab 16.4 and later) |
 
-If you are running GitLab 14.4 and earlier:
+:::TabTitle For GitLab 14.4 and earlier
 
 1. SSH in to the database node in the **secondary** site and trigger PostgreSQL to
    promote to read-write:
@@ -744,6 +746,8 @@ If you are running GitLab 14.4 and earlier:
    kubectl --namespace gitlab exec -ti gitlab-geo-task-runner-XXX -- gitlab-rake geo:set_secondary_as_primary
    ```
 
+::EndTabs
+
 ### Step 3. Promote the **secondary** cluster
 
 1. Update the existing cluster configuration.
diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index 83102a6eddaf957966d7714e71e27cbd39c31219..4c547858b2530cf5c48596265bf67230a79ab760 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -2213,7 +2213,7 @@ cluster alongside your instance, read how to
 ## Cloud Native Hybrid reference architecture with Helm Charts (alternative)
 
 Run select components of cloud-native GitLab in Kubernetes with the [GitLab Helm chart](https://docs.gitlab.com/charts/). In this setup, you can run the equivalent of GitLab Rails in the Kubernetes cluster called Webservice. You also can run the equivalent of Sidekiq nodes in the Kubernetes cluster called Sidekiq. In addition,
-the following other supporting services are supported: NGINX, Task Runner, Migrations,
+the following other supporting services are supported: NGINX, Toolbox, Migrations,
 Prometheus, and Grafana.
 
 Hybrid installations leverage the benefits of both cloud native and traditional
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index c47f52992d96f5ebd5def22106e59bf7d71a942e..5ac7ed330b9ba4e5462b5d7d55334d94965269de 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -2232,7 +2232,7 @@ cluster alongside your instance, read how to
 ## Cloud Native Hybrid reference architecture with Helm Charts (alternative)
 
 Run select components of cloud-native GitLab in Kubernetes with the [GitLab Helm chart](https://docs.gitlab.com/charts/). In this setup, you can run the equivalent of GitLab Rails in the Kubernetes cluster called Webservice. You can also run the equivalent of Sidekiq nodes in the Kubernetes cluster called Sidekiq. In addition,
-the following other supporting services are supported: NGINX, Task Runner, Migrations,
+the following other supporting services are supported: NGINX, Toolbox, Migrations,
 Prometheus, and Grafana.
 
 Hybrid installations leverage the benefits of both cloud native and traditional
diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md
index c0c73c3a8acb90c84078ae571b08652954e57dc9..b3c57ffefa480e0542bc735b26f2c617374b5c2e 100644
--- a/doc/administration/reference_architectures/2k_users.md
+++ b/doc/administration/reference_architectures/2k_users.md
@@ -923,7 +923,7 @@ cluster alongside your instance, read how to
 ## Cloud Native Hybrid reference architecture with Helm Charts (alternative)
 
 Run select components of cloud-native GitLab in Kubernetes with the [GitLab Helm chart](https://docs.gitlab.com/charts/). In this setup, you can run the equivalent of GitLab Rails in the Kubernetes cluster called Webservice. You also can run the equivalent of Sidekiq nodes in the Kubernetes cluster called Sidekiq. In addition,
-the following other supporting services are supported: NGINX, Task Runner, Migrations,
+the following other supporting services are supported: NGINX, Toolbox, Migrations,
 Prometheus.
 
 Hybrid installations leverage the benefits of both cloud native and traditional
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index a147c9ddc8b442022e7a1b8822d61b5fb0699c17..19f6fbd222eb9184b9e3176b1d7a1f087e39057b 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -2219,7 +2219,7 @@ but with smaller performance requirements, several modifications can be consider
 ## Cloud Native Hybrid reference architecture with Helm Charts (alternative)
 
 Run select components of cloud-native GitLab in Kubernetes with the [GitLab Helm chart](https://docs.gitlab.com/charts/). In this setup, you can run the equivalent of GitLab Rails in the Kubernetes cluster called Webservice. You also can run the equivalent of Sidekiq nodes in the Kubernetes cluster called Sidekiq. In addition,
-the following other supporting services are supported: NGINX, Task Runner, Migrations,
+the following other supporting services are supported: NGINX, Toolbox, Migrations,
 Prometheus.
 
 Hybrid installations leverage the benefits of both cloud native and traditional
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index 4dc5d05ad96b4fd32803a15a517a14592bbc8a80..644bfbd04f95aef71c8e43bf09938f81a7b94fff 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -2231,7 +2231,7 @@ cluster alongside your instance, read how to
 ## Cloud Native Hybrid reference architecture with Helm Charts (alternative)
 
 Run select components of cloud-native GitLab in Kubernetes with the [GitLab Helm chart](https://docs.gitlab.com/charts/). In this setup, you can run the equivalent of GitLab Rails in the Kubernetes cluster called Webservice. You also can run the equivalent of Sidekiq nodes in the Kubernetes cluster called Sidekiq. In addition,
-the following other supporting services are supported: NGINX, Task Runner, Migrations,
+the following other supporting services are supported: NGINX, Toolbox, Migrations,
 Prometheus.
 
 Hybrid installations leverage the benefits of both cloud native and traditional
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index ee77a16ad5ca977580e4480a627ea603faff030f..f011f0832f0dacd201accc4f98882e8c56f97a08 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -2187,7 +2187,7 @@ cluster alongside your instance, read how to
 ## Cloud Native Hybrid reference architecture with Helm Charts (alternative)
 
 Run select components of cloud-native GitLab in Kubernetes with the [GitLab Helm chart](https://docs.gitlab.com/charts/). In this setup, you can run the equivalent of GitLab Rails in the Kubernetes cluster called Webservice. You can also run the equivalent of Sidekiq nodes in the Kubernetes cluster called Sidekiq. In addition,
-the following other supporting services are supported: NGINX, Task Runner, Migrations,
+the following other supporting services are supported: NGINX, Toolbox, Migrations,
 Prometheus.
 
 Hybrid installations leverage the benefits of both cloud native and traditional