diff --git a/doc/ci/mobile_devops.md b/doc/ci/mobile_devops.md
index 929979cae8d89a860c3ea98f6863e11e82e6a2df..7ebb8d8e44f2ce6128f1c556327446bc50db1def 100644
--- a/doc/ci/mobile_devops.md
+++ b/doc/ci/mobile_devops.md
@@ -21,7 +21,7 @@ Mobile DevOps is still in development, but you can:
 
 ## Build environments
 
-Get started quickly by using [GitLab.com SaaS runners](../ci/runners/index.md),
+Get started quickly by using [GitLab-hosted runners](../ci/runners/index.md),
 or set up [self-managed runners](https://docs.gitlab.com/runner/#use-self-managed-runners)
 for complete control over the build environment.
 
@@ -43,9 +43,9 @@ test:
 
 ### iOS build environments
 
-[GitLab SaaS runners on macOS](../ci/runners/saas/macos_saas_runner.md) are in Beta.
+[GitLab hosted runners on macOS](../ci/runners/hosted_runners/macos.md) are in Beta.
 
-[Choose an image](../ci/runners/saas/macos_saas_runner.md#supported-macos-images) to run a job on a macOS GitLab SaaS runner and add it to your `.gitlab-ci.yml` file.
+[Choose an image](../ci/runners/hosted_runners/macos.md#supported-macos-images) to run a job on a macOS GitLab-hosted runner and add it to your `.gitlab-ci.yml` file.
 
 For example:
 
diff --git a/doc/ci/runners/hosted_runners/gpu_enabled.md b/doc/ci/runners/hosted_runners/gpu_enabled.md
new file mode 100644
index 0000000000000000000000000000000000000000..b56fe44b4ef47be35e9d17f7ddfb326ce443e6f6
--- /dev/null
+++ b/doc/ci/runners/hosted_runners/gpu_enabled.md
@@ -0,0 +1,57 @@
+---
+stage: Verify
+group: Runner
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# GPU-enabled hosted runners
+
+DETAILS:
+**Tier:** Premium, Ultimate
+**Offering:** GitLab.com
+
+GitLab provides GPU-enabled hosted runners to accelerate heavy compute workloads for ModelOps
+or HPC such as the training or deployment of Large Language Models (LLMs) as part of ModelOps workloads.
+
+GitLab provides GPU-enabled runners only on Linux. For more information about how these runners work, see [Hosted runners on Linux](../hosted_runners/linux.md)
+
+## Machine types available for GPU-enabled runners
+
+The following machine types are available for GPU-enabled runners on Linux x86-64.
+
+| Runner Tag                             | vCPUs | Memory | Storage | GPU                            | GPU Memory |
+|----------------------------------------|-------|--------|---------|--------------------------------|------------|
+| `saas-linux-medium-amd64-gpu-standard` | 4     | 15 GB  | 50 GB   | 1 Nvidia Tesla T4 (or similar) | 16 GB      |
+
+## Container images with GPU drivers
+
+As with GitLab hosted runners on Linux, your job runs in an isolated virtual machine (VM)
+with a bring-your-own-image policy. GitLab mounts the GPU from the host VM into
+your isolated environment. To use the GPU, you must use a Docker image with the
+GPU driver installed. For Nvidia GPUs, you can use their [CUDA Toolkit](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/cuda).
+
+## Example `.gitlab-ci.yml` file
+
+In the following example of the `.gitlab-ci.yml` file, the Nvidia CUDA base Ubuntu image is used.
+In the `script:` section, you install Python.
+
+```yaml
+gpu-job:
+  stage: build
+  tags:
+    - saas-linux-medium-amd64-gpu-standard
+  image: nvcr.io/nvidia/cuda:12.1.1-base-ubuntu22.04
+  script:
+    - apt-get update
+    - apt-get install -y python3.10
+    - python3.10 --version
+```
+
+If you don't want to install larger libraries such as Tensorflow or XGBoost each time you run a job, you can create your own image with all the required components pre-installed.
+Watch this demo to learn how to leverage GPU-enabled hosted runners to train an XGBoost model:
+<div class="video-fallback">
+  Video demonstration of GitLab GPU-enabled hosted runners: <a href="https://youtu.be/tElegG4NCZ0">Train XGboost models with GitLab</a>.
+</div>
+<figure class="video-container">
+  <iframe src="https://www.youtube-nocookie.com/embed/tElegG4NCZ0" frameborder="0" allowfullscreen> </iframe>
+</figure>
diff --git a/doc/ci/runners/hosted_runners/linux.md b/doc/ci/runners/hosted_runners/linux.md
new file mode 100644
index 0000000000000000000000000000000000000000..b8a55593850a81f236a688bf9da1fa2075a4908d
--- /dev/null
+++ b/doc/ci/runners/hosted_runners/linux.md
@@ -0,0 +1,100 @@
+---
+stage: Verify
+group: Runner
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Hosted runners on Linux
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** GitLab.com
+
+When you run jobs on hosted runners on Linux, the runners are on auto-scaled ephemeral virtual machine (VM) instances.
+The default region for the VMs is `us-east1`.
+
+Each VM uses the Google Container-Optimized OS (COS) and the latest version of Docker Engine running the `docker+machine`
+[executor](https://docs.gitlab.com/runner/executors/#docker-machine-executor).
+
+## Machine types available for Linux (x86-64)
+
+For the hosted runners on Linux, GitLab offers a range of machine types for use.
+For Free, Premium, and Ultimate plan customers, jobs on these instances consume the compute quota allocated to your namespace.
+
+| Runner Tag                                    | vCPUs | Memory | Storage |
+|-----------------------------------------------|-------|--------|---------|
+| `saas-linux-small-amd64`                      | 2     | 8 GB   | 25 GB   |
+| `saas-linux-medium-amd64`                     | 4     | 16 GB  | 50 GB   |
+| `saas-linux-large-amd64` (Premium and Ultimate only)  | 8     | 32 GB  | 100 GB  |
+| `saas-linux-xlarge-amd64` (Premium and Ultimate only) | 16    | 64 GB  | 200 GB  |
+| `saas-linux-2xlarge-amd64` (Premium and Ultimate only) | 32    | 128 GB | 200 GB  |
+
+The `small` machine type is set as default. If no [tag](../../yaml/index.md#tags) keyword in your `.gitlab-ci.yml` file is specified,
+the jobs will run on this default runner.
+
+There are [different rates of compute minutes consumption](../../pipelines/cicd_minutes.md#additional-costs-on-gitlab-saas), based on the type of machine that is used.
+
+All hosted runners on Linux currently run on
+[`n2d-standard`](https://cloud.google.com/compute/docs/general-purpose-machines#n2d_machines) general-purpose compute from GCP.
+The machine type and underlying processor type can change. Jobs optimized for a specific processor design could behave inconsistently.
+
+## Container images
+
+As runners on Linux are using the `docker+machine` [executor](https://docs.gitlab.com/runner/executors/#docker-machine-executor),
+you can choose any container image by defining the [`image`](../../../ci/yaml/index.md#image) in your `.gitlab-ci.yml` file.
+
+If no image is set, the default is `ruby:3.1`.
+
+## Docker in Docker support
+
+The runners are configured to run in `privileged` mode to support
+[Docker in Docker](../../../ci/docker/using_docker_build.md#use-docker-in-docker)
+to build Docker images natively or run multiple containers within your isolated job.
+
+## Caching on hosted runners
+
+The hosted runners share a [distributed cache](https://docs.gitlab.com/runner/configuration/autoscale.html#distributed-runners-caching)
+stored in a Google Cloud Storage (GCS) bucket. Cache contents not updated in the last 14 days are automatically
+removed, based on the [object lifecycle management policy](https://cloud.google.com/storage/docs/lifecycle).
+The maximum size of an uploaded cache artifact can be 5 GB after the cache becomes a compressed archive.
+
+For more information about how caching works, see [Caching in GitLab CI/CD](../../caching/index.md).
+
+## Example `.gitlab-ci.yml` file
+
+To use a machine type other than `small`, add a `tags:` keyword to your job.
+For example:
+
+```yaml
+job_small:
+  script:
+    - echo "this job runs on the default (small) Linux instance"
+
+job_medium:
+  tags:
+    - saas-linux-medium-amd64
+  script:
+    - echo "this job runs on the medium Linux instance"
+
+job_large:
+  tags:
+    - saas-linux-large-amd64
+  script:
+    - echo "this job runs on the large Linux instance"
+```
+
+## Hosted runners for GitLab community contributions
+
+If you want to [contribute to GitLab](https://about.gitlab.com/community/contribute/), jobs will be picked up by the
+`gitlab-shared-runners-manager-X.gitlab.com` fleet of runners, dedicated for GitLab projects and related community forks.
+
+These runners are backed by the same machine type as our `small` runners.
+Unlike the most commonly used hosted runners on Linux, each virtual machine is re-used up to 40 times.
+
+As we want to encourage people to contribute, these runners are free of charge.
+
+## Pre-clone script (deprecated)
+
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/391896) in GitLab 15.9
+and [will be removed](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29405) in 17.0.
+Use [`pre_get_sources_script`](../../../ci/yaml/index.md#hookspre_get_sources_script) instead.
diff --git a/doc/ci/runners/hosted_runners/macos.md b/doc/ci/runners/hosted_runners/macos.md
new file mode 100644
index 0000000000000000000000000000000000000000..05656cbccdfb75870736b6e23150bd9cd71046a5
--- /dev/null
+++ b/doc/ci/runners/hosted_runners/macos.md
@@ -0,0 +1,165 @@
+---
+stage: Verify
+group: Runner
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Hosted runners on macOS
+
+DETAILS:
+**Tier:** Premium, Ultimate
+**Offering:** GitLab.com
+**Status:** Beta
+
+Hosted runners on macOS are in [Beta](../../../policy/experiment-beta-support.md#beta) for open source programs and customers in Premium and Ultimate plans.
+
+Hosted runners on macOS provide an on-demand macOS build environment integrated with
+GitLab SaaS [CI/CD](../../../ci/index.md).
+Use these runners to build, test, and deploy apps for the Apple ecosystem (macOS, iOS, watchOS, tvOS). You can take advantage
+of all the capabilities of the GitLab single DevOps platform and not have to manage or operate a
+build environment. Our [Mobile DevOps solution](../../../ci/mobile_devops.md#ios-build-environments) provides features, documentation, and guidance on building and deploying mobile applications for iOS.
+
+We want to keep iterating to get hosted runners on macOS
+[generally available](../../../policy/experiment-beta-support.md#generally-available-ga).
+You can follow our work towards this goal in the
+[related epic](https://gitlab.com/groups/gitlab-org/-/epics/8267).
+
+## Machine types available for macOS
+
+GitLab SaaS provides macOS build machines on Apple silicon (M1) chips. To build for an x86-64 target, you can use Rosetta 2 to emulate an Intel x86-64 build environment.
+
+| Runner Tag             | vCPUS | Memory | Storage |
+| ---------------------- | ----- | ------ | ------- |
+| `saas-macos-medium-m1` | 4     | 8 GB   | 25 GB   |
+
+## Supported macOS images
+
+In comparison to our hosted runners on Linux, where you can run any Docker image,
+GitLab SaaS provides a set of VM images for macOS.
+
+You can execute your build in one of the following images, which you specify
+in your `.gitlab-ci.yml` file. Each image runs a specific version of macOS and Xcode.
+
+| VM image                   | Status |              |
+|----------------------------|--------|--------------|
+| `macos-12-xcode-14`        | `Deprecated` | (Removal in GitLab 16.10) |
+| `macos-13-xcode-14`        | `GA`   | [Preinstalled Software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/blob/36d443841732f2d4f7e3de1bce63f530edef1676/toolchain/macos-13.yml) |
+| `macos-14-xcode-15`        | `GA`   | [Preinstalled Software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/blob/36d443841732f2d4f7e3de1bce63f530edef1676/toolchain/macos-14.yml) |
+
+If no image is specified, the macOS runner uses `macos-13-xcode-14`.
+
+## Image update policy for macOS
+
+The images and installed components are updated with each GitLab release, to keep the preinstalled software up-to-date. GitLab typically supports multiple versions of preinstalled software. For more information, see the [full list of preinstalled software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/tree/main/toolchain).
+
+Major and minor releases of macOS and Xcode, are made available within two weeks of Apple's release.
+
+A new major release image is initially made available as Beta, and becomes Generally Available (GA) with the release of the first minor release.
+Because only two GA images are supported at a time, the oldest image becomes deprecated and will be removed after three months according to the [supported image lifecycle](../index.md#supported-image-lifecycle).
+
+## Example `.gitlab-ci.yml` file
+
+The following sample `.gitlab-ci.yml` file shows how to start using the hosted runners on macOS:
+
+```yaml
+.macos_saas_runners:
+  tags:
+    - saas-macos-medium-m1
+  image: macos-14-xcode-15
+  before_script:
+    - echo "started by ${GITLAB_USER_NAME}"
+
+build:
+  extends:
+    - .macos_saas_runners
+  stage: build
+  script:
+    - echo "running scripts in the build job"
+
+test:
+  extends:
+    - .macos_saas_runners
+  stage: test
+  script:
+    - echo "running scripts in the test job"
+```
+
+## Code signing iOS Projects with fastlane
+
+Before you can integrate GitLab with Apple services, install to a device, or deploy to the Apple App Store, you must [code sign](https://developer.apple.com/support/code-signing/) your application.
+
+Included in each runner on macOS VM image is [fastlane](https://fastlane.tools/),
+an open-source solution aimed at simplifying mobile app deployment.
+
+For information about how to set up code signing for your application, see the instructions in the [Mobile DevOps documentation](../../../ci/mobile_devops.md#code-sign-ios-projects-with-fastlane).
+
+Related topics:
+
+- [Apple Developer Support - Code Signing](https://developer.apple.com/support/code-signing/)
+- [Code Signing Best Practice Guide](https://codesigning.guide/)
+- [fastlane authentication with Apple Services guide](https://docs.fastlane.tools/getting-started/ios/authentication/)
+
+## Optimizing Homebrew
+
+By default, Homebrew checks for updates at the start of any operation. Homebrew has a
+release cycle that may be more frequent than the GitLab macOS image release cycle. This
+difference in release cycles may cause steps that call `brew` to take extra time to complete
+while Homebrew makes updates.
+
+To reduce build time due to unintended Homebrew updates, set the `HOMEBREW_NO_AUTO_UPDATE` variable in `.gitlab-ci.yml`:
+
+```yaml
+variables:
+  HOMEBREW_NO_AUTO_UPDATE: 1
+```
+
+## Optimizing Cocoapods
+
+If you use Cocoapods in a project, you should consider the following optimizations to improve CI performance.
+
+**Cocoapods CDN**
+
+You can use content delivery network (CDN) access to download packages from the CDN instead of having to clone an entire
+project repository. CDN access is available in Cocoapods 1.8 or later and is supported by all GitLab hosted runners on macOS.
+
+To enable CDN access, ensure your Podfile starts with:
+
+```ruby
+source 'https://cdn.cocoapods.org/'
+```
+
+**Use GitLab caching**
+
+Use caching in Cocoapods packages in GitLab to only run `pod install`
+when pods change, which can improve build performance.
+
+To [configure caching](../../../ci/caching/index.md) for your project:
+
+1. Add the `cache` configuration to your `.gitlab-ci.yml` file:
+
+    ```yaml
+    cache:
+      key:
+        files:
+         - Podfile.lock
+    paths:
+      - Pods
+    ```
+
+1. Add the [`cocoapods-check`](https://guides.cocoapods.org/plugins/optimising-ci-times.html) plugin to your project.
+1. Update the job script to check for installed dependencies before it calls `pod install`:
+
+    ```shell
+    bundle exec pod check || bundle exec pod install
+    ```
+
+**Include pods in source control**
+
+You can also [include the pods directory in source control](https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control). This eliminates the need to install pods as part of the CI job,
+but it does increase the overall size of your project's repository.
+
+## Known issues and usage constraints
+
+- If the VM image does not include the specific software version you need for your job, the required software must be fetched and installed. This causes an increase in job execution time.
+- It is not possible to bring your own OS image.
+- The keychain for user `gitlab` is not publicly available. You must create a keychain instead.
diff --git a/doc/ci/runners/hosted_runners/windows.md b/doc/ci/runners/hosted_runners/windows.md
new file mode 100644
index 0000000000000000000000000000000000000000..93339eab71b6e2ab1ee17a36569fbedc39b726e2
--- /dev/null
+++ b/doc/ci/runners/hosted_runners/windows.md
@@ -0,0 +1,98 @@
+---
+stage: Verify
+group: Runner
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Hosted runners on Windows
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** GitLab.com
+**Status:** Beta
+
+Hosted runners on Windows autoscale by launching virtual machines on
+the Google Cloud Platform. This solution uses an
+[autoscaling driver](https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/autoscaler/-/blob/main/docs/README.md)
+developed by GitLab for the [custom executor](https://docs.gitlab.com/runner/executors/custom.html).
+Hosted runners on Windows are in [Beta](../../../policy/experiment-beta-support.md#beta)
+and aren't recommended for production workloads.
+
+We want to keep iterating to get Windows runners in a stable state and
+[generally available](../../../policy/experiment-beta-support.md#generally-available-ga).
+You can follow our work towards this goal in the
+[related epic](https://gitlab.com/groups/gitlab-org/-/epics/2162).
+
+## Machine types available for Windows
+
+| Runner Tag                  | vCPUs | Memory | Storage |
+| --------------------------- | ----- | ------ | ------- |
+| `saas-windows-medium-amd64` | 2     | 7.5 GB | 75 GB   |
+
+## Supported Windows versions
+
+The Windows runner virtual machine instances do not use the GitLab Docker executor. This means that you can't specify
+[`image`](../../../ci/yaml/index.md#image) or [`services`](../../../ci/yaml/index.md#services) in your pipeline configuration.
+
+You can execute your job in one of the following Windows versions:
+
+| Version      | Status        |
+|--------------|---------------|
+| Windows 2022 | `Beta`        |
+| Windows 2019 | `Deprecated` (Removal in 17.0) |
+
+You can find a full list of available pre-installed software in
+the [pre-installed software documentation](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/blob/main/cookbooks/preinstalled-software/README.md).
+
+NOTE:
+We are only supporting a single version of Windows at this time.
+
+## Supported shell
+
+Hosted runners on Windows have PowerShell configured as the shell.
+The `script` section of your `.gitlab-ci.yml` file therefore requires PowerShell commands.
+
+## Example `.gitlab-ci.yml` file
+
+Below is a sample `.gitlab-ci.yml` file that shows how to start using the runners for Windows:
+
+```yaml
+.windows_job:
+  tags:
+    - saas-windows-medium-amd64
+  before_script:
+    - Set-Variable -Name "time" -Value (date -Format "%H:%m")
+    - echo ${time}
+    - echo "started by ${GITLAB_USER_NAME}"
+
+build:
+  extends:
+    - .windows_job
+  stage: build
+  script:
+    - echo "running scripts in the build job"
+
+test:
+  extends:
+    - .windows_job
+  stage: test
+  script:
+    - echo "running scripts in the test job"
+```
+
+## Known issues
+
+- For more information about support for Beta features, see [Beta](../../../policy/experiment-beta-support.md#beta).
+- The average provisioning time for a new Windows virtual machine (VM) is five minutes, so
+  you might notice slower start times for builds on the Windows runner
+  fleet during the Beta. Updating the autoscaler to enable the pre-provisioning
+  of virtual machines is proposed in a future release. This update is intended to
+  significantly reduce the time it takes to provision a VM on the Windows fleet.
+  For more information, see [issue 32](https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/autoscaler/-/issues/32).
+- The Windows runner fleet may be unavailable occasionally
+  for maintenance or updates.
+- The job may stay in a pending state for longer than the
+  Linux runners.
+- There is the possibility that we introduce breaking changes which will
+  require updates to pipelines that are using the Windows runner
+  fleet.
diff --git a/doc/ci/runners/index.md b/doc/ci/runners/index.md
index c47e531a712c60e7370dbebd041ed3ca03931b71..c0a32105706a387d2bb4ebe0fad6ddebd04c5baa 100644
--- a/doc/ci/runners/index.md
+++ b/doc/ci/runners/index.md
@@ -1,24 +1,27 @@
 ---
 stage: Verify
-group: Runner SaaS
+group: Hosted Runners
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Runner SaaS
+# GitLab-hosted runners
 
 DETAILS:
 **Tier:** Free, Premium, Ultimate
 **Offering:** GitLab.com
 
-You can run your CI/CD jobs on GitLab.com using SaaS runners hosted by GitLab to seamlessly build, test and deploy
+You can run your CI/CD jobs on GitLab.com and GitLab Dedicated using GitLab-hosted runners to seamlessly build, test and deploy
 your application on different environments.
+
+## Hosted runners for GitLab.com
+
 These runners fully integrated with GitLab.com and are enabled by default for all projects, with no configuration required.
 Your jobs can run on:
 
-- [Linux runners](saas/linux_saas_runner.md)
-- [GPU runners](saas/gpu_saas_runner.md)
-- [Windows runners](saas/windows_saas_runner.md) ([Beta](../../policy/experiment-beta-support.md#beta))
-- [macOS runners](saas/macos_saas_runner.md) ([Beta](../../policy/experiment-beta-support.md#beta))
+- [Hosted runners on Linux](saas/linux_saas_runner.md)
+- [GPU-enabled hosted runners](saas/gpu_saas_runner.md)
+- [Hosted runners on Windows](saas/windows_saas_runner.md) ([Beta](../../policy/experiment-beta-support.md#beta))
+- [Hosted runners on macOS](saas/macos_saas_runner.md) ([Beta](../../policy/experiment-beta-support.md#beta))
 
 For more information about the cost factor applied to the machine type based on size, see [cost factor](../../ci/pipelines/cicd_minutes.md#cost-factor).
 The number of minutes you can use on these runners depends on the [maximum number of units of compute](../pipelines/cicd_minutes.md)
@@ -29,9 +32,16 @@ on the `small` Linux runners.
 
 The objective is to make 90% of CI/CD jobs start executing in 120 seconds or less. The error rate should be less than 0.5%.
 
-## How SaaS runners work
+## Hosted runners for GitLab Dedicated
+
+These runners are created on-demand for GitLab Dedicated customers and are fully integrated with your GitLab Dedicated instance.
+Your jobs can run on:
+
+- [Hosted runners on Linux](saas/linux_saas_runner.md) ([Beta](../../policy/experiment-beta-support.md#beta))
+
+## How hosted runners for GitLab.com work
 
-When you use SaaS runners:
+When you use hosted runners:
 
 - Each of your jobs runs in a newly provisioned VM, which is dedicated to the specific job.
 - The VM is active only for the duration of the job and immediately deleted. This means that any changes that your job makes to the virtual machine will not be available to a subsequent job.
@@ -40,7 +50,7 @@ When you use SaaS runners:
   This means that the available free disk space for your jobs to use is reduced.
 
 NOTE:
-Jobs handled by SaaS runners on GitLab.com **time out after 3 hours**, regardless of the timeout configured in a project.
+Jobs handled by hosted runners on GitLab.com **time out after 3 hours**, regardless of the timeout configured in a project.
 
 ## Release cycle for SaaS runner
 
@@ -48,9 +58,9 @@ We aim to update to the latest version of [GitLab Runner](https://docs.gitlab.co
 
 You can find all GitLab Runner breaking changes under [Deprecations and removals](../../update/deprecations.md).
 
-## Security for SaaS runners
+## Security for GitLab-hosted runners
 
-GitLab SaaS runners on Linux and Windows run on Google Compute Platform.
+Hosted runners on Linux and Windows for GitLab.com run on Google Compute Platform.
 The [Google Infrastructure Security Design Overview whitepaper](https://cloud.google.com/docs/security/infrastructure/design/resources/google_infrastructure_whitepaper_fa.pdf)
 provides an overview of how Google designs security into its technical infrastructure.
 The GitLab [Trust Center](https://about.gitlab.com/security/) and
diff --git a/doc/ci/runners/saas/gpu_saas_runner.md b/doc/ci/runners/saas/gpu_saas_runner.md
index 6d87132808a0008875c39a20f2c8f68d7fcef6a8..176263c8d0cbb4cab816c6f5e62c7ac9e16ad38c 100644
--- a/doc/ci/runners/saas/gpu_saas_runner.md
+++ b/doc/ci/runners/saas/gpu_saas_runner.md
@@ -1,57 +1,11 @@
 ---
-stage: Verify
-group: Runner
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: '../hosted_runners/gpu_enabled.md'
+remove_date: '2024-06-01'
 ---
 
-# GPU-enabled SaaS runners
+This document was moved to [another location](../hosted_runners/gpu_enabled.md).
 
-DETAILS:
-**Tier:** Premium, Ultimate
-**Offering:** GitLab.com
-
-GitLab provides GPU-enabled SaaS runners to accelerate heavy compute workloads for ModelOps
-or HPC such as the training or deployment of Large Language Models (LLMs) as part of ModelOps workloads.
-
-GitLab provides GPU-enabled runners only on Linux. For more information about how these runners work, see [SaaS runners on Linux](../saas/linux_saas_runner.md)
-
-## Machine types available for GPU-enabled runners
-
-The following machine types are available for GPU-enabled runners on Linux x86-64.
-
-| Runner Tag                             | vCPUs | Memory | Storage | GPU                            | GPU Memory |
-|----------------------------------------|-------|--------|---------|--------------------------------|------------|
-| `saas-linux-medium-amd64-gpu-standard` | 4     | 15 GB  | 50 GB   | 1 Nvidia Tesla T4 (or similar) | 16 GB      |
-
-## Container images with GPU drivers
-
-As with GitLab SaaS runners on Linux, your job runs in an isolated virtual machine (VM)
-with a bring-your-own-image policy. GitLab mounts the GPU from the host VM into
-your isolated environment. To use the GPU, you must use a Docker image with the
-GPU driver installed. For Nvidia GPUs, you can use their [CUDA Toolkit](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/cuda).
-
-## Example `.gitlab-ci.yml` file
-
-In the following example of the `.gitlab-ci.yml` file, the Nvidia CUDA base Ubuntu image is used.
-In the `script:` section, you install Python.
-
-```yaml
-gpu-job:
-  stage: build
-  tags:
-    - saas-linux-medium-amd64-gpu-standard
-  image: nvcr.io/nvidia/cuda:12.1.1-base-ubuntu22.04
-  script:
-    - apt-get update
-    - apt-get install -y python3.10
-    - python3.10 --version
-```
-
-If you don't want to install larger libraries such as Tensorflow or XGBoost each time you run a job, you can create your own image with all the required components pre-installed.
-Watch this demo to learn how to leverage GPU-enabled SaaS runners to train an XGBoost model:
-<div class="video-fallback">
-  Video demonstration of GitLab GPU-Enabled SaaS runners: <a href="https://youtu.be/tElegG4NCZ0">Train XGboost models with GitLab</a>.
-</div>
-<figure class="video-container">
-  <iframe src="https://www.youtube-nocookie.com/embed/tElegG4NCZ0" frameborder="0" allowfullscreen> </iframe>
-</figure>
+<!-- This redirect file can be deleted after <2024-06-01>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/ci/runners/saas/linux_saas_runner.md b/doc/ci/runners/saas/linux_saas_runner.md
index 9bc85b13101a7b775bf10e8cd7ad9b5294a80cda..ceaf1b1b53a80edacb40e2ee0e0457b4a05b65e2 100644
--- a/doc/ci/runners/saas/linux_saas_runner.md
+++ b/doc/ci/runners/saas/linux_saas_runner.md
@@ -1,100 +1,11 @@
 ---
-stage: Verify
-group: Runner
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: '../hosted_runners/linux.md'
+remove_date: '2024-06-01'
 ---
 
-# SaaS runners on Linux
+This document was moved to [another location](../hosted_runners/linux.md).
 
-DETAILS:
-**Tier:** Free, Premium, Ultimate
-**Offering:** GitLab.com
-
-When you run jobs on SaaS runners on Linux, the runners are on auto-scaled ephemeral virtual machine (VM) instances.
-The default region for the VMs is `us-east1`.
-
-Each VM uses the Google Container-Optimized OS (COS) and the latest version of Docker Engine running the `docker+machine`
-[executor](https://docs.gitlab.com/runner/executors/#docker-machine-executor).
-
-## Machine types available for Linux (x86-64)
-
-For the SaaS runners on Linux, GitLab offers a range of machine types for use.
-For Free, Premium, and Ultimate plan customers, jobs on these instances consume the compute quota allocated to your namespace.
-
-| Runner Tag                                    | vCPUs | Memory | Storage |
-|-----------------------------------------------|-------|--------|---------|
-| `saas-linux-small-amd64`                      | 2     | 8 GB   | 25 GB   |
-| `saas-linux-medium-amd64`                     | 4     | 16 GB  | 50 GB   |
-| `saas-linux-large-amd64` (Premium and Ultimate only)  | 8     | 32 GB  | 100 GB  |
-| `saas-linux-xlarge-amd64` (Premium and Ultimate only) | 16    | 64 GB  | 200 GB  |
-| `saas-linux-2xlarge-amd64` (Premium and Ultimate only) | 32    | 128 GB | 200 GB  |
-
-The `small` machine type is set as default. If no [tag](../../yaml/index.md#tags) keyword in your `.gitlab-ci.yml` file is specified,
-the jobs will run on this default runner.
-
-There are [different rates of compute minutes consumption](../../pipelines/cicd_minutes.md#additional-costs-on-gitlab-saas), based on the type of machine that is used.
-
-All SaaS runners on Linux currently run on
-[`n2d-standard`](https://cloud.google.com/compute/docs/general-purpose-machines#n2d_machines) general-purpose compute from GCP.
-The machine type and underlying processor type can change. Jobs optimized for a specific processor design could behave inconsistently.
-
-## Container images
-
-As runners on Linux are using the `docker+machine` [executor](https://docs.gitlab.com/runner/executors/#docker-machine-executor),
-you can choose any container image by defining the [`image`](../../../ci/yaml/index.md#image) in your `.gitlab-ci.yml` file.
-
-If no image is set, the default is `ruby:3.1`.
-
-## Docker in Docker support
-
-The runners are configured to run in `privileged` mode to support
-[Docker in Docker](../../../ci/docker/using_docker_build.md#use-docker-in-docker)
-to build Docker images natively or run multiple containers within your isolated job.
-
-## Caching on SaaS runners
-
-The SaaS runners share a [distributed cache](https://docs.gitlab.com/runner/configuration/autoscale.html#distributed-runners-caching)
-stored in a Google Cloud Storage (GCS) bucket. Cache contents not updated in the last 14 days are automatically
-removed, based on the [object lifecycle management policy](https://cloud.google.com/storage/docs/lifecycle).
-The maximum size of an uploaded cache artifact can be 5 GB after the cache becomes a compressed archive.
-
-For more information about how caching works, see [Caching in GitLab CI/CD](../../caching/index.md).
-
-## Example `.gitlab-ci.yml` file
-
-To use a machine type other than `small`, add a `tags:` keyword to your job.
-For example:
-
-```yaml
-job_small:
-  script:
-    - echo "this job runs on the default (small) Linux instance"
-
-job_medium:
-  tags:
-    - saas-linux-medium-amd64
-  script:
-    - echo "this job runs on the medium Linux instance"
-
-job_large:
-  tags:
-    - saas-linux-large-amd64
-  script:
-    - echo "this job runs on the large Linux instance"
-```
-
-## SaaS runners for GitLab community contributions
-
-If you want to [contribute to GitLab](https://about.gitlab.com/community/contribute/), jobs will be picked up by the
-`gitlab-shared-runners-manager-X.gitlab.com` fleet of runners, dedicated for GitLab projects and related community forks.
-
-These runners are backed by the same machine type as our `small` runners.
-Unlike the most commonly used SaaS runners on Linux, each virtual machine is re-used up to 40 times.
-
-As we want to encourage people to contribute, these runners are free of charge.
-
-## Pre-clone script (deprecated)
-
-This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/391896) in GitLab 15.9
-and [will be removed](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29405) in 17.0.
-Use [`pre_get_sources_script`](../../../ci/yaml/index.md#hookspre_get_sources_script) instead.
+<!-- This redirect file can be deleted after <2024-06-01>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/ci/runners/saas/macos_saas_runner.md b/doc/ci/runners/saas/macos_saas_runner.md
index 8a8aeabde0c0536549b3631aeb958ba76108988c..b0c3b1fe5cffb2166efb5097bc561d846162b11a 100644
--- a/doc/ci/runners/saas/macos_saas_runner.md
+++ b/doc/ci/runners/saas/macos_saas_runner.md
@@ -1,165 +1,11 @@
 ---
-stage: Verify
-group: Runner
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: '../hosted_runners/macos.md'
+remove_date: '2024-06-01'
 ---
 
-# SaaS runners on macOS
+This document was moved to [another location](../hosted_runners/macos.md).
 
-DETAILS:
-**Tier:** Premium, Ultimate
-**Offering:** GitLab.com
-**Status:** Beta
-
-SaaS runners on macOS are in [Beta](../../../policy/experiment-beta-support.md#beta) for open source programs and customers in Premium and Ultimate plans.
-
-SaaS runners on macOS provide an on-demand macOS build environment integrated with
-GitLab SaaS [CI/CD](../../../ci/index.md).
-Use these runners to build, test, and deploy apps for the Apple ecosystem (macOS, iOS, watchOS, tvOS). You can take advantage
-of all the capabilities of the GitLab single DevOps platform and not have to manage or operate a
-build environment. Our [Mobile DevOps solution](../../../ci/mobile_devops.md#ios-build-environments) provides features, documentation, and guidance on building and deploying mobile applications for iOS.
-
-We want to keep iterating to get SaaS runners on macOS
-[generally available](../../../policy/experiment-beta-support.md#generally-available-ga).
-You can follow our work towards this goal in the
-[related epic](https://gitlab.com/groups/gitlab-org/-/epics/8267).
-
-## Machine types available for macOS
-
-GitLab SaaS provides macOS build machines on Apple silicon (M1) chips. To build for an x86-64 target, you can use Rosetta 2 to emulate an Intel x86-64 build environment.
-
-| Runner Tag             | vCPUS | Memory | Storage |
-| ---------------------- | ----- | ------ | ------- |
-| `saas-macos-medium-m1` | 4     | 8 GB   | 25 GB   |
-
-## Supported macOS images
-
-In comparison to our SaaS runners on Linux, where you can run any Docker image,
-GitLab SaaS provides a set of VM images for macOS.
-
-You can execute your build in one of the following images, which you specify
-in your `.gitlab-ci.yml` file. Each image runs a specific version of macOS and Xcode.
-
-| VM image                   | Status |              |
-|----------------------------|--------|--------------|
-| `macos-12-xcode-14`        | `Deprecated` | (Removal in GitLab 16.10) |
-| `macos-13-xcode-14`        | `GA`   | [Preinstalled Software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/blob/36d443841732f2d4f7e3de1bce63f530edef1676/toolchain/macos-13.yml) |
-| `macos-14-xcode-15`        | `GA`   | [Preinstalled Software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/blob/36d443841732f2d4f7e3de1bce63f530edef1676/toolchain/macos-14.yml) |
-
-If no image is specified, the macOS runner uses `macos-13-xcode-14`.
-
-## Image update policy for macOS
-
-The images and installed components are updated with each GitLab release, to keep the preinstalled software up-to-date. GitLab typically supports multiple versions of preinstalled software. For more information, see the [full list of preinstalled software](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/job-images/-/tree/main/toolchain).
-
-Major and minor releases of macOS and Xcode, are made available within two weeks of Apple's release.
-
-A new major release image is initially made available as Beta, and becomes Generally Available (GA) with the release of the first minor release.
-Because only two GA images are supported at a time, the oldest image becomes deprecated and will be removed after three months according to the [supported image lifecycle](../index.md#supported-image-lifecycle).
-
-## Example `.gitlab-ci.yml` file
-
-The following sample `.gitlab-ci.yml` file shows how to start using the SaaS runners on macOS:
-
-```yaml
-.macos_saas_runners:
-  tags:
-    - saas-macos-medium-m1
-  image: macos-14-xcode-15
-  before_script:
-    - echo "started by ${GITLAB_USER_NAME}"
-
-build:
-  extends:
-    - .macos_saas_runners
-  stage: build
-  script:
-    - echo "running scripts in the build job"
-
-test:
-  extends:
-    - .macos_saas_runners
-  stage: test
-  script:
-    - echo "running scripts in the test job"
-```
-
-## Code signing iOS Projects with fastlane
-
-Before you can integrate GitLab with Apple services, install to a device, or deploy to the Apple App Store, you must [code sign](https://developer.apple.com/support/code-signing/) your application.
-
-Included in each runner on macOS VM image is [fastlane](https://fastlane.tools/),
-an open-source solution aimed at simplifying mobile app deployment.
-
-For information about how to set up code signing for your application, see the instructions in the [Mobile DevOps documentation](../../../ci/mobile_devops.md#code-sign-ios-projects-with-fastlane).
-
-Related topics:
-
-- [Apple Developer Support - Code Signing](https://developer.apple.com/support/code-signing/)
-- [Code Signing Best Practice Guide](https://codesigning.guide/)
-- [fastlane authentication with Apple Services guide](https://docs.fastlane.tools/getting-started/ios/authentication/)
-
-## Optimizing Homebrew
-
-By default, Homebrew checks for updates at the start of any operation. Homebrew has a
-release cycle that may be more frequent than the GitLab macOS image release cycle. This
-difference in release cycles may cause steps that call `brew` to take extra time to complete
-while Homebrew makes updates.
-
-To reduce build time due to unintended Homebrew updates, set the `HOMEBREW_NO_AUTO_UPDATE` variable in `.gitlab-ci.yml`:
-
-```yaml
-variables:
-  HOMEBREW_NO_AUTO_UPDATE: 1
-```
-
-## Optimizing CocoaPods
-
-If you use CocoaPods in a project, you should consider the following optimizations to improve CI performance.
-
-**CocoaPods CDN**
-
-You can use content delivery network (CDN) access to download packages from the CDN instead of having to clone an entire
-project repository. CDN access is available in CocoaPods 1.8 or later and is supported by all GitLab SaaS runners on macOS.
-
-To enable CDN access, ensure your Podfile starts with:
-
-```ruby
-source 'https://cdn.cocoapods.org/'
-```
-
-**Use GitLab caching**
-
-Use caching in CocoaPods packages in GitLab to only run `pod install`
-when pods change, which can improve build performance.
-
-To [configure caching](../../../ci/caching/index.md) for your project:
-
-1. Add the `cache` configuration to your `.gitlab-ci.yml` file:
-
-    ```yaml
-    cache:
-      key:
-        files:
-         - Podfile.lock
-    paths:
-      - Pods
-    ```
-
-1. Add the [`cocoapods-check`](https://guides.cocoapods.org/plugins/optimising-ci-times.html) plugin to your project.
-1. Update the job script to check for installed dependencies before it calls `pod install`:
-
-    ```shell
-    bundle exec pod check || bundle exec pod install
-    ```
-
-**Include pods in source control**
-
-You can also [include the pods directory in source control](https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control). This eliminates the need to install pods as part of the CI job,
-but it does increase the overall size of your project's repository.
-
-## Known issues and usage constraints
-
-- If the VM image does not include the specific software version you need for your job, the required software must be fetched and installed. This causes an increase in job execution time.
-- It is not possible to bring your own OS image.
-- The keychain for user `gitlab` is not publicly available. You must create a keychain instead.
+<!-- This redirect file can be deleted after <2024-06-01>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/ci/runners/saas/windows_saas_runner.md b/doc/ci/runners/saas/windows_saas_runner.md
index 707e5da9eaa77ffb892c6fbb89d5a552e9adb1bf..905efe928d1abdfd2f0d594c1394d7d9ff7774d8 100644
--- a/doc/ci/runners/saas/windows_saas_runner.md
+++ b/doc/ci/runners/saas/windows_saas_runner.md
@@ -1,98 +1,11 @@
 ---
-stage: Verify
-group: Runner
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: '../hosted_runners/windows.md'
+remove_date: '2024-06-01'
 ---
 
-# SaaS runners on Windows
+This document was moved to [another location](../hosted_runners/windows.md).
 
-DETAILS:
-**Tier:** Free, Premium, Ultimate
-**Offering:** GitLab.com
-**Status:** Beta
-
-SaaS runner on Windows autoscale by launching virtual machines on
-the Google Cloud Platform. This solution uses an
-[autoscaling driver](https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/autoscaler/-/blob/main/docs/README.md)
-developed by GitLab for the [custom executor](https://docs.gitlab.com/runner/executors/custom.html).
-SaaS runners on Windows are in [Beta](../../../policy/experiment-beta-support.md#beta)
-and aren't recommended for production workloads.
-
-We want to keep iterating to get Windows runners in a stable state and
-[generally available](../../../policy/experiment-beta-support.md#generally-available-ga).
-You can follow our work towards this goal in the
-[related epic](https://gitlab.com/groups/gitlab-org/-/epics/2162).
-
-## Machine types available for Windows
-
-| Runner Tag                  | vCPUs | Memory | Storage |
-| --------------------------- | ----- | ------ | ------- |
-| `saas-windows-medium-amd64` | 2     | 7.5 GB | 75 GB   |
-
-## Supported Windows versions
-
-The Windows runner virtual machine instances do not use the GitLab Docker executor. This means that you can't specify
-[`image`](../../../ci/yaml/index.md#image) or [`services`](../../../ci/yaml/index.md#services) in your pipeline configuration.
-
-You can execute your job in one of the following Windows versions:
-
-| Version      | Status        |
-|--------------|---------------|
-| Windows 2022 | `Beta`        |
-| Windows 2019 | `Deprecated` (Removal in 17.0) |
-
-You can find a full list of available pre-installed software in
-the [pre-installed software documentation](https://gitlab.com/gitlab-org/ci-cd/shared-runners/images/gcp/windows-containers/blob/main/cookbooks/preinstalled-software/README.md).
-
-NOTE:
-We are only supporting a single version of Windows at this time.
-
-## Supported shell
-
-SaaS runners on Windows have PowerShell configured as the shell.
-The `script` section of your `.gitlab-ci.yml` file therefore requires PowerShell commands.
-
-## Example `.gitlab-ci.yml` file
-
-Below is a sample `.gitlab-ci.yml` file that shows how to start using the runners for Windows:
-
-```yaml
-.windows_job:
-  tags:
-    - saas-windows-medium-amd64
-  before_script:
-    - Set-Variable -Name "time" -Value (date -Format "%H:%m")
-    - echo ${time}
-    - echo "started by ${GITLAB_USER_NAME}"
-
-build:
-  extends:
-    - .windows_job
-  stage: build
-  script:
-    - echo "running scripts in the build job"
-
-test:
-  extends:
-    - .windows_job
-  stage: test
-  script:
-    - echo "running scripts in the test job"
-```
-
-## Known issues
-
-- For more information about support for Beta features, see [Beta](../../../policy/experiment-beta-support.md#beta).
-- The average provisioning time for a new Windows virtual machine (VM) is five minutes, so
-  you might notice slower start times for builds on the Windows runner
-  fleet during the Beta. Updating the autoscaler to enable the pre-provisioning
-  of virtual machines is proposed in a future release. This update is intended to
-  significantly reduce the time it takes to provision a VM on the Windows fleet.
-  For more information, see [issue 32](https://gitlab.com/gitlab-org/ci-cd/custom-executor-drivers/autoscaler/-/issues/32).
-- The Windows runner fleet may be unavailable occasionally
-  for maintenance or updates.
-- The job may stay in a pending state for longer than the
-  Linux runners.
-- There is the possibility that we introduce breaking changes which will
-  require updates to pipelines that are using the Windows runner
-  fleet.
+<!-- This redirect file can be deleted after <2024-06-01>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
diff --git a/doc/user/application_security/api_fuzzing/performance.md b/doc/user/application_security/api_fuzzing/performance.md
index eb1253d37928411f60bde72f13945c9c5b3c597f..04f7cd832a40e5ce8d360f4cc71f8c3656773dba 100644
--- a/doc/user/application_security/api_fuzzing/performance.md
+++ b/doc/user/application_security/api_fuzzing/performance.md
@@ -69,10 +69,10 @@ The following sections document various options for addressing performance issue
 
 ### Using a larger runner
 
-One of the easiest performance boosts can be achieved using a [larger runner](../../../ci/runners/saas/linux_saas_runner.md#machine-types-available-for-linux-x86-64)
+One of the easiest performance boosts can be achieved using a [larger runner](../../../ci/runners/hosted_runners/linux.md#machine-types-available-for-linux-x86-64)
 with API Fuzzing. This table shows statistics collected during benchmarking of a Java Spring Boot REST API. In this benchmark, the target and API Fuzzing share a single runner instance.
 
-| SaaS runner on Linux tag           | Requests per Second |
+| Hosted runner on Linux tag           | Requests per Second |
 |------------------------------------|-----------|
 | `saas-linux-small-amd64` (default) | 255 |
 | `saas-linux-medium-amd64`          | 400 |
diff --git a/doc/user/application_security/api_fuzzing/troubleshooting.md b/doc/user/application_security/api_fuzzing/troubleshooting.md
index 15bee118c24f922d034951282e67653dcb5f5294..a68361d68126846e9ea8f58763cdd619bc76d050 100644
--- a/doc/user/application_security/api_fuzzing/troubleshooting.md
+++ b/doc/user/application_security/api_fuzzing/troubleshooting.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 ## API Fuzzing job times out after N hours
 
-For larger repositories, the API Fuzzing job could time out on the [small SaaS runner on Linux](../../../ci/runners/saas/linux_saas_runner.md#machine-types-available-for-linux-x86-64), which is set per default. If this happens in your jobs, you should scale up to a [larger runner](performance.md#using-a-larger-runner).
+For larger repositories, the API Fuzzing job could time out on the [small hosted runner on Linux](../../../ci/runners/hosted_runners/linux.md#machine-types-available-for-linux-x86-64), which is set per default. If this happens in your jobs, you should scale up to a [larger runner](performance.md#using-a-larger-runner).
 
 See the following documentation sections for assistance:
 
diff --git a/doc/user/application_security/dast_api/performance.md b/doc/user/application_security/dast_api/performance.md
index 22f621539aaa4c23c72f20b4016e1cdee9ea68c7..9f0cebd6d7babdf34cb1953bc4b62e77373745c3 100644
--- a/doc/user/application_security/dast_api/performance.md
+++ b/doc/user/application_security/dast_api/performance.md
@@ -69,9 +69,9 @@ The following sections document various options for addressing performance issue
 
 ### Using a larger runner
 
-One of the easiest performance boosts can be achieved using a [larger runner](../../../ci/runners/saas/linux_saas_runner.md#machine-types-available-for-linux-x86-64) with DAST API. This table shows statistics collected during benchmarking of a Java Spring Boot REST API. In this benchmark, the target and DAST API share a single runner instance.
+One of the easiest performance boosts can be achieved using a [larger runner](../../../ci/runners/hosted_runners/linux.md#machine-types-available-for-linux-x86-64) with DAST API. This table shows statistics collected during benchmarking of a Java Spring Boot REST API. In this benchmark, the target and DAST API share a single runner instance.
 
-| SaaS runner on Linux tag           | Requests per Second |
+| Hosted runner on Linux tag           | Requests per Second |
 |------------------------------------|-----------|
 | `saas-linux-small-amd64` (default) | 255 |
 | `saas-linux-medium-amd64`          | 400 |
diff --git a/doc/user/application_security/dast_api/troubleshooting.md b/doc/user/application_security/dast_api/troubleshooting.md
index 58fe00a479e495b8c8607f711e150721cf0308e5..82fd5aa9e7f3999ade2a93cac0423228cae0255c 100644
--- a/doc/user/application_security/dast_api/troubleshooting.md
+++ b/doc/user/application_security/dast_api/troubleshooting.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 ## DAST API job times out after N hours
 
-For larger repositories, the DAST API job could time out on the [small SaaS runner on Linux](../../../ci/runners/saas/linux_saas_runner.md#machine-types-available-for-linux-x86-64), which is set per default. If this happens in your jobs, you should scale up to a [larger runner](performance.md#using-a-larger-runner).
+For larger repositories, the DAST API job could time out on the [small hosted runner on Linux](../../../ci/runners/hosted_runners/linux.md#machine-types-available-for-linux-x86-64), which is set per default. If this happens in your jobs, you should scale up to a [larger runner](performance.md#using-a-larger-runner).
 
 See the following documentation sections for assistance:
 
diff --git a/doc/user/application_security/sast/troubleshooting.md b/doc/user/application_security/sast/troubleshooting.md
index 22aecfb94b889c572c80b2755ce264c97edcc8c8..de39981d0189b250b443b57c2bc3cf548b4071f6 100644
--- a/doc/user/application_security/sast/troubleshooting.md
+++ b/doc/user/application_security/sast/troubleshooting.md
@@ -105,7 +105,7 @@ To try to resolve this issue you can:
 
 - Choose a lower [level of effort](index.md#security-scanner-configuration).
 - Set the CI/CD variable `JAVA_OPTS` to replace the default `-XX:MaxRAMPercentage=80`, e.g. `-XX:MaxRAMPercentage=90`.
-- [Tag a larger runner](../../../ci/runners/saas/linux_saas_runner.md#machine-types-available-for-linux-x86-64) in your `spotbugs-sast` job.
+- [Tag a larger runner](../../../ci/runners/hosted_runners/linux.md#machine-types-available-for-linux-x86-64) in your `spotbugs-sast` job.
 
 ### Links