From ad7f84a62fe18cd447194ef30dcce91186b6eec8 Mon Sep 17 00:00:00 2001
From: Junko Suzuki <pnsk@github.com>
Date: Fri, 27 Sep 2024 23:41:21 +0900
Subject: [PATCH 1/8] Add Elasticsearch migrations issue to our release notes
 (#52437)

Co-authored-by: Sophie <29382425+sophietheking@users.noreply.github.com>
---
 data/release-notes/enterprise-server/3-13/3.yml | 2 ++
 data/release-notes/enterprise-server/3-14/0.yml | 2 ++
 data/release-notes/enterprise-server/3-14/1.yml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/data/release-notes/enterprise-server/3-13/3.yml b/data/release-notes/enterprise-server/3-13/3.yml
index f42fd4fb68..13b84b216d 100644
--- a/data/release-notes/enterprise-server/3-13/3.yml
+++ b/data/release-notes/enterprise-server/3-13/3.yml
@@ -75,6 +75,8 @@ sections:
       Fixes and improvements for the git core module.
     - |
       When enabling GitHub Advanced Security for an organization, active committers in other organizations were not accounted for.
+    - |
+      Following an upgrade, Elasticsearch search migrations are sometimes incorrectly reported as failing in the audit log, even though the migrations completed successfully. [Updated: 2024-09-27]
   changes:
     - |
       Actions KPI logs are disabled by default to reduce log size.
diff --git a/data/release-notes/enterprise-server/3-14/0.yml b/data/release-notes/enterprise-server/3-14/0.yml
index 7901a2de05..656dba44ba 100644
--- a/data/release-notes/enterprise-server/3-14/0.yml
+++ b/data/release-notes/enterprise-server/3-14/0.yml
@@ -215,6 +215,8 @@ sections:
       Services may respond with a 503 status due to an out of date haproxy configuration. This can usually be resolved with a `ghe-config-apply` run.
     - |
       When enabling automatic update checks for the first time in the Management Console, the status is not dynamically reflected until the "Updates" page is reloaded.
+    - |
+      Following an upgrade, Elasticsearch search migrations are sometimes incorrectly reported as failing in the audit log, even though the migrations completed successfully. [Updated: 2024-09-27]
 
   deprecations:
     - |
diff --git a/data/release-notes/enterprise-server/3-14/1.yml b/data/release-notes/enterprise-server/3-14/1.yml
index 36a7ac9248..6d07e8a84b 100644
--- a/data/release-notes/enterprise-server/3-14/1.yml
+++ b/data/release-notes/enterprise-server/3-14/1.yml
@@ -32,6 +32,8 @@ sections:
       Custom links to other repositories displayed incorrect breadcrumbs.
     - |
       The Secret Scanning Push Protection custom resource link set at the Enterprise level was not being displayed to users being blocked when pushing secrets to a repository using git through the command line interface.
+    - |
+      Following an upgrade, Elasticsearch search migrations are sometimes incorrectly reported as failing in the audit log, even though the migrations completed successfully. [Updated: 2024-09-27]
   changes:
     - |
       For instances deployed on Amazon Web Services (AWS), site administrators can configure regional AWS STS endpoints for OIDC from the Management Console.

From 7a138c02e12dc70d20088e655449222b890c1963 Mon Sep 17 00:00:00 2001
From: chiph <chiph@github.com>
Date: Fri, 27 Sep 2024 10:13:52 -0500
Subject: [PATCH 2/8] Update transferring-a-repository.md (#52059)

Co-authored-by: Patrick Knight <patrick-knight@github.com>
Co-authored-by: Isaac Brown <101839405+isaacmbrown@users.noreply.github.com>
Co-authored-by: Felicity Chapman <felicitymay@github.com>
---
 .../transferring-a-repository.md                         | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
index e08514bb38..d0f42800b8 100644
--- a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
+++ b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
@@ -27,6 +27,15 @@ When you transfer a repository to a new owner, they can immediately administer t
 
 Prerequisites for repository transfers:
 * When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %}
+* To transfer a repository you must have administrator access to the repository.
+{%- ifversion fpt or ghec %}
+* Repositories on {% data variables.product.prodname_dotcom_the_website %} can only be transferred to other owners on {% data variables.product.prodname_dotcom_the_website %}.
+{%- ifversion ghec %}
+* Repositories cannot be transferred into an {% data variables.enterprise.prodname_emu_enterprise %} from outside the enterprise, or vice versa.
+{%- endif %}
+{%- elsif ghes %}
+* Repositories can only be transferred to an owner within the same {% data variables.product.prodname_ghe_server %} instance. For more information about moving a repository from {% data variables.product.prodname_ghe_server %} to {% data variables.product.prodname_ghe_cloud %}, see "[AUTOTITLE](/migrations/using-github-enterprise-importer/migrating-between-github-products/migrating-repositories-from-github-enterprise-server-to-github-enterprise-cloud)."
+{%- endif %}
 * To transfer a repository that you own to an organization, you must have permission to create a repository in the target organization.
 * The target account must not have a repository with the same name, or a fork in the same network.
 * The original owner of the repository is added as a collaborator on the transferred repository. Other collaborators to the transferred repository remain intact.

From 58738e33ce181e7e974432f7ced4264a49462910 Mon Sep 17 00:00:00 2001
From: Nick Freiter <52747882+ngfreiter@users.noreply.github.com>
Date: Fri, 27 Sep 2024 12:12:46 -0400
Subject: [PATCH 3/8] Differentiate between external collab rules for private
 vs internal repos (#52459)

---
 .../about-permissions-and-visibility-of-forks.md                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-permissions-and-visibility-of-forks.md b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-permissions-and-visibility-of-forks.md
index 60e2bf164c..4186a1a668 100644
--- a/content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-permissions-and-visibility-of-forks.md
+++ b/content/pull-requests/collaborating-with-pull-requests/working-with-forks/about-permissions-and-visibility-of-forks.md
@@ -14,7 +14,7 @@ topics:
 
 {% data reusables.repositories.you-can-fork %}
 
-If you fork a private repository that belongs to a personal account, external collaborators also get access to the fork. If you fork a private {% ifversion ghec or ghes %}or internal {% endif %}repository that belongs to an organization, teams within the organization get access to the fork, but external collaborators do not. You can add an external collaborator to the fork, but only if the external collaborator also has access to the upstream repository.
+If you fork a private repository that belongs to a personal account, external collaborators also get access to the fork. If you fork a private {% ifversion ghec or ghes %}or internal {% endif %}repository that belongs to an organization, teams within the organization get access to the fork, but external collaborators do not. You can add an external collaborator to a fork of a private repository that belongs to an organization if you are an owner of that organization or if your organization allows repository administrators to invite external collaborators.{% ifversion ghec or ghes %} You can add an external collaborator to a fork of an internal repository that belongs to an organization if the external collaborator also has access to the upstream repository.{% endif %}
 
 {% ifversion fpt or ghec %}
 

From 8d452ebc55ae4e3af59cf3d6f45608f3cec14d37 Mon Sep 17 00:00:00 2001
From: Joe Clark <31087804+jc-clark@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:41:15 -0700
Subject: [PATCH 4/8] Introduce new variables for release phase terminology
 (#52375)

Co-authored-by: Sunbrye Ly <56200261+sunbrye@users.noreply.github.com>
---
 .../personalizing-your-profile.md             |  2 +-
 .../about-your-personal-dashboard.md          |  4 +--
 .../about-self-hosted-runners.md              |  2 +-
 ...customizing-the-containers-used-by-jobs.md |  2 +-
 .../metadata-syntax-for-github-actions.md     |  2 +-
 .../running-jobs-on-larger-runners.md         |  2 +-
 .../command-line-utilities.md                 |  2 +-
 content/admin/all-releases.md                 | 10 +++----
 .../configuring-interactive-maps.md           |  2 +-
 ...rsonal-access-tokens-in-your-enterprise.md |  2 +-
 ...r-owned-repositories-in-your-enterprise.md |  2 +-
 ...r-owned-repositories-in-your-enterprise.md |  2 +-
 ...ithub-actions-with-google-cloud-storage.md |  2 +-
 ...tion-and-provisioning-with-pingfederate.md |  2 +-
 ...configuring-scim-provisioning-for-users.md |  8 +++---
 ...configuring-scim-provisioning-with-okta.md |  2 +-
 .../user-provisioning-with-scim-on-ghes.md    |  4 +--
 ...aming-the-audit-log-for-your-enterprise.md |  2 +-
 .../deferring-database-seeding.md             |  2 +-
 ...ting-a-health-check-for-your-enterprise.md |  2 +-
 ...ng-a-user-access-token-for-a-github-app.md |  2 +-
 .../requirements-for-listing-an-app.md        |  4 +--
 ...ewing-your-git-large-file-storage-usage.md |  4 +--
 .../viewing-your-github-actions-usage.md      |  4 +--
 ...nced-billing-for-git-large-file-storage.md |  2 +-
 .../about-the-billing-cycle.md                |  2 +-
 ...hanced-billing-platform-for-enterprises.md |  4 +--
 ...adding-seats-to-your-enterprise-account.md |  2 +-
 .../charging-business-units.md                |  2 +-
 ...estimating-spending-for-your-enterprise.md |  2 +-
 .../gathering-insights-on-your-spending.md    |  2 +-
 .../index.md                                  |  2 +-
 ...ng-your-payment-and-billing-information.md |  2 +-
 .../preventing-overspending.md                |  2 +-
 ...roles-for-the-enhanced-billing-platform.md |  2 +-
 .../about-code-scanning-alerts.md             |  2 +-
 ...ing-your-configuration-of-default-setup.md |  4 +--
 .../set-code-scanning-merge-protection.md     |  2 +-
 ...analyzing-your-code-with-codeql-queries.md |  2 +-
 .../customizing-analysis-with-codeql-packs.md |  2 +-
 .../creating-and-working-with-codeql-packs.md |  2 +-
 .../using-the-codeql-model-editor.md          |  2 +-
 .../viewing-and-updating-dependabot-alerts.md |  2 +-
 ...e-rules-to-prioritize-dependabot-alerts.md |  4 +--
 ...ion-options-for-the-dependabot.yml-file.md |  8 +++---
 .../evaluating-alerts.md                      |  2 +-
 .../metrics-for-custom-patterns.md            |  2 +-
 ...of-generic-secrets-with-secret-scanning.md |  2 +-
 ...-writing-repository-security-advisories.md |  2 +-
 .../about-security-overview.md                |  2 +-
 .../assessing-adoption-code-security.md       |  4 +--
 .../filtering-alerts-in-security-overview.md  |  2 +-
 .../connecting-to-a-private-network.md        |  2 +-
 ...using-github-codespaces-with-github-cli.md |  2 +-
 .../codespaces/getting-started/deep-dive.md   |  2 +-
 .../the-githubdev-web-based-editor.md         |  2 +-
 .../syntax-for-githubs-form-schema.md         |  2 +-
 .../using-the-content-linter.md               |  2 +-
 .../style-guide.md                            |  6 ++---
 .../creating-screenshots.md                   |  4 +--
 .../versioning-documentation.md               |  2 +-
 .../about-building-copilot-extensions.md      |  2 +-
 .../copilot-extensions-glossary.md            |  2 +-
 ...-availability-of-your-copilot-extension.md |  2 +-
 ...features-for-copilot-in-your-enterprise.md |  2 +-
 ...ating-a-custom-model-for-github-copilot.md |  8 +++---
 ...y-data-for-copilot-in-your-organization.md |  2 +-
 ...g-github-copilot-questions-in-githubcom.md |  6 ++---
 ...ng-github-copilot-questions-in-your-ide.md |  2 +-
 ...that-matches-github-copilot-suggestions.md |  2 +-
 .../using-copilot-text-completion.md          |  2 +-
 ...github-codespaces-with-github-classroom.md |  2 +-
 .../managing-your-theme-settings.md           |  2 +-
 .../saving-repositories-with-stars.md         |  2 +-
 ...ly-access-releases-with-feature-preview.md | 10 +++----
 .../get-started/using-github/github-mobile.md |  6 ++---
 .../using-github/supported-browsers.md        |  4 +--
 .../basic-writing-and-formatting-syntax.md    |  4 +--
 .../prototyping-with-ai-models.md             |  6 ++---
 .../migrating-graphql-global-node-ids.md      |  6 ++---
 content/graphql/guides/using-the-explorer.md  |  2 +-
 .../filtering-projects.md                     |  4 +--
 .../adding-items-to-your-project.md           |  2 +-
 .../using-issues/about-slash-commands.md      |  2 +-
 .../creating-a-branch-for-an-issue.md         |  2 +-
 ...-in-the-audit-log-for-your-organization.md |  2 +-
 .../about-custom-organization-roles.md        |  2 +-
 ...ng-dependency-changes-in-a-pull-request.md |  2 +-
 .../renaming-a-branch.md                      |  2 +-
 .../configuring-tag-protection-rules.md       |  2 +-
 ...ing-the-push-policy-for-your-repository.md |  2 +-
 .../managing-releases-in-a-repository.md      |  2 +-
 ...deployment-activity-for-your-repository.md |  2 +-
 .../rest/codespaces/organization-secrets.md   |  2 +-
 .../rest/copilot/copilot-user-management.md   |  2 +-
 content/rest/dependabot/alerts.md             |  2 +-
 .../enterprise-admin/management-console.md    |  2 +-
 content/rest/migrations/source-imports.md     |  2 +-
 .../searching-discussions.md                  |  2 +-
 content/webhooks/about-webhooks.md            |  2 +-
 .../configuration-variables-beta-note.md      |  2 +-
 ...m-deployment-protection-rules-beta-note.md |  2 +-
 .../actions/deployment-history-beta-note.md   |  2 +-
 .../starter-workflows-beta.md                 |  2 +-
 .../beta-malware-advisories.md                |  2 +-
 .../deprecating_auth_with_query_parameters.md |  2 +-
 ...ation-metadata-git-events-release-phase.md |  2 +-
 .../authentication-methods-with-metadata.md   |  2 +-
 .../enhanced-billing-platform-licenses.md     |  2 +-
 .../billing/enhanced-billing-platform.md      |  2 +-
 ...espaces-for-verified-teachers-beta-note.md |  2 +-
 .../beta-alert-tracking-in-issues.md          |  2 +-
 .../beta-larger-runners-support.md            |  2 +-
 .../code-scanning/beta-model-packs.md         |  2 +-
 .../code-scanning/beta-org-enable-all.md      |  2 +-
 .../code-scanning/beta-threat-models-cli.md   |  2 +-
 .../code-scanning/beta-threat-models.md       |  2 +-
 .../codespaces-jetbrains-beta-note.md         |  2 +-
 data/reusables/command-palette/beta-note.md   |  2 +-
 data/reusables/community/issue-forms-beta.md  |  2 +-
 data/reusables/copilot/chat-beta-indexing.md  |  2 +-
 data/reusables/copilot/chat-dotcom-beta.md    |  2 +-
 .../copilot/content-exclusion-note.md         |  2 +-
 ...t-exclusions-availability-and-beta-note.md |  2 +-
 .../copilot/copilot-chat-models-beta-note.md  |  2 +-
 .../copilot/copilot-chat-models-list.md       |  2 +-
 .../copilot/copilot-enterprise-enable.md      |  2 +-
 .../copilot/copilot-extensions/beta-note.md   |  2 +-
 .../copilot/enabling-chat-enterprise.md       |  6 ++---
 .../copilot/enabling-chat-organization.md     |  2 +-
 .../copilot/enabling-copilot-chat-beta.md     |  8 +++---
 data/reusables/copilot/sku-isolation.md       |  2 +-
 .../dependabot/configuration-options.md       |  2 +-
 ...abot-grouped-security-updates-beta-note.md |  2 +-
 .../dependabot-version-updates-groups-beta.md |  2 +-
 .../dependabot/vulnerable-calls-beta.md       |  2 +-
 .../dependency-review-action-beta-note.md     |  2 +-
 .../approved-domains-beta-note.md             |  2 +-
 .../sso-redirect-release-phase.md             |  2 +-
 data/reusables/enterprise/editor-role-note.md |  2 +-
 .../copilot-chat-availability.md              |  4 +--
 .../copilot-chat-callout-jetbrains-only.md    |  4 +--
 .../copilot-chat-jetbrains-beta.md            |  2 +-
 .../gated-features/secret-scanning.md         |  2 +-
 .../custom-org-roles-create-new-step.md       |  2 +-
 .../follow-organizations-beta.md              |  2 +-
 .../security-manager-beta-note.md             |  2 +-
 .../team-discussions-api-deprecation.md       |  4 +--
 .../team-discussions-deprecation.md           |  4 +--
 .../team-discussions-migration.md             |  2 +-
 .../container-registry-ghes-beta.md           |  2 +-
 ...delete-with-github-token-using-api-beta.md |  2 +-
 .../projects/org-templates-release-stage.md   |  2 +-
 .../projects/tasklists-release-stage.md       |  2 +-
 .../scim-custom-mappings-supported-change.md  |  2 +-
 .../release-notes/scim-in-3-6-series.md       |  2 +-
 .../scim-saml-tokens-known-issue.md           |  2 +-
 .../about-push-rule-delegated-bypass.md       |  2 +-
 .../repositories/managing-delegated-bypass.md |  2 +-
 .../repository-collaborators-release-phase.md |  2 +-
 .../repositories/ruleset-beta-note.md         |  4 +--
 .../scim/after-you-configure-saml.md          |  2 +-
 .../scim/ghec-open-scim-release-phase.md      |  2 +-
 data/reusables/scim/ghes-beta-note.md         |  6 ++---
 .../search/classic-search-code-search-note.md |  2 +-
 data/reusables/secret-scanning/api-beta.md    |  2 +-
 .../secret-scanning/beta-dry-runs.md          |  2 +-
 .../beta-prs-discussions-wikis-scanned.md     |  2 +-
 .../generic-secret-detection-ai.md            |  4 +--
 .../non-provider-patterns-beta.md             |  2 +-
 .../secret-scanning/push-protection-beta.md   |  2 +-
 ...sh-protection-delegate-bypass-beta-note.md |  2 +-
 .../push-protection-org-metrics-beta.md       |  2 +-
 .../push-protection-web-UI-uploads-beta.md    |  2 +-
 .../secret-scanning-user-owned-repos-beta.md  |  2 +-
 .../beta-org-risk-coverage.md                 |  2 +-
 .../beta-overview-dashboard.md                |  2 +-
 data/reusables/ssh/fingerprints.md            |  2 +-
 data/reusables/support/scope-of-support.md    |  2 +-
 data/reusables/support/zendesk-old-tickets.md |  2 +-
 data/reusables/user-settings/pat-v2-beta.md   |  2 +-
 .../user-settings/pat-v2-org-opt-in.md        |  2 +-
 .../webhooks/discussions-webhooks-beta.md     |  2 +-
 data/variables/product.yml                    |  2 +-
 data/variables/release-phases.yml             | 26 +++++++++++++++++++
 185 files changed, 263 insertions(+), 237 deletions(-)
 create mode 100644 data/variables/release-phases.yml

diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
index 5246ef8005..801b527f80 100644
--- a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
+++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md
@@ -212,7 +212,7 @@ To stop private contributions from counting toward your Achievements, or to turn
 
 {% note %}
 
-**Note:** This feature is currently in beta and subject to change.
+**Note:** This feature is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md
index 0e034536e1..d843ce3deb 100644
--- a/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md
+++ b/content/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-user-account-settings/about-your-personal-dashboard.md
@@ -51,7 +51,7 @@ You can also find a list of your recently visited repositories, teams, and proje
 
 {% note %}
 
-**Note:** The new feed is currently in public beta and subject to change.
+**Note:** The new feed is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
@@ -91,7 +91,7 @@ For more information about following people and starring repositories, see "[AUT
 
 {% note %}
 
-**Note:** This new tab is currently in public beta and subject to change.
+**Note:** This new tab is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md
index c62301e6e1..f4bea918f6 100644
--- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md
+++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners.md
@@ -117,7 +117,7 @@ The following operating systems are supported for the self-hosted runner applica
 The following processor architectures are supported for the self-hosted runner application.
 
 * `x64` - Linux, macOS, Windows.
-* `ARM64` - Linux, macOS{% ifversion actions-windows-arm %}, Windows (currently in beta){% endif %}.
+* `ARM64` - Linux, macOS{% ifversion actions-windows-arm %}, Windows (currently in {% data variables.release-phases.public_preview %}){% endif %}.
 * `ARM32` - Linux.
 
 {% ifversion ghes %}
diff --git a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/customizing-the-containers-used-by-jobs.md b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/customizing-the-containers-used-by-jobs.md
index 47717c8709..a6db11fd05 100644
--- a/content/actions/hosting-your-own-runners/managing-self-hosted-runners/customizing-the-containers-used-by-jobs.md
+++ b/content/actions/hosting-your-own-runners/managing-self-hosted-runners/customizing-the-containers-used-by-jobs.md
@@ -11,7 +11,7 @@ shortTitle: Customize containers used by jobs
 
 {% note %}
 
-**Note**: This feature is currently in beta and is subject to change.
+**Note**: This feature is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% endnote %}
 
diff --git a/content/actions/sharing-automations/creating-actions/metadata-syntax-for-github-actions.md b/content/actions/sharing-automations/creating-actions/metadata-syntax-for-github-actions.md
index ae4ef0e07e..2662012421 100644
--- a/content/actions/sharing-automations/creating-actions/metadata-syntax-for-github-actions.md
+++ b/content/actions/sharing-automations/creating-actions/metadata-syntax-for-github-actions.md
@@ -88,7 +88,7 @@ For example, if a workflow defined the `num-octocats` and `octocat-eye-color` in
 
 ### `inputs.<input_id>.deprecationMessage`
 
-**Optional** If the input parameter is used, this `string` is logged as a warning message. You can use this warning to notify users that the input is deprecated and mention any alternatives.
+**Optional** If the input parameter is used, this `string` is logged as a warning message. You can use this warning to notify users that the input is {% data variables.release-phases.closing_down %} and mention any alternatives.
 
 ## `outputs` for Docker container and JavaScript actions
 
diff --git a/content/actions/using-github-hosted-runners/using-larger-runners/running-jobs-on-larger-runners.md b/content/actions/using-github-hosted-runners/using-larger-runners/running-jobs-on-larger-runners.md
index 1f4680447b..b1ea7ab100 100644
--- a/content/actions/using-github-hosted-runners/using-larger-runners/running-jobs-on-larger-runners.md
+++ b/content/actions/using-github-hosted-runners/using-larger-runners/running-jobs-on-larger-runners.md
@@ -199,7 +199,7 @@ Because macOS arm64 does not support Node 12, macOS {% data variables.actions.ho
 
 {% note %}
 
-**Note:** ARM-powered runners are currently in beta and are subject to change.
+**Note:** ARM-powered runners are currently in {% data variables.release-phases.public_preview %} and are subject to change.
 
 {% endnote %}
 
diff --git a/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md
index 7495fd7b4e..928202f789 100644
--- a/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md
+++ b/content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md
@@ -210,7 +210,7 @@ $ ghe-es-index-status -do | column -ts,
 
 ### ghe-legacy-github-services-report
 
-This utility lists repositories on your appliance that use {% data variables.product.prodname_dotcom %} Services, an integration method that will be discontinued on October 1, 2018. Users on your appliance may have set up {% data variables.product.prodname_dotcom %} Services to create notifications for pushes to certain repositories. For more information, see "[Announcing the deprecation of {% data variables.product.prodname_dotcom %} Services](https://developer.github.com/changes/2018-04-25-github-services-deprecation/)" on {% data variables.product.prodname_blog %}. For more information about this command or for additional options, use the `-h` flag.
+This utility lists repositories on your appliance that use {% data variables.product.prodname_dotcom %} Services, an integration that was discontinued on October 1, 2018. Users on your appliance may have set up {% data variables.product.prodname_dotcom %} Services to create notifications for pushes to certain repositories. For more information, see "[Announcing the deprecation of {% data variables.product.prodname_dotcom %} Services](https://developer.github.com/changes/2018-04-25-github-services-deprecation/)" on {% data variables.product.prodname_blog %}. For more information about this command or for additional options, use the `-h` flag.
 
 ```shell
 ghe-legacy-github-services-report
diff --git a/content/admin/all-releases.md b/content/admin/all-releases.md
index c4d75f2ed6..5db925cb40 100644
--- a/content/admin/all-releases.md
+++ b/content/admin/all-releases.md
@@ -1,6 +1,6 @@
 ---
 title: GitHub Enterprise Server releases
-intro: "Review information for each version of {% data variables.product.prodname_ghe_server %}: deprecation dates, links to documentation, and minimum recommended versions of supporting applications."
+intro: "Review information for each version of {% data variables.product.prodname_ghe_server %}: {% data variables.release-phases.closing_down %} dates, links to documentation, and minimum recommended versions of supporting applications."
 allowTitleToDifferFromFilename: true
 versions:
   ghes: '*'
@@ -16,11 +16,11 @@ shortTitle: Releases
 
 {% data variables.product.company_short %} supports the **four** most recent feature releases.
 
-We provide documentation for both supported and deprecated versions of {% data variables.product.product_name %}. We do not maintain or update the documentation for deprecated versions.
+We provide documentation for both supported and unsupported versions of {% data variables.product.product_name %}. We do not maintain or update the documentation for unsupported versions.
 
 For information about the latest release, see the [{% data variables.product.prodname_enterprise %}](https://github.com/enterprise) website.
 
-| Version | Release | Deprecation | Supported | Release notes | Documentation |
+| Version | Release | {% data variables.release-phases.closing_down_caps %} date | Supported | Release notes | Documentation |
 | :- | :- | :- | :-: | :- | :- |
 {%- for version in enterpriseServerReleases.supported %}
 {%- assign currentDate = 'now' | date: '%s' %}
@@ -34,11 +34,11 @@ For information about the latest release, see the [{% data variables.product.pro
 | {{version}} | {{enterpriseServerReleases.dates[version].releaseDate}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | {% octicon "x" aria-label="Not supported" %} | [{{version}} release notes](https://enterprise.github.com/releases/series/{{version}}) | [{{version}} documentation](/enterprise/{{version}}) |
 {%- endfor %}
 
-### Deprecated developer documentation
+### Developer documentation that is {% data variables.release-phases.closing_down %}
 
 We hosted developer documentation for {% data variables.product.product_name %} on a separate site until the 2.17 release. We provide developer documentation for version 2.16 and earlier, but do not maintain or update the documentation.
 
-| Version | Release | Deprecation | Developer documentation |
+| Version | Release | {% data variables.release-phases.closing_down_caps %} date | Developer documentation |
 | :- | :- | :- | :- |
 {%- for version in enterpriseServerReleases.deprecatedReleasesOnDeveloperSite %}
 | {{version}} | {{enterpriseServerReleases.dates[version].releaseDate}} | {{enterpriseServerReleases.dates[version].deprecationDate}} | [{{version}} developer documentation](https://developer.github.com/enterprise/{{version}}) |
diff --git a/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-interactive-maps.md b/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-interactive-maps.md
index d2eda54ec5..e4e43707b6 100644
--- a/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-interactive-maps.md
+++ b/content/admin/configuring-settings/configuring-user-applications-for-your-enterprise/configuring-interactive-maps.md
@@ -23,7 +23,7 @@ To enable interactive maps, you must provide authentication credentials for Azur
 
 {% warning %}
 
-**Warning**: Authentication with Azure Maps using an API token is deprecated in {% data variables.product.product_name %} {{ allVersions[currentVersion].currentRelease }}.{% ifversion ghes = 3.10 %}4{% elsif ghes = 3.11 %}1{% endif %} and later. If you upgrade to the latest release of {% data variables.product.product_name %} on an instance already configured to authenticate with an API token, interactive maps will be disabled. You must reconfigure authentication using role-based access control (RBAC) for an application on a Microsoft Entra ID (previously known as Azure AD) tenant. {% data reusables.enterprise.azure-maps-auth-deprecation-link %}
+**Warning**: Authentication with Azure Maps using an API token is {% data variables.release-phases.retired %} in {% data variables.product.product_name %} {{ allVersions[currentVersion].currentRelease }}.{% ifversion ghes = 3.10 %}4{% elsif ghes = 3.11 %}1{% endif %} and later. If you upgrade to the latest release of {% data variables.product.product_name %} on an instance already configured to authenticate with an API token, interactive maps will be disabled. You must reconfigure authentication using role-based access control (RBAC) for an application on a Microsoft Entra ID (previously known as Azure AD) tenant. {% data reusables.enterprise.azure-maps-auth-deprecation-link %}
 
 {% endwarning %}
 
diff --git a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md
index fceaff758e..dda4e4fc4e 100644
--- a/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md
+++ b/content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-personal-access-tokens-in-your-enterprise.md
@@ -12,7 +12,7 @@ redirect_from:
 
 **Note**: {% data reusables.user-settings.pat-v2-beta %}
 
-During the beta, enterprises must opt in to {% data variables.product.pat_v2 %}s. If your enterprise has not already opted-in, then you will be prompted to opt-in and set policies when you follow the steps below.
+During the {% data variables.release-phases.public_preview %}, enterprises must opt in to {% data variables.product.pat_v2 %}s. If your enterprise has not already opted-in, then you will be prompted to opt-in and set policies when you follow the steps below.
 
 Even if an enterprise has not opted in to {% data variables.product.pat_v2 %}s, organizations owned by the enterprise can still opt in. All users, including {% data variables.product.prodname_emus %}, can create {% data variables.product.pat_v2 %}s that can access resources owned by the user (such as repositories created under their account) even if the enterprise has not opted in to {% data variables.product.pat_v2 %}s.
 
diff --git a/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
index cea0364e04..5d73fa0839 100644
--- a/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/accessing-user-owned-repositories-in-your-enterprise.md
@@ -15,7 +15,7 @@ redirect_from:
 
 {% note %}
 
-**Note:** Temporarily accessing user-owned repositories is currently in beta for {% data variables.product.prodname_emus %} and subject to change.
+**Note:** Temporarily accessing user-owned repositories is currently in {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_emus %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
index 0f6d21bc45..89ceaabfa8 100644
--- a/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-repositories-in-your-enterprise/viewing-user-owned-repositories-in-your-enterprise.md
@@ -15,7 +15,7 @@ redirect_from:
 
 {% note %}
 
-**Note:** Viewing user-owned repositories is currently in beta for {% data variables.product.prodname_emus %} and subject to change.
+**Note:** Viewing user-owned repositories is currently in {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_emus %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/admin/managing-github-actions-for-your-enterprise/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-google-cloud-storage.md b/content/admin/managing-github-actions-for-your-enterprise/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-google-cloud-storage.md
index a278f2c3ca..f4b48b6292 100644
--- a/content/admin/managing-github-actions-for-your-enterprise/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-google-cloud-storage.md
+++ b/content/admin/managing-github-actions-for-your-enterprise/enabling-github-actions-for-github-enterprise-server/enabling-github-actions-with-google-cloud-storage.md
@@ -17,7 +17,7 @@ redirect_from:
 
 {% note %}
 
-**Note:** {% data variables.product.prodname_actions %} support for Google Cloud Storage is currently in beta and subject to change.
+**Note:** {% data variables.product.prodname_actions %} support for Google Cloud Storage is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-authentication-and-provisioning-with-pingfederate.md b/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-authentication-and-provisioning-with-pingfederate.md
index 74286aa230..67cf6bcb7f 100644
--- a/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-authentication-and-provisioning-with-pingfederate.md
+++ b/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-authentication-and-provisioning-with-pingfederate.md
@@ -24,7 +24,7 @@ This guide will help you to set up both SAML authentication and SCIM provisionin
 
 Before you start, please note the following:
 
-* The use of PingFederate as an IdP for {% data variables.product.prodname_ghe_server %} is in beta. Please contact your account team to provide feedback.
+* The use of PingFederate as an IdP for {% data variables.product.prodname_ghe_server %} is in {% data variables.release-phases.public_preview %}. Please contact your account team to provide feedback.
 * This guide is based on PingFederate version 12.1. Instructions may vary for other versions.
 * This guide assumes that you are using an LDAP server as the backing data store. JDBC data stores should work, but the instructions may vary slightly.
 * This guide provides the minimal steps to configure a working setup. Because your identity directory may be connected to PingFederate differently, you’ll need to pick the correct data attributes for SAML and SCIM based on what is available from your backing data store.
diff --git a/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users.md b/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users.md
index 18a298b212..37a1ece42c 100644
--- a/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users.md
+++ b/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users.md
@@ -31,13 +31,13 @@ If you use a partner IdP, you can simplify the configuration of SCIM provisionin
 
 ## Who needs to follow these instructions?
 
-Even if your instance already uses SAML authentication, or if you were enrolled in the SCIM private beta on a previous {% data variables.product.prodname_ghe_server %} version, you must ensure you have followed **all instructions in this guide** to enable SCIM in version 3.14 and later.
+Even if your instance already uses SAML authentication, or if you were enrolled in the SCIM {% data variables.release-phases.private_preview %} on a previous {% data variables.product.prodname_ghe_server %} version, you must ensure you have followed **all instructions in this guide** to enable SCIM in version 3.14 and later.
 
 This guide applies in any of the following situations.
 
 * You're **setting up SAML and SCIM for the first time**: you'll follow these instructions to get started.
 * You **already use SAML authentication**: you'll need to enable SCIM on your instance, plus either reconfigure SAML with an IdP application that supports automated provisioning or set up a SCIM integration with the REST API.
-* You were **enrolled in the SCIM private beta**: you'll need to reenable SCIM on your instance and, if you're using a partner IdP, reconfigure your settings on an updated IdP application.
+* You were **enrolled in the SCIM {% data variables.release-phases.private_preview %}**: you'll need to reenable SCIM on your instance and, if you're using a partner IdP, reconfigure your settings on an updated IdP application.
 
 {% endif %}
 
@@ -100,7 +100,7 @@ To ensure you can continue to sign in and configure settings when SCIM is enable
 
 > [!NOTE] Complete this section if either of the following situations applies:
 > * If you have **not already enabled SAML authentication**, you will need to do so before you can enable SCIM.
-> * If you already use SAML authentication and want to use a **partner IdP for both authentication and provisioning**, or if you're **upgrading from the SCIM private beta**, you must reconfigure SAML using a new application.
+> * If you already use SAML authentication and want to use a **partner IdP for both authentication and provisioning**, or if you're **upgrading from the SCIM {% data variables.release-phases.private_preview %}**, you must reconfigure SAML using a new application.
 
 1. Sign in to your instance as a user with access to the Management Console.
 1. Go to the "Authentication" section of the Management Console. For instructions, see "[AUTOTITLE](/admin/managing-iam/using-saml-for-enterprise-iam/configuring-saml-single-sign-on-for-your-enterprise#configuring-saml-sso)."
@@ -171,7 +171,7 @@ To use a partner IdP's application for both authentication and provisioning, rev
 
 ### Configuring provisioning for other identity management systems
 
-If you don't use a partner IdP, or if you only use a partner IdP for authentication, you can manage the lifecycle of user accounts using {% data variables.product.company_short %}'s REST API endpoints for SCIM provisioning. These endpoints are in beta and subject to change. See "[AUTOTITLE](/admin/identity-and-access-management/provisioning-user-accounts-for-enterprise-managed-users/provisioning-users-and-groups-with-scim-using-the-rest-api)."
+If you don't use a partner IdP, or if you only use a partner IdP for authentication, you can manage the lifecycle of user accounts using {% data variables.product.company_short %}'s REST API endpoints for SCIM provisioning. These endpoints are in {% data variables.release-phases.public_preview %} and subject to change. See "[AUTOTITLE](/admin/identity-and-access-management/provisioning-user-accounts-for-enterprise-managed-users/provisioning-users-and-groups-with-scim-using-the-rest-api)."
 
 {% ifversion emu-public-scim-schema %}
 
diff --git a/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-with-okta.md b/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-with-okta.md
index 3726f01b8a..13a88c720a 100644
--- a/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-with-okta.md
+++ b/content/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-with-okta.md
@@ -84,7 +84,7 @@ After your {% data variables.enterprise.prodname_emu_enterprise %} has been crea
 
 ## 1. Configure SAML
 
-During the public beta of SCIM on {% data variables.product.prodname_ghe_server %}, you will use the **GitHub AE** application in Okta to configure SAML authentication and SCIM provisioning. Do **not** use the "{% data variables.product.prodname_ghe_server %}" application, which is incompatible with {% data variables.product.prodname_dotcom %}'s latest SCIM API endpoints.
+During the {% data variables.release-phases.public_preview %} of SCIM on {% data variables.product.prodname_ghe_server %}, you will use the **GitHub AE** application in Okta to configure SAML authentication and SCIM provisioning. Do **not** use the "{% data variables.product.prodname_ghe_server %}" application, which is incompatible with {% data variables.product.prodname_dotcom %}'s latest SCIM API endpoints.
 
 Before starting this section, ensure you have followed steps **1 and 2** in "[AUTOTITLE](/admin/managing-iam/provisioning-user-accounts-with-scim/configuring-scim-provisioning-for-users)."
 
diff --git a/content/admin/managing-iam/provisioning-user-accounts-with-scim/user-provisioning-with-scim-on-ghes.md b/content/admin/managing-iam/provisioning-user-accounts-with-scim/user-provisioning-with-scim-on-ghes.md
index 944862e28d..607656e020 100644
--- a/content/admin/managing-iam/provisioning-user-accounts-with-scim/user-provisioning-with-scim-on-ghes.md
+++ b/content/admin/managing-iam/provisioning-user-accounts-with-scim/user-provisioning-with-scim-on-ghes.md
@@ -45,7 +45,7 @@ The following IdPs are partner IdPs. They offer an application that you can use
 * Okta
 * PingFederate (beta)
 
-When you use a single partner IdP for both authentication and provisioning, {% data variables.product.company_short %} provides support for the application on the partner IdP and the IdP's integration with {% data variables.product.prodname_dotcom %}. Support for PingFederate is in beta.
+When you use a single partner IdP for both authentication and provisioning, {% data variables.product.company_short %} provides support for the application on the partner IdP and the IdP's integration with {% data variables.product.prodname_dotcom %}. Support for PingFederate is in {% data variables.release-phases.public_preview %}.
 
 ### Other identity management systems
 
@@ -57,7 +57,7 @@ If you cannot use a single partner IdP for both authentication and provisioning,
 
 {% else %}
 
-During the private beta, your account team will provide documentation for the configuration of SCIM for {% data variables.product.product_name %} on a supported IdP.
+During the {% data variables.release-phases.private_preview %}, your account team will provide documentation for the configuration of SCIM for {% data variables.product.product_name %} on a supported IdP.
 
 {% endif %}
 
diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md
index eaabeb637d..f956d1daf2 100644
--- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md
+++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/streaming-the-audit-log-for-your-enterprise.md
@@ -309,7 +309,7 @@ To restart streaming, click **Resume stream**.
 
 ## Enabling audit log streaming of API requests
 
->[!NOTE] This feature is currently in public beta and subject to change.
+>[!NOTE] This feature is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
diff --git a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/deferring-database-seeding.md b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/deferring-database-seeding.md
index f59d086713..8edf6e69ba 100644
--- a/content/admin/monitoring-and-managing-your-instance/configuring-clustering/deferring-database-seeding.md
+++ b/content/admin/monitoring-and-managing-your-instance/configuring-clustering/deferring-database-seeding.md
@@ -19,7 +19,7 @@ redirect_from:
 {%- ifversion ghes = 3.12 %} 3.12.1{%- endif %}
 {%- ifversion ghes = 3.11 %} 3.11.7{%- endif %}
 {%- ifversion ghes = 3.10 %} 3.10.10{%- endif %}
- and{% endif %} is available as a public beta.
+ and{% endif %} is available as a {% data variables.release-phases.public_preview %}.
 
 Adding a new MySQL replica node to your cluster when your primary node has more than seven days of data will normally trigger database seeding which can take several hours depending on the amount of data. You can choose to defer database seeding, allowing the config apply run to complete sooner, resulting in being able to open your appliance to traffic sooner.
 
diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/generating-a-health-check-for-your-enterprise.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/generating-a-health-check-for-your-enterprise.md
index c9d7e588d3..e70fb78416 100644
--- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/generating-a-health-check-for-your-enterprise.md
+++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/generating-a-health-check-for-your-enterprise.md
@@ -19,7 +19,7 @@ redirect_from:
 
 {% note %}
 
-**Note:** Generating a Health Check is currently in beta for {% data variables.product.prodname_ghe_server %} and subject to change.
+**Note:** Generating a Health Check is currently in {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_ghe_server %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-user-access-token-for-a-github-app.md b/content/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-user-access-token-for-a-github-app.md
index a44644728e..ed357a7d66 100644
--- a/content/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-user-access-token-for-a-github-app.md
+++ b/content/apps/creating-github-apps/authenticating-with-a-github-app/generating-a-user-access-token-for-a-github-app.md
@@ -61,7 +61,7 @@ If your app runs in the browser, you should use the web application flow to gene
 
 {% note %}
 
-**Note:** The device flow is in public beta and subject to change.
+**Note:** The device flow is in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/apps/github-marketplace/creating-apps-for-github-marketplace/requirements-for-listing-an-app.md b/content/apps/github-marketplace/creating-apps-for-github-marketplace/requirements-for-listing-an-app.md
index 5a9a60924b..c599c625cd 100644
--- a/content/apps/github-marketplace/creating-apps-for-github-marketplace/requirements-for-listing-an-app.md
+++ b/content/apps/github-marketplace/creating-apps-for-github-marketplace/requirements-for-listing-an-app.md
@@ -38,7 +38,7 @@ All listings should meet the following requirements, regardless of whether they
 * Listings must have a relevant description of the application.
 * Listings must specify a pricing plan.
 * Apps must provide value to customers and integrate with the platform in some way beyond authentication.
-* Apps must be publicly available in {% data variables.product.prodname_marketplace %} and cannot be in beta or available by invite only, with the exception of {% data variables.product.prodname_copilot_extensions_short %}.
+* Apps must be publicly available in {% data variables.product.prodname_marketplace %} and cannot be in {% data variables.release-phases.public_preview %} or available by invite only, with the exception of {% data variables.product.prodname_copilot_extensions_short %}.
 * Apps must have webhook events set up to notify the publisher of any plan changes or cancellations using the {% data variables.product.prodname_marketplace %} API. For more information, see "[AUTOTITLE](/apps/github-marketplace/using-the-github-marketplace-api-in-your-app)."
 
 For more information on providing a good customer experience, see "[AUTOTITLE](/apps/github-marketplace/creating-apps-for-github-marketplace/customer-experience-best-practices-for-apps)."
@@ -63,7 +63,7 @@ To publish an extension, it must be owned by an organization account with Verifi
 
 The requirements to publish a {% data variables.product.prodname_copilot_extension_short %} are the same as the requirements for free apps, with the following exceptions:
 * Your extension must provide a clear and descriptive response to a prompt like "What can you do?" or "List your capabilities".
-* Your extension can be in beta as long as that is clearly communicated in the listing description. If you are using a waitlist, you must also include a link to sign up at the top of the description. Someone from the {% data variables.product.github %} review team will join the waitlist and email your technical lead requesting access for testing.
+* Your extension can be in {% data variables.release-phases.public_preview %} as long as that is clearly communicated in the listing description. If you are using a waitlist, you must also include a link to sign up at the top of the description. Someone from the {% data variables.product.github %} review team will join the waitlist and email your technical lead requesting access for testing.
 * You must include links to two videos that demonstrate the following:
     * A few example prompts and responses from your extension
     * A net new user installing, authenticating, and sending their first prompt to your extension. These videos are private to {% data variables.product.github %} and are used solely for reviewing your listing submission. It's okay if the videos are brief and unedited.
diff --git a/content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md b/content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
index 142c286007..701d10deba 100644
--- a/content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
+++ b/content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
@@ -37,7 +37,7 @@ shortTitle: View Git LFS usage
 {% ifversion billing-beta-enterprise %}
 {% note %}
 
-**Note:** If your organization belongs to an enterprise enrolled in the Billing private beta for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
+**Note:** If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
 
 {% endnote %}
 {% endif %}
@@ -54,7 +54,7 @@ shortTitle: View Git LFS usage
 {% ifversion billing-beta-enterprise %}
 {% note %}
 
-**Note:** If your enterprise is enrolled in the Billing private beta for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
+**Note:** If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.large_files.product_name_short %}, you will not see {% data variables.large_files.product_name_short %} usage on the existing billing pages.
 
 {% endnote %}
 {% endif %}
diff --git a/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md b/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
index 70de74c6db..ff1ef7d772 100644
--- a/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
+++ b/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
@@ -39,7 +39,7 @@ Anyone can view {% data variables.product.prodname_actions %} usage for their ow
 {% ifversion billing-beta-enterprise %}
 {% note %}
 
-**Note:** If your organization belongs to an enterprise enrolled in the Billing private beta for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
+**Note:** If your organization belongs to an enterprise enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
 
 {% endnote %}
 {% endif %}
@@ -58,7 +58,7 @@ Organization owners and billing managers can view {% data variables.product.prod
 {% ifversion billing-beta-enterprise %}
 {% note %}
 
-**Note:** If your enterprise is enrolled in the Billing private beta for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
+**Note:** If your enterprise is enrolled in the Billing {% data variables.release-phases.private_preview %} for {% data variables.product.prodname_actions %}, you will not see {% data variables.product.prodname_actions %} usage on the existing billing pages.
 
 {% endnote %}
 {% endif %}
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md
index 865c96a9d0..f11c5ea08b 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md
@@ -9,7 +9,7 @@ topics:
   - LFS
   - Enterprise
 shortTitle: About Git LFS billing
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 ---
 
 ## About billing for {% data variables.large_files.product_name_long %}
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md
index f162b76c50..3f55acf39c 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md
@@ -6,7 +6,7 @@ versions:
 type: overview
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 ---
 
 >[!IMPORTANT] If you are on not on the new billing platform, this article does not apply to you. To check if you are on the new billing platform, see "[How do I know if I can access the enhanced billing platform?](/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform)." For more information about the billing cycle for your enterprise account, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle#changing-the-duration-of-your-enterprise-accounts-billing-cycle)."
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md
index e34e5a2535..2b9ac67c62 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md
@@ -6,7 +6,7 @@ versions:
 type: overview
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 shortTitle: About the enhanced billing platform
 ---
 
@@ -42,7 +42,7 @@ With the enhanced billing platform, you can:
 
 ## How do I know if I can access the enhanced billing platform?
 
-You have access to the enhanced billing platform if you have an enterprise account, or if you are part of an organization owned by an enterprise account, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform. To check if you have access:
+You have access to the enhanced billing platform if you have an enterprise account, or if you are part of an organization owned by an enterprise account, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform. To check if you have access:
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account.md
index 152f76d5f3..32df369a84 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account.md
@@ -6,7 +6,7 @@ versions:
 type: overview
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 shortTitle: Add seats to your enterprise
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units.md
index 800cc27126..700c496535 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units.md
@@ -6,7 +6,7 @@ versions:
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 shortTitle: Charge business units
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise.md
index b3a9cd7472..19d69304a4 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise.md
@@ -6,7 +6,7 @@ versions:
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 shortTitle: Estimate spending
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending.md
index c28c94300a..b5a6b3371e 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending.md
@@ -6,7 +6,7 @@ versions:
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.<br><br> As an enterprise owner or billing manager you can view and download your enterprise's usage. As an organization owner, you can view and download usage for the organizations you manage
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.<br><br> As an enterprise owner or billing manager you can view and download your enterprise's usage. As an organization owner, you can view and download usage for the organizations you manage
 shortTitle: Gather insights
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md
index 599d106b68..416fbdef53 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md
@@ -4,7 +4,7 @@ shortTitle: Enhanced billing platform
 intro: 'The enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls.'
 redirect_from:
   - /early-access/billing/billing-private-beta
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 versions:
   feature: enhanced-billing-platform
 children:
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information.md
index 6181bb3e98..0d62504dbb 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information.md
@@ -6,7 +6,7 @@ versions:
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 shortTitle: Manage your payment information
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending.md
index 085fe2b61f..ad591143da 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending.md
@@ -6,7 +6,7 @@ versions:
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 shortTitle: Prevent overspending
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md
index 5ee576c06b..947c993c18 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md
+++ b/content/billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md
@@ -6,7 +6,7 @@ versions:
 type: reference
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 ---
 
 Three roles have access to the enhanced billing platform: enterprise owners, billing managers, and organization owners. See "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise)."
diff --git a/content/code-security/code-scanning/managing-code-scanning-alerts/about-code-scanning-alerts.md b/content/code-security/code-scanning/managing-code-scanning-alerts/about-code-scanning-alerts.md
index 160c5b5972..6a2a9f4dec 100644
--- a/content/code-security/code-scanning/managing-code-scanning-alerts/about-code-scanning-alerts.md
+++ b/content/code-security/code-scanning/managing-code-scanning-alerts/about-code-scanning-alerts.md
@@ -86,7 +86,7 @@ When you click through to see details for the alert, you can see that the file p
 
 {% note %}
 
-**Note:** Experimental alerts for {% data variables.product.prodname_code_scanning %} were available a beta release for JavaScript using experimental technology in the {% data variables.product.prodname_codeql %} action. This feature was deprecated and sunset. For more information, see [{% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} deprecates ML-powered alerts](https://github.blog/changelog/2023-09-29-codeql-code-scanning-deprecates-ml-powered-alerts/).
+**Note:** Experimental alerts for {% data variables.product.prodname_code_scanning %} were available a {% data variables.release-phases.public_preview %} release for JavaScript using experimental technology in the {% data variables.product.prodname_codeql %} action. This feature was {% data variables.release-phases.retired %}. For more information, see [{% data variables.product.prodname_codeql %} {% data variables.product.prodname_code_scanning %} deprecates ML-powered alerts](https://github.blog/changelog/2023-09-29-codeql-code-scanning-deprecates-ml-powered-alerts/).
 
 {% endnote %}
 
diff --git a/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md b/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md
index bb2084a636..b54898d41c 100644
--- a/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md
+++ b/content/code-security/code-scanning/managing-your-code-scanning-configuration/editing-your-configuration-of-default-setup.md
@@ -18,7 +18,7 @@ topics:
 After running an initial analysis of your code with default setup, you may need to make changes to your configuration to better meet your code security needs. For existing configurations of default setup, you can edit:
 * Which languages default setup will analyze.
 * The query suite run during analysis. For more information on the available query suites, see "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/codeql-query-suites)."{% ifversion codeql-threat-models %}
-* The threat models (beta) to use for analysis. Your choice of threat model determines which sources of tainted data are treated as a risk to your application. During the beta, threat models are supported only for analysis of {% data variables.code-scanning.code_scanning_threat_model_support %}. For more information about threat models, see "[Including local sources of tainted data in default setup](#including-local-sources-of-tainted-data-in-default-setup)."
+* The threat models (beta) to use for analysis. Your choice of threat model determines which sources of tainted data are treated as a risk to your application. During the {% data variables.release-phases.public_preview %}, threat models are supported only for analysis of {% data variables.code-scanning.code_scanning_threat_model_support %}. For more information about threat models, see "[Including local sources of tainted data in default setup](#including-local-sources-of-tainted-data-in-default-setup)."
 {% endif %}
 
 {% ifversion codeql-model-packs %}
@@ -70,7 +70,7 @@ For more information, see "[AUTOTITLE](/code-security/code-scanning/managing-you
 
 {% data reusables.code-scanning.beta-threat-models %}
 
-If your codebase only considers remote network requests to be potential sources of tainted data, then we recommend using the default threat model. If your codebase considers sources other than network requests to potentially contain tainted data, then you can use threat models to add these additional sources to your {% data variables.product.prodname_codeql %} analysis. During the beta, you can add local sources (for example: command-line arguments, environment variables, file systems, and databases) that your codebase may consider to be additional sources of tainted data.
+If your codebase only considers remote network requests to be potential sources of tainted data, then we recommend using the default threat model. If your codebase considers sources other than network requests to potentially contain tainted data, then you can use threat models to add these additional sources to your {% data variables.product.prodname_codeql %} analysis. During the {% data variables.release-phases.public_preview %}, you can add local sources (for example: command-line arguments, environment variables, file systems, and databases) that your codebase may consider to be additional sources of tainted data.
 
 You can edit the threat model used in a default setup configuration. For more information, see "[Customizing your existing configuration of default setup](#customizing-your-existing-configuration-of-default-setup)."
 
diff --git a/content/code-security/code-scanning/managing-your-code-scanning-configuration/set-code-scanning-merge-protection.md b/content/code-security/code-scanning/managing-your-code-scanning-configuration/set-code-scanning-merge-protection.md
index 5e79e2d365..25335b3777 100644
--- a/content/code-security/code-scanning/managing-your-code-scanning-configuration/set-code-scanning-merge-protection.md
+++ b/content/code-security/code-scanning/managing-your-code-scanning-configuration/set-code-scanning-merge-protection.md
@@ -17,7 +17,7 @@ topics:
 
 **Notes:**
 
-* This feature is currently in beta and subject to change.
+* This feature is currently in {% data variables.release-phases.public_preview %} and subject to change.
 * Merge protection with rulesets is not related to status checks. For more information about status checks, see "[AUTOTITLE](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)."
 * Merge protection with rulesets will not apply to merge queue groups or {% data variables.product.prodname_dependabot %} pull requests analyzed by default setup.
 
diff --git a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries.md b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries.md
index bd27178e26..ca20d5dd6f 100644
--- a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries.md
+++ b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries.md
@@ -74,7 +74,7 @@ You must specify `<database>`, `--format`, and `--output`. You can specify addit
 | <code><span style="white-space: nowrap;">--download</span></code> | {% octicon "x" aria-label="Optional" %}  | Use if some of your {% data variables.product.prodname_codeql %} query packs are not yet on disk and need to be downloaded before running queries. |
 | <code><span style="white-space: nowrap;">--threads</span></code> | {% octicon "x" aria-label="Optional" %}  | Use if you want to use more than one thread to run queries. The default value is `1`. You can specify more threads to speed up query execution. To set the number of threads to the number of logical processors, specify `0`. |
 | <code><span style="white-space: nowrap;">--verbose</span></code> | {% octicon "x" aria-label="Optional" %}  | Use to get more detailed information about the analysis process and diagnostic data from the database creation process. |
-| <code><span style="white-space: nowrap;">--threat-model</span></code> | {% octicon "x" aria-label="Optional" %}  | (Beta) Use to add threat models to configure additional sources in your {% data variables.product.prodname_codeql %} analysis. During the beta, threat models are supported only by Java analysis. For more information, see "[AUTOTITLE](/code-security/codeql-cli/codeql-cli-manual/database-analyze#--threat-modelname)." |
+| <code><span style="white-space: nowrap;">--threat-model</span></code> | {% octicon "x" aria-label="Optional" %}  | (Beta) Use to add threat models to configure additional sources in your {% data variables.product.prodname_codeql %} analysis. During the {% data variables.release-phases.public_preview %}, threat models are supported only by Java analysis. For more information, see "[AUTOTITLE](/code-security/codeql-cli/codeql-cli-manual/database-analyze#--threat-modelname)." |
 
 {% note %}
 
diff --git a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md
index 00800d708a..4302e1e6ec 100644
--- a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md
+++ b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/customizing-analysis-with-codeql-packs.md
@@ -28,7 +28,7 @@ There are{% ifversion codeql-model-packs %} three{% else %} two{% endif %} types
 
 * Library packs are designed to be used by query packs (or other library packs) and do not contain queries themselves. The libraries are not compiled separately.{% ifversion codeql-model-packs %}
 
-* Model packs can be used to expand {% data variables.product.prodname_code_scanning %} analysis to recognize libraries and frameworks that are not supported by default. Model packs are currently in beta and subject to change. During the beta, model packs are available for {% data variables.code-scanning.codeql_model_packs_support %} analysis. For more information about creating your own model packs, see "[AUTOTITLE](/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs#creating-a-codeql-model-pack)."
+* Model packs can be used to expand {% data variables.product.prodname_code_scanning %} analysis to recognize libraries and frameworks that are not supported by default. Model packs are currently in {% data variables.release-phases.public_preview %} and subject to change. During the {% data variables.release-phases.public_preview %}, model packs are available for {% data variables.code-scanning.codeql_model_packs_support %} analysis. For more information about creating your own model packs, see "[AUTOTITLE](/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs#creating-a-codeql-model-pack)."
 
 {% endif %}
 
diff --git a/content/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs.md b/content/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs.md
index fbeb6d3014..15efaa35d4 100644
--- a/content/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs.md
+++ b/content/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/creating-and-working-with-codeql-packs.md
@@ -27,7 +27,7 @@ There are{% ifversion codeql-model-packs %} three{% else %} two{% endif %} types
 
 * Library packs are designed to be used by query packs (or other library packs) and do not contain queries themselves. The libraries are not compiled separately.{% ifversion codeql-model-packs %}
 
-* Model packs can be used to expand {% data variables.product.prodname_code_scanning %} analysis to include dependencies that are not supported by default. Model packs are currently in beta and subject to change. During the beta, model packs are available for {% data variables.code-scanning.codeql_model_packs_support %} analysis. For more information about creating your own model packs, see "[Creating a {% data variables.product.prodname_codeql %} model pack](#creating-a-codeql-model-pack)."{% endif %}
+* Model packs can be used to expand {% data variables.product.prodname_code_scanning %} analysis to include dependencies that are not supported by default. Model packs are currently in {% data variables.release-phases.public_preview %} and subject to change. During the {% data variables.release-phases.public_preview %}, model packs are available for {% data variables.code-scanning.codeql_model_packs_support %} analysis. For more information about creating your own model packs, see "[Creating a {% data variables.product.prodname_codeql %} model pack](#creating-a-codeql-model-pack)."{% endif %}
 
 You can use the `pack` command in the {% data variables.product.prodname_codeql_cli %} to create {% data variables.product.prodname_codeql %} packs, add dependencies to packs, and install or update dependencies. You can also publish and download {% data variables.product.prodname_codeql %} packs using the `pack` command. For more information, see "[AUTOTITLE](/code-security/codeql-cli/using-the-advanced-functionality-of-the-codeql-cli/publishing-and-using-codeql-packs)."
 
diff --git a/content/code-security/codeql-for-vs-code/using-the-advanced-functionality-of-the-codeql-for-vs-code-extension/using-the-codeql-model-editor.md b/content/code-security/codeql-for-vs-code/using-the-advanced-functionality-of-the-codeql-for-vs-code-extension/using-the-codeql-model-editor.md
index 82f42be5b3..b995564e48 100644
--- a/content/code-security/codeql-for-vs-code/using-the-advanced-functionality-of-the-codeql-for-vs-code-extension/using-the-codeql-model-editor.md
+++ b/content/code-security/codeql-for-vs-code/using-the-advanced-functionality-of-the-codeql-for-vs-code-extension/using-the-codeql-model-editor.md
@@ -35,7 +35,7 @@ The rest of this article covers the practical aspects of modelling dependencies
 
 {% note %}
 
-**Note:** To use this beta functionality, install the latest version of the {% data variables.product.prodname_codeql %} extension for {% data variables.product.prodname_vscode %}.
+**Note:** To use this {% data variables.release-phases.public_preview %} functionality, install the latest version of the {% data variables.product.prodname_codeql %} extension for {% data variables.product.prodname_vscode %}.
 
 {% endnote %}
 
diff --git a/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md b/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md
index 0b7922cfa9..e864dedf92 100644
--- a/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md
+++ b/content/code-security/dependabot/dependabot-alerts/viewing-and-updating-dependabot-alerts.md
@@ -79,7 +79,7 @@ For supported languages, {% data variables.product.prodname_dependabot %} automa
 
 {% note %}
 
-**Note:** During the beta release, this feature is available only for new Python advisories created _after_ April 14, 2022, and for a subset of historical Python advisories. {% data variables.product.prodname_dotcom %} is working to backfill data across additional historical Python advisories, which are added on a rolling basis. Vulnerable calls are highlighted only on the {% data variables.product.prodname_dependabot_alerts %} pages.
+**Note:** During the {% data variables.release-phases.public_preview %} release, this feature is available only for new Python advisories created _after_ April 14, 2022, and for a subset of historical Python advisories. {% data variables.product.prodname_dotcom %} is working to backfill data across additional historical Python advisories, which are added on a rolling basis. Vulnerable calls are highlighted only on the {% data variables.product.prodname_dependabot_alerts %} pages.
 
 {% endnote %}
 
diff --git a/content/code-security/dependabot/dependabot-auto-triage-rules/customizing-auto-triage-rules-to-prioritize-dependabot-alerts.md b/content/code-security/dependabot/dependabot-auto-triage-rules/customizing-auto-triage-rules-to-prioritize-dependabot-alerts.md
index 1521b851ed..f55973a75c 100644
--- a/content/code-security/dependabot/dependabot-auto-triage-rules/customizing-auto-triage-rules-to-prioritize-dependabot-alerts.md
+++ b/content/code-security/dependabot/dependabot-auto-triage-rules/customizing-auto-triage-rules-to-prioritize-dependabot-alerts.md
@@ -60,7 +60,7 @@ For more information about enabling or disabling {% data variables.product.prodn
 
 {% note %}
 
-**Note:** During the public beta, you can create up to 10 {% data variables.dependabot.custom_rules %} for a repository.
+**Note:** During the {% data variables.release-phases.public_preview %}, you can create up to 10 {% data variables.dependabot.custom_rules %} for a repository.
 
 {% endnote %}
 
@@ -85,7 +85,7 @@ For more information about enabling or disabling {% data variables.product.prodn
 
 {% note %}
 
-**Note:** During the public beta, you can create up to 25 {% data variables.dependabot.custom_rules %} for your organization.
+**Note:** During the {% data variables.release-phases.public_preview %}, you can create up to 25 {% data variables.dependabot.custom_rules %} for your organization.
 
 {% endnote %}
 
diff --git a/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md b/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md
index 36dd7123cf..4aaf8aafb6 100644
--- a/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md
+++ b/content/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file.md
@@ -1403,17 +1403,17 @@ registries:
 
 {% endraw %}
 
-## Enabling support for beta-level ecosystems
+## Enabling support for {% data variables.release-phases.public_preview %}-level ecosystems
 
 ### `enable-beta-ecosystems`
 
 By default, {% data variables.product.prodname_dependabot %} updates the dependency manifests and lock files only for fully supported ecosystems. Use the `enable-beta-ecosystems` flag to opt in to updates for ecosystems that are not yet generally available.
 
-<!-- add list here once we get ecosystems released in beta -->
-There are currently no ecosystems in beta.
+<!-- add list here once we get ecosystems released in {% data variables.release-phases.public_preview %} -->
+There are currently no ecosystems in {% data variables.release-phases.public_preview %}.
 
 ```yaml
-# Configure beta ecosystem
+# Configure {% data variables.release-phases.public_preview %} ecosystem
 
 version: 2
 enable-beta-ecosystems: true
diff --git a/content/code-security/secret-scanning/managing-alerts-from-secret-scanning/evaluating-alerts.md b/content/code-security/secret-scanning/managing-alerts-from-secret-scanning/evaluating-alerts.md
index ebd81acfb8..14c44f8f67 100644
--- a/content/code-security/secret-scanning/managing-alerts-from-secret-scanning/evaluating-alerts.md
+++ b/content/code-security/secret-scanning/managing-alerts-from-secret-scanning/evaluating-alerts.md
@@ -71,7 +71,7 @@ Once you have enabled validity checks for partner patterns for your repository,
 ## Reviewing {% data variables.product.company_short %} token metadata
 
 > [!NOTE]
-> Metadata for {% data variables.product.company_short %} tokens is currently in public beta and subject to change.
+> Metadata for {% data variables.product.company_short %} tokens is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 In the view for an active {% data variables.product.company_short %} token alert, you can review certain metadata about the token. This metadata may help you identify the token and decide what remediation steps to take.
 
diff --git a/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/custom-patterns/metrics-for-custom-patterns.md b/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/custom-patterns/metrics-for-custom-patterns.md
index a9e3e99c42..41c5a0d2b5 100644
--- a/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/custom-patterns/metrics-for-custom-patterns.md
+++ b/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/custom-patterns/metrics-for-custom-patterns.md
@@ -15,7 +15,7 @@ topics:
 
 Organization owners and people with admin permission for a repository can see an overview of the activity for custom patterns. The overview includes alert and push protection activity for the custom pattern during the last 30 days.
 
-> [!NOTE] Metrics for custom patterns are in public beta and subject to change.
+> [!NOTE] Metrics for custom patterns are in {% data variables.release-phases.public_preview %} and subject to change.
 
 ## Viewing metrics for custom patterns
 
diff --git a/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/generic-secret-detection/about-the-detection-of-generic-secrets-with-secret-scanning.md b/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/generic-secret-detection/about-the-detection-of-generic-secrets-with-secret-scanning.md
index 4738306efd..14dfbce706 100644
--- a/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/generic-secret-detection/about-the-detection-of-generic-secrets-with-secret-scanning.md
+++ b/content/code-security/secret-scanning/using-advanced-secret-scanning-and-push-protection-features/generic-secret-detection/about-the-detection-of-generic-secrets-with-secret-scanning.md
@@ -50,7 +50,7 @@ Since AI-powered generic secret detection may generate more false positives than
 
 ### Provide feedback
 
-Generic secret detection is currently in beta. If you encounter any issues or limitations with the feature, we recommend that you provide feedback through the **Give feedback** button listed under each detected secret in the list of alerts for the repository, organization, or enterprise. This can help the developers improve the tool and address any concerns or limitations.
+Generic secret detection is currently in {% data variables.release-phases.public_preview %}. If you encounter any issues or limitations with the feature, we recommend that you provide feedback through the **Give feedback** button listed under each detected secret in the list of alerts for the repository, organization, or enterprise. This can help the developers improve the tool and address any concerns or limitations.
 
 ## Limitations of generic secret detection
 
diff --git a/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/best-practices-for-writing-repository-security-advisories.md b/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/best-practices-for-writing-repository-security-advisories.md
index 521d2718fb..b6bded7fe0 100644
--- a/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/best-practices-for-writing-repository-security-advisories.md
+++ b/content/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/best-practices-for-writing-repository-security-advisories.md
@@ -132,7 +132,7 @@ This is because, if a fixed version is ever released, users of the fixed version
 ### Specifying only one affected version
 
 * `= n` for the single affected version
-* Keep in mind that the `=` will not automatically include any pre-releases, alpha, or beta versions, _only_ the version specified.
+* Keep in mind that the `=` will not automatically include any public or private previews, _only_ the version specified.
 
 ### Common errors
 
diff --git a/content/code-security/security-overview/about-security-overview.md b/content/code-security/security-overview/about-security-overview.md
index 41ef085d20..5eba4c10ee 100644
--- a/content/code-security/security-overview/about-security-overview.md
+++ b/content/code-security/security-overview/about-security-overview.md
@@ -84,7 +84,7 @@ For more information about these views, see {% ifversion security-overview-dashb
 
 ![Screenshot of security overview for an organization.](/assets/images/help/security-overview/security-overview-org-legacy.png)
 
-Each repository is shown in security overview with an indicator for each type of security feature and how many alerts there are of each type. If a security feature is not enabled for a repository, the indicator for that feature will be grayed out. In addition, a risk score is calculated for each repository based on its {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_dependabot %} and {% data variables.secret-scanning.alerts %}. This score is in beta and should be used with caution. Its algorithm and approach is subject to change.
+Each repository is shown in security overview with an indicator for each type of security feature and how many alerts there are of each type. If a security feature is not enabled for a repository, the indicator for that feature will be grayed out. In addition, a risk score is calculated for each repository based on its {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_dependabot %} and {% data variables.secret-scanning.alerts %}. This score is in {% data variables.release-phases.public_preview %} and should be used with caution. Its algorithm and approach is subject to change.
 
 | Indicator | Meaning |
 | -------- | -------- |
diff --git a/content/code-security/security-overview/assessing-adoption-code-security.md b/content/code-security/security-overview/assessing-adoption-code-security.md
index 0940527040..944c6183c1 100644
--- a/content/code-security/security-overview/assessing-adoption-code-security.md
+++ b/content/code-security/security-overview/assessing-adoption-code-security.md
@@ -84,7 +84,7 @@ In the enterprise-level view, you can view data about the enablement of features
 
 {% ifversion ghes < 3.15 %}
 
-> [!NOTE] The "Enablement trends" view is currently in beta and is subject to change.
+> [!NOTE] The "Enablement trends" view is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% endif %}
 
@@ -108,7 +108,7 @@ You can view data to assess the enablement status and enablement status trends o
 
 {% ifversion ghes < 3.15 %}
 
-> [!NOTE] The "Enablement trends" view is currently in beta and is subject to change.
+> [!NOTE] The "Enablement trends" view is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% endif %}
 
diff --git a/content/code-security/security-overview/filtering-alerts-in-security-overview.md b/content/code-security/security-overview/filtering-alerts-in-security-overview.md
index 33ce7de4a6..b83d5e506e 100644
--- a/content/code-security/security-overview/filtering-alerts-in-security-overview.md
+++ b/content/code-security/security-overview/filtering-alerts-in-security-overview.md
@@ -78,7 +78,7 @@ These qualifiers are available in all views.
 
 {% note %}
 
-**Note:** Repository properties are in public beta and subject to change.
+**Note:** Repository properties are in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/codespaces/developing-in-a-codespace/connecting-to-a-private-network.md b/content/codespaces/developing-in-a-codespace/connecting-to-a-private-network.md
index f78454f69e..3edf3e4c9e 100644
--- a/content/codespaces/developing-in-a-codespace/connecting-to-a-private-network.md
+++ b/content/codespaces/developing-in-a-codespace/connecting-to-a-private-network.md
@@ -27,7 +27,7 @@ There are currently two methods of accessing resources on a private network with
 
 {% warning %}
 
-**Warning**: The {% data variables.product.prodname_cli %} extension is deprecated and no longer supported.
+**Warning**: The {% data variables.product.prodname_cli %} extension is {% data variables.release-phases.closing_down %} and is no longer supported.
 
 {% endwarning %}
 
diff --git a/content/codespaces/developing-in-a-codespace/using-github-codespaces-with-github-cli.md b/content/codespaces/developing-in-a-codespace/using-github-codespaces-with-github-cli.md
index ec18f91f8a..ac60d2869d 100644
--- a/content/codespaces/developing-in-a-codespace/using-github-codespaces-with-github-cli.md
+++ b/content/codespaces/developing-in-a-codespace/using-github-codespaces-with-github-cli.md
@@ -256,7 +256,7 @@ You can use the {% data variables.product.prodname_cli %} extension to create a
 
 {% note %}
 
-**Note**: The {% data variables.product.prodname_cli %} extension is currently in beta and subject to change.
+**Note**: The {% data variables.product.prodname_cli %} extension is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/codespaces/getting-started/deep-dive.md b/content/codespaces/getting-started/deep-dive.md
index 3cec97e119..30516c7a89 100644
--- a/content/codespaces/getting-started/deep-dive.md
+++ b/content/codespaces/getting-started/deep-dive.md
@@ -40,7 +40,7 @@ When you create a codespace, various steps happen in the background before the c
 
 ### Step 1: VM and storage are assigned to your codespace
 
-When you create a codespace, a virtual machine (VM) is created using either the stable or beta release of the VM host image. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/choosing-the-stable-or-beta-host-image)." The host image defines the version of Linux that is used for the VM. The VM is both dedicated and private to you. Having a dedicated VM ensures that you have the entire set of compute resources from that machine available to you. If necessary, this also allows you to have full root access to your container.
+When you create a codespace, a virtual machine (VM) is created using either the stable or {% data variables.release-phases.public_preview %} release of the VM host image. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/choosing-the-stable-or-beta-host-image)." The host image defines the version of Linux that is used for the VM. The VM is both dedicated and private to you. Having a dedicated VM ensures that you have the entire set of compute resources from that machine available to you. If necessary, this also allows you to have full root access to your container.
 
 A [shallow clone](https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/) is then made of your repository, or of the template repository if you're creating a codespace from a template. This is cloned into the `/workspaces` directory of the VM and subsequently mounted into the dev container. For more information, see "[About the directory structure of a codespace](#about-the-directory-structure-of-a-codespace)" below.
 
diff --git a/content/codespaces/the-githubdev-web-based-editor.md b/content/codespaces/the-githubdev-web-based-editor.md
index 5e3f17fe1e..8b2859df77 100644
--- a/content/codespaces/the-githubdev-web-based-editor.md
+++ b/content/codespaces/the-githubdev-web-based-editor.md
@@ -15,7 +15,7 @@ redirect_from:
 
 {% note %}
 
-**Note:** The {% data variables.codespaces.serverless %} editor is currently in beta preview. You can provide feedback [in our Discussions](https://github.com/community/community/discussions/categories/codespaces).
+**Note:** The {% data variables.codespaces.serverless %} editor is currently in {% data variables.release-phases.public_preview %}. You can provide feedback [in our Discussions](https://github.com/community/community/discussions/categories/codespaces).
 
 {% endnote %}
 
diff --git a/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema.md b/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema.md
index be7b6b325b..f3c081b051 100644
--- a/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema.md
+++ b/content/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema.md
@@ -11,7 +11,7 @@ topics:
 
 {% note %}
 
-**Note:** {% data variables.product.company_short %}'s form schema is currently in beta and subject to change.
+**Note:** {% data variables.product.company_short %}'s form schema is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/contributing/collaborating-on-github-docs/using-the-content-linter.md b/content/contributing/collaborating-on-github-docs/using-the-content-linter.md
index b9670051d8..7e24ccba44 100644
--- a/content/contributing/collaborating-on-github-docs/using-the-content-linter.md
+++ b/content/contributing/collaborating-on-github-docs/using-the-content-linter.md
@@ -139,7 +139,7 @@ Note, if you are placing the expired tags in an HTML `table` element, make sure
 macOS
 </td>
 <td>
-The <code>macos-11</code> label has been deprecated and will no longer be available after 28 June 2024.
+The <code>macos-11</code> label is {% data variables.release-phases.closing_down %} and will no longer be available after 28 June 2024.
 </td>
 </tr>
 <!-- end expires 2024-06-28 -->
diff --git a/content/contributing/style-guide-and-content-model/style-guide.md b/content/contributing/style-guide-and-content-model/style-guide.md
index 630db3b36f..1defdb6ef6 100644
--- a/content/contributing/style-guide-and-content-model/style-guide.md
+++ b/content/contributing/style-guide-and-content-model/style-guide.md
@@ -52,12 +52,12 @@ Provides additional context that users may need to take into account. Tasks can
 
 Notes are particularly useful for communicating parenthetical information that is not central to the process being described:
 * Caveats that might affect the outcome of a process, such as specific user settings.
-* Products and features that are subject to changes in availability, such as those in beta or being deprecated.
+* Products and features that are subject to changes in availability, such as those in {% data variables.release-phases.public_preview %} or {% data variables.release-phases.closing_down %}.
 
-For example, "[AUTOTITLE](/code-security/secret-scanning/managing-alerts-from-secret-scanning/evaluating-alerts#reviewing-github-token-metadata)" uses a note to inform users that metadata for {% data variables.product.prodname_dotcom %} tokens is currently in beta.
+For example, "[AUTOTITLE](/code-security/secret-scanning/managing-alerts-from-secret-scanning/evaluating-alerts#reviewing-github-token-metadata)" uses a note to inform users that metadata for {% data variables.product.prodname_dotcom %} tokens is currently in {% data variables.release-phases.public_preview %}.
 
 > [!NOTE]
-> Metadata for {% data variables.product.prodname_dotcom %} tokens is currently in public beta and subject to change.
+> Metadata for {% data variables.product.prodname_dotcom %} tokens is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 #### Tip
 
diff --git a/content/contributing/writing-for-github-docs/creating-screenshots.md b/content/contributing/writing-for-github-docs/creating-screenshots.md
index 97f39717a1..a5bdd83798 100644
--- a/content/contributing/writing-for-github-docs/creating-screenshots.md
+++ b/content/contributing/writing-for-github-docs/creating-screenshots.md
@@ -172,7 +172,7 @@ When replacing an existing image, best practice is to retain the image's filenam
 
 If you must change an image filename, search the repository for other references to that image and update all references to the original filename.
 
-If the image is used in deprecated versions of {% data variables.product.prodname_ghe_server %} documentation, don't change the filename.
+If the image is used in documentation for versions of {% data variables.product.prodname_ghe_server %} that are {% data variables.release-phases.closing_down %}, don't change the filename.
 
 ## Versioning images in Markdown content
 
@@ -220,6 +220,6 @@ Your Liquid conditional would look like this:
 {% endif %}{% endraw %}
 ```
 
-When the 3.10 release is deprecated, the `/assets/images/enterprise/3.10` directory will be removed.
+When the 3.10 release is {% data variables.release-phases.closing_down %}, the `/assets/images/enterprise/3.10` directory will be removed.
 
 The numbered release directory should contain images that apply to that release number only or to that release number and earlier. For example, images in `/assets/images/enterprise/2.22` should contain images that apply to 2.22 only or 2.22 and earlier.
diff --git a/content/contributing/writing-for-github-docs/versioning-documentation.md b/content/contributing/writing-for-github-docs/versioning-documentation.md
index a0edf64053..bc1e8a1b26 100644
--- a/content/contributing/writing-for-github-docs/versioning-documentation.md
+++ b/content/contributing/writing-for-github-docs/versioning-documentation.md
@@ -66,7 +66,7 @@ For {% data variables.product.prodname_ghe_cloud %}, use `enterprise-cloud@lates
 
 ### {% data variables.product.prodname_ghe_server %}
 
-Documentation for {% data variables.product.prodname_ghe_server %} has multiple versions and can be divided into two types: documentation for _supported releases_ (we support four at any one time), and documentation for _deprecated releases_ (we do not link to these on the Docs site but we support a "frozen" snapshot of these docs in perpetuity, so they can still be accessed if you know the URLs). See [`lib/enterprise-server-releases.js`](https://github.com/github/docs/blob/main/src/versions/lib/enterprise-server-releases.js) for a list.
+Documentation for {% data variables.product.prodname_ghe_server %} has multiple versions and can be divided into two types: documentation for _supported releases_ (we support four at any one time), and documentation for _{% data variables.release-phases.closing_down %} releases_ (we do not link to these on the Docs site but we support a "frozen" snapshot of these docs in perpetuity, so they can still be accessed if you know the URLs). See [`lib/enterprise-server-releases.js`](https://github.com/github/docs/blob/main/src/versions/lib/enterprise-server-releases.js) for a list.
 
 The versions are named `enterprise-server@<release>`. The short name is `ghes`. In Liquid conditionals, we can specify ranges, like `ghes > 3.0`. For more information, see "[Versioning with Liquid conditional operators](#versioning-with-liquid-conditional-operators)."
 
diff --git a/content/copilot/building-copilot-extensions/about-building-copilot-extensions.md b/content/copilot/building-copilot-extensions/about-building-copilot-extensions.md
index 063e7c698c..ecf5403adb 100644
--- a/content/copilot/building-copilot-extensions/about-building-copilot-extensions.md
+++ b/content/copilot/building-copilot-extensions/about-building-copilot-extensions.md
@@ -59,7 +59,7 @@ Before creating your own {% data variables.product.prodname_copilot_extension_sh
 * **Blackbeard**: A simple {% data variables.product.prodname_copilot_agent_short %} that responds to requests like a pirate, using {% data variables.product.prodname_copilot_short %}'s LLM API and special system prompts. It is a good starting point for learning how to build a {% data variables.product.prodname_copilot_extension_short %}. For more information, see the [Blackbeard {% data variables.product.prodname_copilot_extension_short %}](https://github.com/copilot-extensions/blackbeard-extension).
 * **{% data variables.product.prodname_github_models %}**: A more complex {% data variables.product.prodname_copilot_agent_short %} that lets you ask about and interact with various LLMs listed on the {% data variables.product.prodname_marketplace %} from within {% data variables.product.prodname_copilot_chat_short %}. For more information, see the [{% data variables.product.prodname_github_models %} {% data variables.product.prodname_copilot_extension_short %}](https://github.com/copilot-extensions/github-models-extension).
 
-    > [!NOTE] {% data variables.product.prodname_github_models %} are in public beta and subject to change. To request access, join the [waitlist](https://github.com/marketplace/models/waitlist).
+    > [!NOTE] {% data variables.product.prodname_github_models %} are in {% data variables.release-phases.public_preview %} and subject to change. To request access, join the [waitlist](https://github.com/marketplace/models/waitlist).
 * **Function calling**: an example agent written in Go that demonstrates function calling and confirmation dialogues. For more information, see the [Function calling extension](https://github.com/copilot-extensions/function-calling-extension).
 * **RAG extension**: an example agent written in Go that demonstrates a simple implementation of retrieval augmented generation. For more information, see the [RAG extension](https://github.com/copilot-extensions/rag-extension).
 * **Preview SDK**: An SDK that simplifies the process of building {% data variables.product.prodname_copilot_extensions_short %} by handling request verification, response formatting, and API interactions. It allows builders to focus on their extension's core functionality rather than boilerplate, by streamlining the integration of tools, APIs, and data sources into {% data variables.product.prodname_copilot_chat_short %}. For more information, see the [Preview SDK](https://github.com/copilot-extensions/preview-sdk.js).
diff --git a/content/copilot/building-copilot-extensions/copilot-extensions-glossary.md b/content/copilot/building-copilot-extensions/copilot-extensions-glossary.md
index 4d47aba980..9054c991ee 100644
--- a/content/copilot/building-copilot-extensions/copilot-extensions-glossary.md
+++ b/content/copilot/building-copilot-extensions/copilot-extensions-glossary.md
@@ -59,7 +59,7 @@ A piece of code that retrieves context or executes an action in response to a us
 
 #### Tool/Function Calling
 
-A capability of {% data variables.product.prodname_copilot_short %}'s LLM (as well as Open AI’s) that allows them to invoke specific tools or functions. Extension builders can define available tools with parameters, enabling the LLM to select and call appropriate tools to fulfill a user’s request. “Functions” are a subset of “tools” and the “function calling” term will eventually be deprecated.
+A capability of {% data variables.product.prodname_copilot_short %}'s LLM (as well as Open AI’s) that allows them to invoke specific tools or functions. Extension builders can define available tools with parameters, enabling the LLM to select and call appropriate tools to fulfill a user’s request. “Functions” are a subset of “tools” and the “function calling” term will be {% data variables.release-phases.closing_down %}.
 
 #### Unlisted Extension
 
diff --git a/content/copilot/building-copilot-extensions/managing-the-availability-of-your-copilot-extension.md b/content/copilot/building-copilot-extensions/managing-the-availability-of-your-copilot-extension.md
index cd616cb129..371e0dca67 100644
--- a/content/copilot/building-copilot-extensions/managing-the-availability-of-your-copilot-extension.md
+++ b/content/copilot/building-copilot-extensions/managing-the-availability-of-your-copilot-extension.md
@@ -40,7 +40,7 @@ If you make your app public, you can choose to publish it on the {% data variabl
 
 App managers cannot create, edit, or publish extensions on the {% data variables.product.prodname_marketplace %}. To manage a listing, you should be an organization owner for the publishing organization.
 
-> [!NOTE] Paid plans are not supported for {% data variables.product.prodname_copilot_extensions_short %} during public beta. Any requests to publish with a paid plan attached will not be approved.
+> [!NOTE] Paid plans are not supported for {% data variables.product.prodname_copilot_extensions_short %} during {% data variables.release-phases.public_preview %}. Any requests to publish with a paid plan attached will not be approved.
 
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org-list %}
diff --git a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md
index d8a11a5457..9311c1654c 100644
--- a/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md
+++ b/content/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise.md
@@ -69,7 +69,7 @@ You can chat with {% data variables.product.prodname_copilot %} in your IDE to g
 
 ### Give {% data variables.product.prodname_copilot_short %} access to Bing
 
-> [!NOTE] Bing search integration into {% data variables.product.prodname_copilot_chat_dotcom_short %}, {% data variables.product.prodname_vscode_shortname %}, and {% data variables.product.prodname_vs %} is currently in beta and is subject to change.
+> [!NOTE] Bing search integration into {% data variables.product.prodname_copilot_chat_dotcom_short %}, {% data variables.product.prodname_vscode_shortname %}, and {% data variables.product.prodname_vs %} is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% data variables.product.prodname_copilot_chat %} can use Bing to provide enhanced responses by searching the internet for information related to a question. Bing search is particularly helpful when discussing new technologies or highly specific subjects.
 
diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/customizing-copilot-for-your-organization/creating-a-custom-model-for-github-copilot.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/customizing-copilot-for-your-organization/creating-a-custom-model-for-github-copilot.md
index 376e9e3a4c..08e4a0645d 100644
--- a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/customizing-copilot-for-your-organization/creating-a-custom-model-for-github-copilot.md
+++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/customizing-copilot-for-your-organization/creating-a-custom-model-for-github-copilot.md
@@ -2,7 +2,7 @@
 title: Creating a custom model for GitHub Copilot
 shortTitle: Create a custom model
 intro: "You can fine-tune {% data variables.product.prodname_copilot_short %} code completion by creating a custom model based on code in your organization's repositories."
-permissions: "Owners of organizations enrolled in the limited public beta."
+permissions: "Owners of organizations enrolled in the {% data variables.release-phases.public_preview %}."
 product: "The organization must belong to an enterprise with a {% data variables.product.prodname_copilot_enterprise_short %} subscription."
 versions:
   feature: copilot-custom-models
@@ -12,7 +12,7 @@ redirect_from:
   - /copilot/managing-copilot/managing-github-copilot-in-your-organization/enhancing-copilot-for-your-organization/creating-a-custom-model-for-github-copilot
 ---
 
-> [!NOTE] Custom models for {% data variables.product.prodname_copilot_enterprise %} is in limited public beta and is subject to change. During the limited public beta, there is no additional cost to {% data variables.product.prodname_copilot_enterprise_short %} customers enrolled on the beta for creating or using a custom model.
+> [!NOTE] Custom models for {% data variables.product.prodname_copilot_enterprise %} is in {% data variables.release-phases.public_preview %} and is subject to change. During the {% data variables.release-phases.public_preview %}, there is no additional cost to {% data variables.product.prodname_copilot_enterprise_short %} customers enrolled on the {% data variables.release-phases.public_preview %} for creating or using a custom model.
 
 ## Prerequisite
 
@@ -20,7 +20,7 @@ The code on which you want to train a custom model must be hosted in repositorie
 
 ## Limitations
 
-* For the limited public beta, an enterprise can deploy one custom model in a single organization.
+* For the {% data variables.release-phases.public_preview %}, an enterprise can deploy one custom model in a single organization.
 * Code completion suggestions based on the custom model are only available to managed users who get a {% data variables.product.prodname_copilot_enterprise_short %} subscription from the organization in which the custom model is deployed. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/managing-iam/understanding-iam-for-enterprises/about-enterprise-managed-users)."
 * The custom model is not used for code suggested in responses by {% data variables.product.prodname_copilot_chat %}.
 
@@ -42,7 +42,7 @@ This provides:
 
 ### About model creation
 
-Currently, in the limited public beta, only one organization in an enterprise is permitted to create a custom model.
+Currently, in the {% data variables.release-phases.public_preview %}, only one organization in an enterprise is permitted to create a custom model.
 
 As an owner of the organization that's permitted to create a custom model, you can choose which of your organization's repositories to use to train the model. You can train the model on one, several, or all of the repositories in the organization. The model is trained on the content of the default branches of the selected repositories. Optionally, you can specify that only code written in certain programming languages should be used for training. The custom model will be used for generating code completion suggestions in all file types, irrespective of whether that type of file was used for training.
 
diff --git a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md
index 5727d0b84a..bf540b8b93 100644
--- a/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md
+++ b/content/copilot/managing-copilot/managing-github-copilot-in-your-organization/reviewing-activity-related-to-github-copilot-in-your-organization/reviewing-user-activity-data-for-copilot-in-your-organization.md
@@ -42,7 +42,7 @@ You can use {% data variables.product.prodname_dotcom %}'s REST API to get detai
 
 ## Understanding the `last_activity_at` calculation
 
-> [!NOTE] This data is in public beta and subject to change.
+> [!NOTE] This data is in {% data variables.release-phases.public_preview %} and subject to change.
 
 To align the `last_activity_at` data point with _actual usage_, the system returns the timestamp of a user's most recent interaction with Copilot functionality. These interactions are:
 
diff --git a/content/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom.md b/content/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom.md
index f51d9a5895..ccaafc78cd 100644
--- a/content/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom.md
+++ b/content/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom.md
@@ -63,7 +63,7 @@ The skills you can use in {% data variables.product.prodname_copilot_chat_dotcom
 
 | Skill                                                          | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | Enabled by default?                                                                                                                                                            | Example question                                                                                                                                      |
 |----------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **Bing web search** (in beta and subject to change)            | Searches the web using the Bing search engine. This skill is useful for teaching {% data variables.product.prodname_copilot_short %} about recent events, new developments, trends, technologies, or extremely specific, detailed, or niche subjects. **Available for {% data variables.product.prodname_copilot_business_short %} and {% data variables.product.prodname_copilot_enterprise_short %}**.                                                                    | No (requires admin approval - see "[AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise)") | _What are some recent articles about SAT tokens securing against vulnerabilities in Node?_                                                            |
+| **Bing web search** (in {% data variables.release-phases.public_preview %} and subject to change)            | Searches the web using the Bing search engine. This skill is useful for teaching {% data variables.product.prodname_copilot_short %} about recent events, new developments, trends, technologies, or extremely specific, detailed, or niche subjects. **Available for {% data variables.product.prodname_copilot_business_short %} and {% data variables.product.prodname_copilot_enterprise_short %}**.                                                                    | No (requires admin approval - see "[AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise)") | _What are some recent articles about SAT tokens securing against vulnerabilities in Node?_                                                            |
 | **Code search**                                                | Natural language code search in the default branch of the Git repository. This skill is useful when you want to know where or how certain functionality has been implemented in the code. Note: this requires indexing to be enabled for the repository (see "[AUTOTITLE](/enterprise-cloud@latest/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/indexing-repositories-for-copilot-chat)").   | Yes                                                                                                                                                                            | _Where is the logic that controls the user session management, and how does it work?_                                                                 |
 | **Commit details**                                             | Retrieves a list of commits, or the contents of a specific commit, to provide answers to commit-related questions.                                                                                                                                                                                                                                                                                                                                                          | Yes                                                                                                                                                                            | _Explain the changes in the code of this commit_                                                                                                      |
 | **Discussion details**                                         | Retrieves a specific {% data variables.product.prodname_dotcom %} discussion. This is useful for quickly getting the gist of the conversation in a discussion.                                                                                                                                                                                                                                                                                                              | Yes                                                                                                                                                                            | _Summarize this discussion_                                                                                                                           |
@@ -104,7 +104,7 @@ You can ask a general question about software development that is not focused on
 
 Depending on the question you ask, and your enterprise and organization settings, {% data variables.product.prodname_copilot_short %} may respond using information based on the results of a Bing search. By using Bing search, {% data variables.product.prodname_copilot_short %} can answer a broad range of tech-related questions with up-to-date details based on information currently available on the internet. For information on how to enable or disable Bing search integration, see "[AUTOTITLE](/copilot/managing-copilot/managing-copilot-for-your-enterprise/managing-policies-and-features-for-copilot-in-your-enterprise)."
 
-> [!NOTE] Bing search integration into {% data variables.product.prodname_copilot_chat_dotcom_short %} is currently in beta and is subject to change.
+> [!NOTE] Bing search integration into {% data variables.product.prodname_copilot_chat_dotcom_short %} is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% data reusables.copilot.go-to-copilot-page %}
 
@@ -379,7 +379,7 @@ You can ask {% data variables.product.prodname_copilot_short %} to summarize a p
 
 ### Ask why a workflow has failed
 
-> [!NOTE]This feature is currently in beta and subject to change.
+> [!NOTE]This feature is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 1. On {% data variables.product.prodname_dotcom_the_website %}, navigate to a pull request in a repository.
 1. Scroll to the bottom of the page, then, next to one of the failing checks, click **Details**.
diff --git a/content/copilot/using-github-copilot/asking-github-copilot-questions-in-your-ide.md b/content/copilot/using-github-copilot/asking-github-copilot-questions-in-your-ide.md
index 094712ae7c..558e8743df 100644
--- a/content/copilot/using-github-copilot/asking-github-copilot-questions-in-your-ide.md
+++ b/content/copilot/using-github-copilot/asking-github-copilot-questions-in-your-ide.md
@@ -110,7 +110,7 @@ To see all available chat variables, type `#` in the chat prompt box. See also [
 
 > [!NOTE]
 > * This feature is only available if you have a {% data variables.product.prodname_copilot_enterprise_short %} subscription.
-> * The `@github` chat participant is currently in beta and is subject to change.
+> * The `@github` chat participant is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% data variables.product.prodname_copilot_short %} has a collection of {% data variables.product.prodname_dotcom %}-specific skills that it can use to answer your questions. To access these skills in {% data variables.product.prodname_copilot_chat_short %} in {% data variables.product.prodname_vscode_shortname %}, include `@github` in your question.
 
diff --git a/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md b/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md
index 4a2faf0ade..c04d2a5783 100644
--- a/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md
+++ b/content/copilot/using-github-copilot/finding-public-code-that-matches-github-copilot-suggestions.md
@@ -10,7 +10,7 @@ versions:
   feature: copilot
 ---
 
-> [!NOTE] {% data variables.product.prodname_copilot %} code referencing is in public beta and is subject to change.
+> [!NOTE] {% data variables.product.prodname_copilot %} code referencing is in {% data variables.release-phases.public_preview %} and is subject to change.
 
 ## About code referencing in {% data variables.product.prodname_copilot %}
 
diff --git a/content/copilot/using-github-copilot/using-copilot-text-completion.md b/content/copilot/using-github-copilot/using-copilot-text-completion.md
index dea253b300..f620d97fa1 100644
--- a/content/copilot/using-github-copilot/using-copilot-text-completion.md
+++ b/content/copilot/using-github-copilot/using-copilot-text-completion.md
@@ -10,7 +10,7 @@ topics:
 ---
 
 >[!NOTE]
-> {% data variables.product.prodname_copilot_autocomplete_pr %} is currently in beta and subject to change. To participate in the beta, an administrator of your enterprise must opt in to the use of previews of {% data variables.product.prodname_copilot_short %} features.
+> {% data variables.product.prodname_copilot_autocomplete_pr %} is currently in {% data variables.release-phases.public_preview %} and subject to change. To participate in the {% data variables.release-phases.public_preview %}, an administrator of your enterprise must opt in to the use of previews of {% data variables.product.prodname_copilot_short %} features.
 
 ## About {% data variables.product.prodname_copilot_autocomplete_pr %}
 
diff --git a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
index 3adcee3998..0c3d723e60 100644
--- a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
+++ b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
@@ -45,7 +45,7 @@ After you have confirmation that you are a verified teacher, visit [{% data vari
 
 If you are eligible for the {% data variables.product.prodname_codespaces %} Education benefit, when you enable {% data variables.product.prodname_github_codespaces %} in {% data variables.product.prodname_classroom %} for your organization, GitHub automatically adds a Codespace policy to restrict machine types for all codespaces in the organization to 2 core machines. This helps you make the most of the free {% data variables.product.prodname_github_codespaces %} usage. However, you can change or remove these policies in your organization settings. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
 
-When the {% data variables.product.prodname_codespaces %} Education benefit moves out of beta, if your organization exceeds their free allowance for {% data variables.product.prodname_github_codespaces %} usage, your organization will be billed for additional usage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+When the {% data variables.product.prodname_codespaces %} Education benefit moves out of {% data variables.release-phases.public_preview %}, if your organization exceeds their free allowance for {% data variables.product.prodname_github_codespaces %} usage, your organization will be billed for additional usage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 ## Enabling {% data variables.product.prodname_codespaces %} for your organization
 
diff --git a/content/get-started/accessibility/managing-your-theme-settings.md b/content/get-started/accessibility/managing-your-theme-settings.md
index 3eb6a0a99c..b9a0c85d1b 100644
--- a/content/get-started/accessibility/managing-your-theme-settings.md
+++ b/content/get-started/accessibility/managing-your-theme-settings.md
@@ -35,7 +35,7 @@ If you have low vision, you may benefit from a high contrast theme, with greater
     * If you chose a single theme, click a theme.
 
     * If you chose to follow your system settings, click a day theme and a night theme.{% ifversion fpt or ghec %}
-    * If you would like to choose a theme which is currently in public beta, you will first need to enable it with feature preview. For more information, see "[AUTOTITLE](/get-started/using-github/exploring-early-access-releases-with-feature-preview)."{% endif %}
+    * If you would like to choose a theme which is currently in {% data variables.release-phases.public_preview %}, you will first need to enable it with feature preview. For more information, see "[AUTOTITLE](/get-started/using-github/exploring-early-access-releases-with-feature-preview)."{% endif %}
 
 {% ifversion command-palette %}
 
diff --git a/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md b/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md
index 2ec4feaf6d..cfbc8a753a 100644
--- a/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md
+++ b/content/get-started/exploring-projects-on-github/saving-repositories-with-stars.md
@@ -51,7 +51,7 @@ To view everyone who has starred a repository, add `/stargazers` to the end of t
 
 {% note %}
 
-**Note:** Lists are currently in public beta and subject to change.
+**Note:** Lists are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md b/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md
index 58eefdb1f1..2f792a86c3 100644
--- a/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md
+++ b/content/get-started/using-github/exploring-early-access-releases-with-feature-preview.md
@@ -1,6 +1,6 @@
 ---
 title: Exploring early access releases with feature preview
-intro: You can use feature preview to see products or features that are available in beta and to enable or disable each feature for your personal account.
+intro: You can use feature preview to see products or features that are available in {% data variables.release-phases.public_preview %} and to enable or disable each feature for your personal account.
 redirect_from:
   - /articles/exploring-early-access-releases-with-feature-preview
   - /github/getting-started-with-github/exploring-early-access-releases-with-feature-preview
@@ -18,13 +18,13 @@ shortTitle: Feature preview
 
 | Phase | Description |
 |-------|-------------|
-| Alpha | The product or feature is under heavy development and often has changing requirements and scope. The feature is available for demonstration and test purposes but may not be documented. Alpha releases are not necessarily feature complete, no service level agreements (SLAs) are provided, and there are no technical support obligations. <br><br> **Note**: A product or feature released as a "Technology Preview" is considered to be in the alpha release stage. Technology Preview releases share the same characteristics of alpha releases as described above.|
-| Beta | The product or feature is ready for broader distribution. Beta releases can be public or private, are documented, but do not have any SLAs or technical support obligations. |
+| {% data variables.release-phases.private_preview_caps %} | The product or feature is under heavy development and often has changing requirements and scope. The feature is available for demonstration and test purposes but may not be documented. {% data variables.release-phases.private_preview_caps %} releases are not necessarily feature complete, no service level agreements (SLAs) are provided, and there are no technical support obligations. <br><br> **Note**: A product or feature released as a "Technology Preview" is considered to be in the {% data variables.release-phases.private_preview %} release stage. Technology Preview releases share the same characteristics of {% data variables.release-phases.private_preview %} releases as described above.|
+| {% data variables.release-phases.public_preview_caps %} | The product or feature is ready for broader distribution. {% data variables.release-phases.public_preview_caps %} releases can be public or private, are documented, but do not have any SLAs or technical support obligations. |
 | General availability (GA) | The product or feature is fully tested and open publicly to all users. GA releases are ready for production use, and associated SLA and technical support obligations apply. |
 
-## Exploring beta releases with feature preview
+## Exploring {% data variables.release-phases.public_preview %} releases with feature preview
 
-You can see a list of features that are available in beta and a brief description for each feature. Each feature includes a link to give feedback.
+You can see a list of features that are available in {% data variables.release-phases.public_preview %} and a brief description for each feature. Each feature includes a link to give feedback.
 
 {% data reusables.feature-preview.feature-preview-setting  %}
 1. To view details for a feature, in the left sidebar, click the feature's name.
diff --git a/content/get-started/using-github/github-mobile.md b/content/get-started/using-github/github-mobile.md
index 4a396f6272..ddc373c639 100644
--- a/content/get-started/using-github/github-mobile.md
+++ b/content/get-started/using-github/github-mobile.md
@@ -56,7 +56,7 @@ You must install {% data variables.product.prodname_mobile %} 1.4 or later on yo
 
 To use {% data variables.product.prodname_mobile %} with {% data variables.product.prodname_ghe_server %}, {% data variables.product.prodname_dotcom %} must be version 3.0 or greater, and your enterprise owner must enable mobile support for your enterprise. For more information, see {% ifversion ghes %}"[AUTOTITLE](/admin/release-notes)" and {% endif %}"[Managing {% data variables.product.prodname_mobile %} for your enterprise]({% ifversion not ghes %}/enterprise-server@latest{% endif %}/admin/configuration/configuring-your-enterprise/managing-github-mobile-for-your-enterprise){% ifversion not ghes %}" in the {% data variables.product.prodname_ghe_server %} documentation.{% else %}."{% endif %}
 
-During the beta for {% data variables.product.prodname_mobile %} with {% data variables.product.prodname_ghe_server %}, you must be signed in with a personal account on {% data variables.product.prodname_dotcom_the_website %}.
+During the {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_mobile %} with {% data variables.product.prodname_ghe_server %}, you must be signed in with a personal account on {% data variables.product.prodname_dotcom_the_website %}.
 
 ### Adding, switching, or signing out of accounts
 
@@ -94,9 +94,9 @@ To re-enable Universal Links, long-press any {% data variables.product.product_n
 
 You can submit feature requests or other feedback for {% data variables.product.prodname_mobile %} on [{% data variables.product.prodname_github_community %}](https://github.com/orgs/community/discussions/categories/mobile).
 
-## Opting out of beta releases for iOS
+## Opting out of {% data variables.release-phases.public_preview %} releases for iOS
 
-If you're testing a beta release of {% data variables.product.prodname_mobile %} for iOS using TestFlight, you can leave the beta at any time.
+If you're testing a {% data variables.release-phases.public_preview %} release of {% data variables.product.prodname_mobile %} for iOS using TestFlight, you can leave the {% data variables.release-phases.public_preview %} at any time.
 
 1. On your iOS device, open the TestFlight app.
 1. Under "Apps", tap **{% data variables.product.prodname_dotcom %}**.
diff --git a/content/get-started/using-github/supported-browsers.md b/content/get-started/using-github/supported-browsers.md
index 8be22c7a93..23e6ad1ddd 100644
--- a/content/get-started/using-github/supported-browsers.md
+++ b/content/get-started/using-github/supported-browsers.md
@@ -36,6 +36,6 @@ Some browser vendors provide extended support releases. We do our best to ensure
 
 In earlier extended support releases, {% data variables.product.product_name %} may not work as you expect, and some features may not be available.
 
-## Beta and developer builds
+## {% data variables.release-phases.public_preview_caps %} and developer builds
 
-You may encounter unexpected bugs in beta and developer builds of our supported browsers. If you encounter a bug on {% data variables.product.product_name %} in one of these unreleased builds, please verify that it also exists in the stable version of the same browser. If the bug only exists in the unstable version, consider reporting the bug to the browser developer.
+You may encounter unexpected bugs in {% data variables.release-phases.public_preview %} and developer builds of our supported browsers. If you encounter a bug on {% data variables.product.product_name %} in one of these unreleased builds, please verify that it also exists in the stable version of the same browser. If the bug only exists in the unstable version, consider reporting the bug to the browser developer.
diff --git a/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md b/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md
index 2824f66ded..d41d458fa7 100644
--- a/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md
+++ b/content/get-started/writing-on-github/getting-started-with-writing-and-formatting-on-github/basic-writing-and-formatting-syntax.md
@@ -137,7 +137,7 @@ For more detailed information on the requirements of URI fragments, see [RFC 398
 The code block below demonstrates the basic rules used to generate anchors from headings in rendered content.
 
 ```markdown
-# Example headings 
+# Example headings
 
 ## Sample Section
 
@@ -233,7 +233,7 @@ For example, the following code displays a sun image for light themes and a moon
 
 {% data reusables.getting-started.picture-element-example %}
 
-The old method of specifying images based on the theme, by using a fragment appended to the URL (`#gh-dark-mode-only` or `#gh-light-mode-only`), is deprecated and will be removed in favor of the new method described above.
+The old method of specifying images based on the theme, by using a fragment appended to the URL (`#gh-dark-mode-only` or `#gh-light-mode-only`), is {% data variables.release-phases.closing_down %} and will be removed in favor of the new method described above.
 
 ## Lists
 
diff --git a/content/github-models/prototyping-with-ai-models.md b/content/github-models/prototyping-with-ai-models.md
index 3ba7b9f510..52907f421a 100644
--- a/content/github-models/prototyping-with-ai-models.md
+++ b/content/github-models/prototyping-with-ai-models.md
@@ -15,13 +15,13 @@ To find AI models, go to [{% data variables.product.prodname_marketplace %}](htt
 
 To view details about a model, click on the model's name.
 
-> [!NOTE] Access to OpenAI's `o1` models is in public beta and subject to change. To request access, join the [waitlist](https://github.com/o1-waitlist-signup).
+> [!NOTE] Access to OpenAI's `o1` models is in {% data variables.release-phases.public_preview %} and subject to change. To request access, join the [waitlist](https://github.com/o1-waitlist-signup).
 
 ## Experimenting with AI models in the playground
 
 >[!NOTE]
 >
-> The playground is in limited public beta and subject to change. To request access, [join the waitlist](https://github.com/marketplace/models/waitlist).
+> The playground is in {% data variables.release-phases.public_preview %} and subject to change. To request access, [join the waitlist](https://github.com/marketplace/models/waitlist).
 
 {% data variables.product.prodname_marketplace %} provides a free playground where you can adjust model parameters and submit prompts to see how the model responds.
 
@@ -35,7 +35,7 @@ The playground is rate limited. See [Rate limits](#rate-limits) below.
 
 >[!NOTE]
 >
-> The free API usage is in limited public beta and subject to change. To request access, [join the waitlist](https://github.com/marketplace/models/waitlist).
+> The free API usage is in {% data variables.release-phases.public_preview %} and subject to change. To request access, [join the waitlist](https://github.com/marketplace/models/waitlist).
 
 {% data variables.product.company_short %} provides free API usage so that you can experiment with AI models in your own application.
 
diff --git a/content/graphql/guides/migrating-graphql-global-node-ids.md b/content/graphql/guides/migrating-graphql-global-node-ids.md
index 63ef8c2d78..f26220481d 100644
--- a/content/graphql/guides/migrating-graphql-global-node-ids.md
+++ b/content/graphql/guides/migrating-graphql-global-node-ids.md
@@ -11,11 +11,11 @@ shortTitle: Migrating global node IDs
 
 ## Background
 
-The {% data variables.product.product_name %} GraphQL API currently supports two types of global node ID formats. The legacy format will be deprecated and replaced with a new format.  This guide shows you how to migrate to the new format, if necessary.
+The {% data variables.product.product_name %} GraphQL API currently supports two types of global node ID formats. The legacy format will be {% data variables.release-phases.closing_down %} and replaced with a new format.  This guide shows you how to migrate to the new format, if necessary.
 
-By migrating to the new format, you ensure that the response times of your requests remain consistent and small. You also ensure that your application continues to work once the legacy IDs are fully deprecated.
+By migrating to the new format, you ensure that the response times of your requests remain consistent and small. You also ensure that your application continues to work once the legacy IDs are {% data variables.release-phases.closing_down %}.
 
-To learn more about why the legacy global node ID format will be deprecated, see "[New global ID format coming to GraphQL](https://github.blog/2021-02-10-new-global-id-format-coming-to-graphql)."
+To learn more about why the legacy global node ID format will be {% data variables.release-phases.closing_down %}, see "[New global ID format coming to GraphQL](https://github.blog/2021-02-10-new-global-id-format-coming-to-graphql)."
 
 ## Determining if you need to take action
 
diff --git a/content/graphql/guides/using-the-explorer.md b/content/graphql/guides/using-the-explorer.md
index 449d0fa11e..63f28e54b0 100644
--- a/content/graphql/guides/using-the-explorer.md
+++ b/content/graphql/guides/using-the-explorer.md
@@ -37,7 +37,7 @@ You can use query autocompletion to help you build queries. In the main pane, wi
 
 ## Accessing the sidebar docs
 
-All types in a GraphQL schema include a `description` field compiled into documentation. The collapsible **Docs** pane on the right side of the Explorer page allows you to browse documentation about the type system. The docs are automatically updated and will drop deprecated fields.
+All types in a GraphQL schema include a `description` field compiled into documentation. The collapsible **Docs** pane on the right side of the Explorer page allows you to browse documentation about the type system. The docs are automatically updated and will drop fields that are {% data variables.release-phases.closing_down %}.
 
 {% note %}
 
diff --git a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/filtering-projects.md b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/filtering-projects.md
index cd354d243a..300c9635e1 100644
--- a/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/filtering-projects.md
+++ b/content/issues/planning-and-tracking-with-projects/customizing-views-in-your-project/filtering-projects.md
@@ -192,8 +192,8 @@ You can filter by specific text fields or use a general text filter across all t
 
 | Qualifier  | Example
 | ---------- | -------------
-| <code>field:"<em>TEXT</em>"    | **title:"API deprecation"** will show items with titles that exactly match "API deprecation."
-| <code>field:<em>TEXT</em>      | **note:complete** will show items with a note text field that exactly match "complete."
+| <code>field:"<em>TEXT</em>"    | **title:"Bug fix"** will show items with titles that exactly match "Bug fix".
+| <code>field:<em>TEXT</em>      | **note:complete** will show items with a note text field that exactly match "complete".
 | <code><em>TEXT</em></code>     | **API** will show items with "API" in the title or any other text field.
 | <code>field:<em>TEXT</em> TEXT | **label:bug rendering** will show items with the "bug" label and with "rendering" in the title or any other text field.
 
diff --git a/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md b/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md
index 3d5a2c8cdc..1d533ff7c0 100644
--- a/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md
+++ b/content/issues/planning-and-tracking-with-projects/managing-items-in-your-project/adding-items-to-your-project.md
@@ -24,7 +24,7 @@ You have several options for adding issues and pull requests to your project. Yo
 
 {% note %}
 
-**Note:** Timeline events for Projects is currently in beta and subject to change.
+**Note:** Timeline events for Projects is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/issues/tracking-your-work-with-issues/using-issues/about-slash-commands.md b/content/issues/tracking-your-work-with-issues/using-issues/about-slash-commands.md
index 182abddb11..ff2bc9c63b 100644
--- a/content/issues/tracking-your-work-with-issues/using-issues/about-slash-commands.md
+++ b/content/issues/tracking-your-work-with-issues/using-issues/about-slash-commands.md
@@ -10,7 +10,7 @@ redirect_from:
 
 {% note %}
 
-**Note:** Slash commands are currently in public beta and subject to change.
+**Note:** Slash commands are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/issues/tracking-your-work-with-issues/using-issues/creating-a-branch-for-an-issue.md b/content/issues/tracking-your-work-with-issues/using-issues/creating-a-branch-for-an-issue.md
index 71189dc309..5b07db81b4 100644
--- a/content/issues/tracking-your-work-with-issues/using-issues/creating-a-branch-for-an-issue.md
+++ b/content/issues/tracking-your-work-with-issues/using-issues/creating-a-branch-for-an-issue.md
@@ -15,7 +15,7 @@ redirect_from:
 
 {% note %}
 
-**Note:** The ability to create a branch for an issue is currently in public beta and subject to change.
+**Note:** The ability to create a branch for an issue is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/displaying-ip-addresses-in-the-audit-log-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/displaying-ip-addresses-in-the-audit-log-for-your-organization.md
index 72254384a4..32a2572423 100644
--- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/displaying-ip-addresses-in-the-audit-log-for-your-organization.md
+++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/displaying-ip-addresses-in-the-audit-log-for-your-organization.md
@@ -15,7 +15,7 @@ topics:
 
 {% note %}
 
-**Note:** Displaying IP addresses in the audit log for an organization is in public beta and subject to change.
+**Note:** Displaying IP addresses in the audit log for an organization is in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md b/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md
index 9c4ab06860..f3bda072cd 100644
--- a/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md
+++ b/content/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles.md
@@ -20,7 +20,7 @@ You can also create a custom organization role that includes permissions for rep
 
 You can create a role that includes permissions for organization settings, a base role for repository access, or both. If you add a base role for repository access, you can also include additional repository permissions. You can't create a role with repository permissions unless it includes a base repository role. Without repository permissions or a base repository role, the organization role doesn't grant access to any repositories.
 
->[!NOTE] Adding repository permissions to a custom organization role is currently in public beta and subject to change.
+>[!NOTE] Adding repository permissions to a custom organization role is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endif %}
 
diff --git a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md
index 0422bf5b59..baced2b288 100644
--- a/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md
+++ b/content/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request.md
@@ -19,7 +19,7 @@ redirect_from:
   - /github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/reviewing-dependency-changes-in-a-pull-request
 shortTitle: Review dependency changes
 ---
-<!--Marketing-LINK: From /features/security/software-supply-chain page "Sign up for the dependency review beta" and "Reviewing dependency changes in a pull request".-->
+<!--Marketing-LINK: From /features/security/software-supply-chain page "Sign up for the dependency review {% data variables.release-phases.public_preview %}" and "Reviewing dependency changes in a pull request".-->
 
 ## About dependency review
 
diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch.md b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch.md
index bae66a253b..aff84ea649 100644
--- a/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch.md
+++ b/content/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/renaming-a-branch.md
@@ -22,7 +22,7 @@ If a repository's default branch is renamed, {% data variables.product.prodname_
 
 Although file URLs are automatically redirected, raw file URLs are not redirected. Also, {% data variables.product.prodname_dotcom %} does not perform any redirects if users perform a `git pull` for the previous branch name.
 
-{% data variables.product.prodname_actions %} workflows do not follow renames, so if your repository publishes an action, anyone using that action with `@{old-branch-name}` will break. You should consider adding a new branch with the original content plus an additional commit reporting that the branch name is deprecated and suggesting that users migrate to the new branch name.
+{% data variables.product.prodname_actions %} workflows do not follow renames, so if your repository publishes an action, anyone using that action with `@{old-branch-name}` will break. You should consider adding a new branch with the original content plus an additional commit reporting that the branch name is {% data variables.release-phases.closing_down %} and suggesting that users migrate to the new branch name.
 
 Organizational rulesets that apply to branches of a repository will no longer allow the repository administrator to rename branches of the targeted repository or change the default branch to another branch. Repository administrators may create and delete branches so long as they have the appropriate permissions.
 
diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
index 495c29a75c..de2a890aef 100644
--- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
+++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-tag-protection-rules.md
@@ -6,7 +6,7 @@ versions:
   ghes: '<3.16'
 ---
 
->[!NOTE] Tag protection rules will be deprecated on August 30, 2024, and in {% data variables.product.prodname_ghe_server %} version 3.16 and later, in favor of rulesets. Any tag protection rules still in use after the deprecation date will be auto-migrated, but you can also migrate them manually before the deprecation date. You can read more about this deprecation on the [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2024-05-29-sunset-notice-tag-protections).
+>[!NOTE] Tag protection rules are {% data variables.release-phases.closing_down %} in {% data variables.product.prodname_ghe_server %} version 3.16 and later. Use rulesets instead. Any tag protection rules still in use will be auto-migrated. You can read more about this on the [{% data variables.product.prodname_blog %}](https://github.blog/changelog/2024-05-29-sunset-notice-tag-protections).
 
 When you add a tag protection rule, all tags that match the pattern provided will be protected. Only users with admin or maintain permissions, or custom roles with the "edit repository rules" permission in the repository will be able to create protected tags, and only users with admin permissions or custom roles with the "edit repository rules" permission in the repository will be able to delete protected tags. For more information, see "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization#permissions-for-each-role)." {% data variables.product.prodname_github_apps %} require the `Repository administration: write` permission to modify a protected tag.
 
diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-push-policy-for-your-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-push-policy-for-your-repository.md
index 4a675685df..3815532408 100644
--- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-push-policy-for-your-repository.md
+++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-push-policy-for-your-repository.md
@@ -13,7 +13,7 @@ shortTitle: Manage the push policy
 
 {% note %}
 
-**Note:** The push policy is currently in beta and subject to change.
+**Note:** The push policy is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/repositories/releasing-projects-on-github/managing-releases-in-a-repository.md b/content/repositories/releasing-projects-on-github/managing-releases-in-a-repository.md
index 4105891f60..53671b5609 100644
--- a/content/repositories/releasing-projects-on-github/managing-releases-in-a-repository.md
+++ b/content/repositories/releasing-projects-on-github/managing-releases-in-a-repository.md
@@ -58,7 +58,7 @@ You can choose whether {% data variables.large_files.product_name_long %} ({% da
 1. Follow the interactive prompts. Alternatively, you can specify arguments to skip these prompts. For more information about possible arguments, see [the {% data variables.product.prodname_cli %} manual](https://cli.github.com/manual/gh_release_create). For example, this command creates a prerelease with the specified title and notes.
 
    ```shell
-   gh release create v1.3.2 --title "v1.3.2 (beta)" --notes "this is a beta release" --prerelease
+   gh release create v1.3.2 --title "v1.3.2 (beta)" --notes "this is a {% data variables.release-phases.public_preview %} release" --prerelease
    ```
 
 If you @mention any {% data variables.product.product_name %} users in the notes, the published release on {% data variables.product.prodname_dotcom_the_website %} will include a **Contributors** section with an avatar list of all the mentioned users.
diff --git a/content/repositories/viewing-activity-and-data-for-your-repository/viewing-deployment-activity-for-your-repository.md b/content/repositories/viewing-activity-and-data-for-your-repository/viewing-deployment-activity-for-your-repository.md
index 6f511cbec9..e2a472ceb3 100644
--- a/content/repositories/viewing-activity-and-data-for-your-repository/viewing-deployment-activity-for-your-repository.md
+++ b/content/repositories/viewing-activity-and-data-for-your-repository/viewing-deployment-activity-for-your-repository.md
@@ -15,7 +15,7 @@ shortTitle: View deployment activity
 ---
 {% note %}
 
-**Note:** The deployments dashboard is currently in beta and subject to change.
+**Note:** The deployments dashboard is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/rest/codespaces/organization-secrets.md b/content/rest/codespaces/organization-secrets.md
index 2d6c7b2e53..5411c9ced4 100644
--- a/content/rest/codespaces/organization-secrets.md
+++ b/content/rest/codespaces/organization-secrets.md
@@ -15,7 +15,7 @@ autogenerated: rest
 
 {% note %}
 
-**Note**: These endpoints are currently in public beta and subject to change.
+**Note**: These endpoints are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/rest/copilot/copilot-user-management.md b/content/rest/copilot/copilot-user-management.md
index bb1a59fe35..f7dc2b277d 100644
--- a/content/rest/copilot/copilot-user-management.md
+++ b/content/rest/copilot/copilot-user-management.md
@@ -14,6 +14,6 @@ redirect_from:
   - /rest/copilot/copilot-business
 ---
 
-> [!NOTE] These endpoints are in public beta and subject to change.
+> [!NOTE] These endpoints are in {% data variables.release-phases.public_preview %} and subject to change.
 
 <!-- Content after this section is automatically generated -->
diff --git a/content/rest/dependabot/alerts.md b/content/rest/dependabot/alerts.md
index 31bd9cf79d..e5e0d78d93 100644
--- a/content/rest/dependabot/alerts.md
+++ b/content/rest/dependabot/alerts.md
@@ -14,7 +14,7 @@ autogenerated: rest
 
 {% note %}
 
-**Note**: The ability to use the REST API to manage Dependabot alerts is currently in public beta and subject to change.
+**Note**: The ability to use the REST API to manage Dependabot alerts is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/content/rest/enterprise-admin/management-console.md b/content/rest/enterprise-admin/management-console.md
index 9c8fb2b7c1..1256a544f4 100644
--- a/content/rest/enterprise-admin/management-console.md
+++ b/content/rest/enterprise-admin/management-console.md
@@ -12,7 +12,7 @@ topics:
 autogenerated: rest
 ---
 
-## Deprecation of the Management Console endpoints
+## About the Management Console endpoints
 
 The full functionality of the Management Console endpoints was added to the [Manage GHES](/rest/enterprise-admin/manage-ghes) endpoints in {% data variables.product.prodname_ghe_server %} version 3.12. With feature parity achieved, the Management Console API endpoints {% ifversion ghes < 3.15 %}will be{% else %}were{% endif %} removed in version 3.15.
 
diff --git a/content/rest/migrations/source-imports.md b/content/rest/migrations/source-imports.md
index 4e1dc1ca03..13e981e77c 100644
--- a/content/rest/migrations/source-imports.md
+++ b/content/rest/migrations/source-imports.md
@@ -16,7 +16,7 @@ autogenerated: rest
 
 {% warning %}
 
-**Warning**: Due to very low levels of usage and available alternatives, the Source Imports API has been deprecated and is no longer  available as of April 12, 2024. For more details and alternatives, see the [changelog](https://gh.io/source-imports-api-deprecation).
+**Warning**: Due to very low levels of usage and available alternatives, the Source Imports API has been {% data variables.release-phases.retired %}. For more details and alternatives, see the [changelog](https://gh.io/source-imports-api-deprecation).
 
 {% endwarning %}
 
diff --git a/content/search-github/searching-on-github/searching-discussions.md b/content/search-github/searching-on-github/searching-discussions.md
index decad00a8b..04405af34a 100644
--- a/content/search-github/searching-on-github/searching-discussions.md
+++ b/content/search-github/searching-on-github/searching-discussions.md
@@ -107,7 +107,7 @@ You can use the `involves` qualifier to find discussions that involve a certain
 | Qualifier | Example |
 | :- | :- |
 | <code>involves:<em>USERNAME</em></code> | **[involves:becca involves:octocat](https://github.com/search?q=involves%3Abecca+involves%3Aoctocat&type=Discussions)** matches discussions either @becca or @octocat are involved in.
-| `in:body` <code>involves:<em>USERNAME</em></code> | [**NOT beta in:body involves:becca**](https://github.com/search?q=NOT+beta+in%3Abody+involves%3Abecca&type=Discussions) matches discussions @becca is involved in that do not contain the word "beta" in the body.
+| `in:body` <code>involves:<em>USERNAME</em></code> | [**NOT {% data variables.release-phases.public_preview %} in:body involves:becca**](https://github.com/search?q=NOT+beta+in%3Abody+involves%3Abecca&type=Discussions) matches discussions @becca is involved in that do not contain the word "beta" in the body.
 
 ## Search by number of comments
 
diff --git a/content/webhooks/about-webhooks.md b/content/webhooks/about-webhooks.md
index 3b96b4b3c6..2d74c6630d 100644
--- a/content/webhooks/about-webhooks.md
+++ b/content/webhooks/about-webhooks.md
@@ -61,7 +61,7 @@ For information on best practices to follow when using webhooks, see "[AUTOTITLE
 
 {% note %}
 
-**Note:** GitHub Services (sometimes referred to as Service Hooks) was deprecated in 2019, in favor of integrating with webhooks. For more information about migrating your integration from using GitHub Services to using webhooks, see the [blog post](https://developer.github.com/changes/2018-04-25-github-services-deprecation/).
+**Note:** GitHub Services (sometimes referred to as Service Hooks) is {% data variables.release-phases.retired %}, in favor of integrating with webhooks. For more information about migrating your integration from using GitHub Services to using webhooks, see the [blog post](https://developer.github.com/changes/2018-04-25-github-services-deprecation/).
 
 {% endnote %}
 
diff --git a/data/reusables/actions/configuration-variables-beta-note.md b/data/reusables/actions/configuration-variables-beta-note.md
index 94c726a06f..064f7eb7f2 100644
--- a/data/reusables/actions/configuration-variables-beta-note.md
+++ b/data/reusables/actions/configuration-variables-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Configuration variables for {% data variables.product.prodname_actions %} are in beta and subject to change.
+**Note:** Configuration variables for {% data variables.product.prodname_actions %} are in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/actions/custom-deployment-protection-rules-beta-note.md b/data/reusables/actions/custom-deployment-protection-rules-beta-note.md
index 9f5744080f..98cbaf7067 100644
--- a/data/reusables/actions/custom-deployment-protection-rules-beta-note.md
+++ b/data/reusables/actions/custom-deployment-protection-rules-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Custom deployment protection rules are currently in public beta and subject to change.
+**Note:** Custom deployment protection rules are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/actions/deployment-history-beta-note.md b/data/reusables/actions/deployment-history-beta-note.md
index 346bcdb713..3e0c96320f 100644
--- a/data/reusables/actions/deployment-history-beta-note.md
+++ b/data/reusables/actions/deployment-history-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Deployment history is currently in beta and subject to change.
+**Note:** Deployment history is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/advanced-security/starter-workflows-beta.md b/data/reusables/advanced-security/starter-workflows-beta.md
index 2017844089..f914a5c5c4 100644
--- a/data/reusables/advanced-security/starter-workflows-beta.md
+++ b/data/reusables/advanced-security/starter-workflows-beta.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:**  Workflow templates for {% data variables.product.prodname_advanced_security %} have been consolidated in a "Security" category in the **Actions** tab of a repository. This new configuration is currently in beta and subject to change.
+**Note:**  Workflow templates for {% data variables.product.prodname_advanced_security %} have been consolidated in a "Security" category in the **Actions** tab of a repository.
 
 {% endnote %}
diff --git a/data/reusables/advisory-database/beta-malware-advisories.md b/data/reusables/advisory-database/beta-malware-advisories.md
index 94fc49a4c6..404bf94960 100644
--- a/data/reusables/advisory-database/beta-malware-advisories.md
+++ b/data/reusables/advisory-database/beta-malware-advisories.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Advisories for malware are currently in beta and subject to change.
+**Note:** Advisories for malware are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/apps/deprecating_auth_with_query_parameters.md b/data/reusables/apps/deprecating_auth_with_query_parameters.md
index 5dcb8b4407..b1825ea70f 100644
--- a/data/reusables/apps/deprecating_auth_with_query_parameters.md
+++ b/data/reusables/apps/deprecating_auth_with_query_parameters.md
@@ -1,6 +1,6 @@
 {% warning %}
 
-**Deprecation Notice:** {% data variables.product.prodname_dotcom %} will discontinue authentication to the API using query parameters. Authenticating to the API should be done with [HTTP basic authentication](/rest/overview/authenticating-to-the-rest-api#using-basic-authentication).{% ifversion fpt or ghec %} Using query parameters to authenticate to the API will no longer work on May 5, 2021. {% endif %}  For more information, including scheduled brownouts, see the [blog post](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/).
+**{% data variables.release-phases.retired_caps %} Notice:** {% data variables.product.prodname_dotcom %} no longer to the API using query parameters. Authenticating to the API should be done with [HTTP basic authentication](/rest/overview/authenticating-to-the-rest-api#using-basic-authentication).For more information, including scheduled brownouts, see the [blog post](https://developer.github.com/changes/2020-02-10-deprecating-auth-through-query-param/).
 
 {% ifversion ghes %} Authentication to the API using query parameters while available is no longer supported due to security concerns. Instead we recommend integrators move their access token, `client_id`, or `client_secret` in the header. {% data variables.product.prodname_dotcom %} will announce the removal of authentication by query parameters with advanced notice. {% endif %}
 
diff --git a/data/reusables/audit_log/authentication-metadata-git-events-release-phase.md b/data/reusables/audit_log/authentication-metadata-git-events-release-phase.md
index b74de28bbc..0608619c38 100644
--- a/data/reusables/audit_log/authentication-metadata-git-events-release-phase.md
+++ b/data/reusables/audit_log/authentication-metadata-git-events-release-phase.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note**: Display of token data for Git events in the audit log is in public beta and subject to change.
+**Note**: Display of token data for Git events in the audit log is in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/audit_log/authentication-methods-with-metadata.md b/data/reusables/audit_log/authentication-methods-with-metadata.md
index 0d4e81704f..319bf31941 100644
--- a/data/reusables/audit_log/authentication-methods-with-metadata.md
+++ b/data/reusables/audit_log/authentication-methods-with-metadata.md
@@ -9,7 +9,7 @@ Token data appears in the audit log for the following authentication methods.
 
 {% note %}
 
-**Note**: Display of token data for SSH keys and deploy keys in the audit log is in public beta and subject to change.
+**Note**: Display of token data for SSH keys and deploy keys in the audit log is in {% data variables.release-phases.public_preview %} and subject to change.
 
 {%- endnote %}
 {% endif %}
diff --git a/data/reusables/billing/enhanced-billing-platform-licenses.md b/data/reusables/billing/enhanced-billing-platform-licenses.md
index 7882ef0647..27b09782dc 100644
--- a/data/reusables/billing/enhanced-billing-platform-licenses.md
+++ b/data/reusables/billing/enhanced-billing-platform-licenses.md
@@ -1,3 +1,3 @@
->[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the enhanced billing platform. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+>[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the enhanced billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 >
 > The page to view license usage has moved in the enhanced billing platform. See "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending#viewing-license-usage)."
diff --git a/data/reusables/billing/enhanced-billing-platform.md b/data/reusables/billing/enhanced-billing-platform.md
index 8f23395b8b..cdcbc743dd 100644
--- a/data/reusables/billing/enhanced-billing-platform.md
+++ b/data/reusables/billing/enhanced-billing-platform.md
@@ -1,3 +1,3 @@
->[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the enhanced billing platform. Enterprises that participated in the beta program also have access to the enhanced billing platform.
+>[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the enhanced billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 >
 > The enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls. See "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises)."
diff --git a/data/reusables/classroom/free-limited-codespaces-for-verified-teachers-beta-note.md b/data/reusables/classroom/free-limited-codespaces-for-verified-teachers-beta-note.md
index 2f8ac65e9f..20a92c00c2 100644
--- a/data/reusables/classroom/free-limited-codespaces-for-verified-teachers-beta-note.md
+++ b/data/reusables/classroom/free-limited-codespaces-for-verified-teachers-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note**: The {% data variables.product.prodname_codespaces %} Education benefit is currently in public beta and subject to change. During the beta release, your organization will not be charged if you exceed the free allowance.
+**Note**: The {% data variables.product.prodname_codespaces %} Education benefit is currently in {% data variables.release-phases.public_preview %} and subject to change. During the {% data variables.release-phases.public_preview %} release, your organization will not be charged if you exceed the free allowance.
 
 {% endnote %}
diff --git a/data/reusables/code-scanning/beta-alert-tracking-in-issues.md b/data/reusables/code-scanning/beta-alert-tracking-in-issues.md
index 3e3d0df165..8ee6ba293d 100644
--- a/data/reusables/code-scanning/beta-alert-tracking-in-issues.md
+++ b/data/reusables/code-scanning/beta-alert-tracking-in-issues.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** The tracking of {% data variables.product.prodname_code_scanning %} alerts in issues is in beta and subject to change.
+**Note:** The tracking of {% data variables.product.prodname_code_scanning %} alerts in issues is in {% data variables.release-phases.public_preview %} and subject to change.
 
 This feature supports running analysis natively using {% data variables.product.prodname_actions %} or externally using existing CI/CD infrastructure, as well as third-party {% data variables.product.prodname_code_scanning %} tools, but _not_ third-party tracking tools.
 
diff --git a/data/reusables/code-scanning/beta-larger-runners-support.md b/data/reusables/code-scanning/beta-larger-runners-support.md
index 462213bbd2..c104b3da36 100644
--- a/data/reusables/code-scanning/beta-larger-runners-support.md
+++ b/data/reusables/code-scanning/beta-larger-runners-support.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Support for {% data variables.actions.hosted_runners %} for {% data variables.product.prodname_code_scanning %} default setup is currently in beta and subject to change.
+**Note:** Support for {% data variables.actions.hosted_runners %} for {% data variables.product.prodname_code_scanning %} default setup is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/code-scanning/beta-model-packs.md b/data/reusables/code-scanning/beta-model-packs.md
index 10ba7f8626..77a65d1661 100644
--- a/data/reusables/code-scanning/beta-model-packs.md
+++ b/data/reusables/code-scanning/beta-model-packs.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** {% data variables.product.prodname_codeql %} model packs and the {% data variables.product.prodname_codeql %} model editor are currently in beta and subject to change. Model packs are supported by {% data variables.code-scanning.codeql_model_packs_support %} analysis.
+**Note:** {% data variables.product.prodname_codeql %} model packs and the {% data variables.product.prodname_codeql %} model editor are currently in {% data variables.release-phases.public_preview %} and subject to change. Model packs are supported by {% data variables.code-scanning.codeql_model_packs_support %} analysis.
 
 {% endnote %}
 
diff --git a/data/reusables/code-scanning/beta-org-enable-all.md b/data/reusables/code-scanning/beta-org-enable-all.md
index 323149a943..90c3bf410f 100644
--- a/data/reusables/code-scanning/beta-org-enable-all.md
+++ b/data/reusables/code-scanning/beta-org-enable-all.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** The ability to enable and disable default setup for {% data variables.product.prodname_code_scanning %} for eligible repositories in an organization is currently in beta and subject to change.
+**Note:** The ability to enable and disable default setup for {% data variables.product.prodname_code_scanning %} for eligible repositories in an organization is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/data/reusables/code-scanning/beta-threat-models-cli.md b/data/reusables/code-scanning/beta-threat-models-cli.md
index 610c80ec30..2c2d54213f 100644
--- a/data/reusables/code-scanning/beta-threat-models-cli.md
+++ b/data/reusables/code-scanning/beta-threat-models-cli.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** Threat models are currently in beta and subject to change. During the beta, threat models are supported only by analysis for {% data variables.code-scanning.code_scanning_threat_model_support %}.
+**Note:** Threat models are currently in {% data variables.release-phases.public_preview %} and subject to change. During the {% data variables.release-phases.public_preview %}, threat models are supported only by analysis for {% data variables.code-scanning.code_scanning_threat_model_support %}.
 
 {% endnote %}
 
diff --git a/data/reusables/code-scanning/beta-threat-models.md b/data/reusables/code-scanning/beta-threat-models.md
index d3f4862ed7..857e97c50c 100644
--- a/data/reusables/code-scanning/beta-threat-models.md
+++ b/data/reusables/code-scanning/beta-threat-models.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** Threat models are currently in beta and subject to change. During the beta, threat models are supported only by analysis for {% data variables.code-scanning.code_scanning_threat_model_support %}.
+**Note:** Threat models are currently in {% data variables.release-phases.public_preview %} and subject to change. During the {% data variables.release-phases.public_preview %}, threat models are supported only by analysis for {% data variables.code-scanning.code_scanning_threat_model_support %}.
 
 {% endnote %}
 
diff --git a/data/reusables/codespaces/codespaces-jetbrains-beta-note.md b/data/reusables/codespaces/codespaces-jetbrains-beta-note.md
index 6f5630fdeb..17e07061d8 100644
--- a/data/reusables/codespaces/codespaces-jetbrains-beta-note.md
+++ b/data/reusables/codespaces/codespaces-jetbrains-beta-note.md
@@ -2,7 +2,7 @@
 
 **Notes:**
 
-* Using {% data variables.product.prodname_github_codespaces %} with JetBrains IDEs is currently in public beta and is subject to change.
+* Using {% data variables.product.prodname_github_codespaces %} with JetBrains IDEs is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 * To work on a codespace in a JetBrains IDE you must use <!-- expires 2024-09-30 -->release 2023.3.\* or 2024.1.\*<!-- end expires 2024-09-30 --><!-- See https://github.com/github/docs-content/issues/15070#issuecomment-2202422516 --> of the JetBrains Gateway.
 
 {% endnote %}
diff --git a/data/reusables/command-palette/beta-note.md b/data/reusables/command-palette/beta-note.md
index a6681190ee..9b6e151c3a 100644
--- a/data/reusables/command-palette/beta-note.md
+++ b/data/reusables/command-palette/beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** The {% data variables.product.prodname_command_palette %} is currently in public beta and is subject to change.
+**Note:** The {% data variables.product.prodname_command_palette %} is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% endnote %}
diff --git a/data/reusables/community/issue-forms-beta.md b/data/reusables/community/issue-forms-beta.md
index 8582253f26..c57c2b752b 100644
--- a/data/reusables/community/issue-forms-beta.md
+++ b/data/reusables/community/issue-forms-beta.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Issue forms are currently in beta and subject to change.
+**Note:** Issue forms are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/copilot/chat-beta-indexing.md b/data/reusables/copilot/chat-beta-indexing.md
index a20b68e4f9..477484f286 100644
--- a/data/reusables/copilot/chat-beta-indexing.md
+++ b/data/reusables/copilot/chat-beta-indexing.md
@@ -1 +1 @@
-Only selected repositories have been semantically indexed for this beta. The ability for you to index your own repositories will be added soon.
+Only selected repositories have been semantically indexed for this {% data variables.release-phases.public_preview %}. The ability for you to index your own repositories will be added soon.
diff --git a/data/reusables/copilot/chat-dotcom-beta.md b/data/reusables/copilot/chat-dotcom-beta.md
index e7aae83db0..3d11b9ce08 100644
--- a/data/reusables/copilot/chat-dotcom-beta.md
+++ b/data/reusables/copilot/chat-dotcom-beta.md
@@ -1 +1 @@
-{% data variables.product.prodname_copilot_chat %} is currently in beta for users with a {% data variables.product.prodname_copilot_individuals_short %} or {% data variables.product.prodname_copilot_business_short %} subscription.
+{% data variables.product.prodname_copilot_chat %} is currently in {% data variables.release-phases.public_preview %} for users with a {% data variables.product.prodname_copilot_individuals_short %} or {% data variables.product.prodname_copilot_business_short %} subscription.
diff --git a/data/reusables/copilot/content-exclusion-note.md b/data/reusables/copilot/content-exclusion-note.md
index 15cc76619e..6a080ffcaf 100644
--- a/data/reusables/copilot/content-exclusion-note.md
+++ b/data/reusables/copilot/content-exclusion-note.md
@@ -1 +1 @@
-> [!NOTE] Excluding content from {% data variables.product.prodname_copilot %} is currently in public beta and is subject to change.
+> [!NOTE] Excluding content from {% data variables.product.prodname_copilot %} is currently in {% data variables.release-phases.public_preview %} and is subject to change.
diff --git a/data/reusables/copilot/content-exclusions-availability-and-beta-note.md b/data/reusables/copilot/content-exclusions-availability-and-beta-note.md
index 04833f7474..854abf1578 100644
--- a/data/reusables/copilot/content-exclusions-availability-and-beta-note.md
+++ b/data/reusables/copilot/content-exclusions-availability-and-beta-note.md
@@ -1,3 +1,3 @@
 > [!NOTE]
-> * Excluding content from {% data variables.product.prodname_copilot %} is currently in public beta and is subject to change.
+> * Excluding content from {% data variables.product.prodname_copilot %} is currently in {% data variables.release-phases.public_preview %} and is subject to change.
 > * Content exclusions are currently supported in select IDEs. See "[AUTOTITLE](/copilot/managing-copilot/managing-github-copilot-in-your-organization/managing-github-copilot-features-in-your-organization/about-content-exclusions-for-github-copilot#availability-of-content-exclusions)."
diff --git a/data/reusables/copilot/copilot-chat-models-beta-note.md b/data/reusables/copilot/copilot-chat-models-beta-note.md
index e5bf290e0d..365bf7f732 100644
--- a/data/reusables/copilot/copilot-chat-models-beta-note.md
+++ b/data/reusables/copilot/copilot-chat-models-beta-note.md
@@ -1 +1 @@
-> [!NOTE] The ability to change the AI model used by {% data variables.product.prodname_copilot_chat_short %} is in beta and subject to change. To request access, join the [waitlist](https://github.com/o1-waitlist-signup).
+> [!NOTE] The ability to change the AI model used by {% data variables.product.prodname_copilot_chat_short %} is in {% data variables.release-phases.public_preview %} and subject to change. To request access, join the [waitlist](https://github.com/o1-waitlist-signup).
diff --git a/data/reusables/copilot/copilot-chat-models-list.md b/data/reusables/copilot/copilot-chat-models-list.md
index 549cfbd145..d4a91f508c 100644
--- a/data/reusables/copilot/copilot-chat-models-list.md
+++ b/data/reusables/copilot/copilot-chat-models-list.md
@@ -1,4 +1,4 @@
-For those enrolled in the model selection beta for {% data variables.product.prodname_copilot_chat_short %}, the following models are currently available:
+For those enrolled in the model selection {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_copilot_chat_short %}, the following models are currently available:
 
 * `gpt-4o`: This is the default {% data variables.product.prodname_copilot_chat_short %} model. It is a versatile, multimodal model that excels in both text and image processing and is designed to provide fast, reliable responses. It also has superior performance in non-English languages.
 * `o1-preview`: This model is focused on advanced reasoning and solving complex problems, in particular in math and science. It responds more slowly than the `gpt-4o` model. You can make 10 requests to this model per day.
diff --git a/data/reusables/copilot/copilot-enterprise-enable.md b/data/reusables/copilot/copilot-enterprise-enable.md
index b66386f65f..fccdc8c71a 100644
--- a/data/reusables/copilot/copilot-enterprise-enable.md
+++ b/data/reusables/copilot/copilot-enterprise-enable.md
@@ -12,4 +12,4 @@
 
 1. Next to "Give {% data variables.product.prodname_copilot_short %} access to Bing," click the dropdown menu and select the policy you want to enforce. By default, Bing is disabled at the organization level.
 
-   > [!NOTE] Bing search integration into {% data variables.product.prodname_copilot_chat_dotcom_short %}, {% data variables.product.prodname_vscode_shortname %}, and {% data variables.product.prodname_vs %} is currently in beta and is subject to change.
+   > [!NOTE] Bing search integration into {% data variables.product.prodname_copilot_chat_dotcom_short %}, {% data variables.product.prodname_vscode_shortname %}, and {% data variables.product.prodname_vs %} is currently in {% data variables.release-phases.public_preview %} and is subject to change.
diff --git a/data/reusables/copilot/copilot-extensions/beta-note.md b/data/reusables/copilot/copilot-extensions/beta-note.md
index a312a98fc6..f9c72d2f62 100644
--- a/data/reusables/copilot/copilot-extensions/beta-note.md
+++ b/data/reusables/copilot/copilot-extensions/beta-note.md
@@ -1 +1 @@
-> [!NOTE] {% data variables.product.prodname_copilot_extensions %} is in public beta and subject to change.
+> [!NOTE] {% data variables.product.prodname_copilot_extensions %} is in {% data variables.release-phases.public_preview %} and subject to change.
diff --git a/data/reusables/copilot/enabling-chat-enterprise.md b/data/reusables/copilot/enabling-chat-enterprise.md
index 20893c02f5..7d5adcc447 100644
--- a/data/reusables/copilot/enabling-chat-enterprise.md
+++ b/data/reusables/copilot/enabling-chat-enterprise.md
@@ -1,6 +1,6 @@
 {% data reusables.enterprise-accounts.policies-tab %}
 {% data reusables.enterprise-accounts.copilot-tab %}
-1. To the right of **{% data variables.product.prodname_copilot_chat %} Beta**, select the dropdown menu, and then choose the appropriate option.
-    * Click **Allowed** to enable the {% data variables.product.prodname_copilot_chat %} beta for all organizations under your enterprise.
-    * Click **Blocked** to disable the {% data variables.product.prodname_copilot_chat %} beta for all organizations under your enterprise.
+1. To the right of **{% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview_caps %}**, select the dropdown menu, and then choose the appropriate option.
+    * Click **Allowed** to enable the {% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview %} for all organizations under your enterprise.
+    * Click **Blocked** to disable the {% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview %} for all organizations under your enterprise.
     * Click **No policy** to allow each organization under your enterprise to set their own policy.
diff --git a/data/reusables/copilot/enabling-chat-organization.md b/data/reusables/copilot/enabling-chat-organization.md
index be48043d1d..6ca5dc3769 100644
--- a/data/reusables/copilot/enabling-chat-organization.md
+++ b/data/reusables/copilot/enabling-chat-organization.md
@@ -1,4 +1,4 @@
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "copilot" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}**, and then click **Policies**.
-1. To the right of **{% data variables.product.prodname_copilot_chat %} Beta**, select the dropdown menu, and then click **Enabled** or **Disabled**.
+1. To the right of **{% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview_caps %}**, select the dropdown menu, and then click **Enabled** or **Disabled**.
diff --git a/data/reusables/copilot/enabling-copilot-chat-beta.md b/data/reusables/copilot/enabling-copilot-chat-beta.md
index f52cc8aee1..eb54a7f4de 100644
--- a/data/reusables/copilot/enabling-copilot-chat-beta.md
+++ b/data/reusables/copilot/enabling-copilot-chat-beta.md
@@ -11,13 +11,13 @@ If {% data variables.product.prodname_copilot_chat_short %} is enabled or disabl
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 1. In the "Code, planning, and automation" section of the sidebar, click **{% octicon "copilot" aria-hidden="true" %} {% data variables.product.prodname_copilot_short %}**, and then click **Policies**.
-1. To the right of **{% data variables.product.prodname_copilot_chat %} Beta**, select the dropdown menu, and then click **Enabled** or **Disabled**.
+1. To the right of **{% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview_caps %}**, select the dropdown menu, and then click **Enabled** or **Disabled**.
 
 ### Enabling or disabling {% data variables.product.prodname_copilot_chat %} at the enterprise level
 
 {% data reusables.enterprise-accounts.policies-tab %}
 {% data reusables.enterprise-accounts.copilot-tab %}
-1. To the right of **{% data variables.product.prodname_copilot_chat %} Beta**, select the dropdown menu, and then choose the appropriate option.
-    * Click **Allowed** to enable the {% data variables.product.prodname_copilot_chat %} beta for all organizations under your enterprise.
-    * Click **Blocked** to disable the {% data variables.product.prodname_copilot_chat %} beta for all organizations under your enterprise.
+1. To the right of **{% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview_caps %}**, select the dropdown menu, and then choose the appropriate option.
+    * Click **Allowed** to enable the {% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview %} for all organizations under your enterprise.
+    * Click **Blocked** to disable the {% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview %} for all organizations under your enterprise.
     * Click **No policy** to allow each organization under your enterprise to set their own policy.
diff --git a/data/reusables/copilot/sku-isolation.md b/data/reusables/copilot/sku-isolation.md
index ff5412bac3..e4eb9a87de 100644
--- a/data/reusables/copilot/sku-isolation.md
+++ b/data/reusables/copilot/sku-isolation.md
@@ -1,4 +1,4 @@
-> [!NOTE] {% data variables.product.prodname_copilot_sku_isolation %} is currently in limited public beta and subject to change. <!-- expires 2024-10-31 -->This feature will be enabled for all users on October 31, 2024.<!-- end expires 2024-10-31 -->
+> [!NOTE] {% data variables.product.prodname_copilot_sku_isolation %} is currently in {% data variables.release-phases.public_preview %} and subject to change. <!-- expires 2024-10-31 -->This feature will be enabled for all users on October 31, 2024.<!-- end expires 2024-10-31 -->
 
 ## About {% data variables.product.prodname_copilot_sku_isolation %}
 
diff --git a/data/reusables/dependabot/configuration-options.md b/data/reusables/dependabot/configuration-options.md
index cc8babe077..9b630ce68e 100644
--- a/data/reusables/dependabot/configuration-options.md
+++ b/data/reusables/dependabot/configuration-options.md
@@ -9,7 +9,7 @@
 | [`allow`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#allow)                                             | {% octicon "x" aria-label="Not supported" %}| {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Customize which updates are allowed         |
 | [`assignees`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#assignees)                                     | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Assignees to set on pull requests           |
 | [`commit-message`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#commit-message)                           | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | Commit message preferences                  |
-| [`enable-beta-ecosystems`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#enable-beta-ecosystems)           | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | Enable ecosystems that have beta-level support |
+| [`enable-beta-ecosystems`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#enable-beta-ecosystems)           | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | Enable ecosystems that have {% data variables.release-phases.public_preview %}-level support |
 | {% ifversion dependabot-version-updates-groups %} |
 | [`groups`](/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups)                                           | {% octicon "x" aria-label="Not supported" %} | {% ifversion dependabot-grouped-security-updates-config %}{% octicon "check" aria-label="Supported" %}{% else %}{% octicon "x" aria-label="Not supported" %}{% endif %} | {% octicon "check" aria-label="Supported" %} | Group updates for certain dependencies     |
 | {% endif %} |
diff --git a/data/reusables/dependabot/dependabot-grouped-security-updates-beta-note.md b/data/reusables/dependabot/dependabot-grouped-security-updates-beta-note.md
index 2cfad0395e..d9b92289a2 100644
--- a/data/reusables/dependabot/dependabot-grouped-security-updates-beta-note.md
+++ b/data/reusables/dependabot/dependabot-grouped-security-updates-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Grouped pull requests for {% data variables.product.prodname_dependabot_security_updates %} are in beta and subject to change.
+**Note:** Grouped pull requests for {% data variables.product.prodname_dependabot_security_updates %} are in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/dependabot/dependabot-version-updates-groups-beta.md b/data/reusables/dependabot/dependabot-version-updates-groups-beta.md
index e60472006b..4fd237c467 100644
--- a/data/reusables/dependabot/dependabot-version-updates-groups-beta.md
+++ b/data/reusables/dependabot/dependabot-version-updates-groups-beta.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** {% data variables.product.prodname_dependabot %} grouped updates are currently in beta and is subject to change.
+**Note:** {% data variables.product.prodname_dependabot %} grouped updates are currently in {% data variables.release-phases.public_preview %} and is subject to change.
 
 {% endnote %}
 
diff --git a/data/reusables/dependabot/vulnerable-calls-beta.md b/data/reusables/dependabot/vulnerable-calls-beta.md
index 6d0647a97a..39f6abc024 100644
--- a/data/reusables/dependabot/vulnerable-calls-beta.md
+++ b/data/reusables/dependabot/vulnerable-calls-beta.md
@@ -4,7 +4,7 @@
 
 **Notes:**
 
-* The detection of calls to vulnerable functions by {% data variables.product.prodname_dependabot %} is in beta and subject to change.
+* The detection of calls to vulnerable functions by {% data variables.product.prodname_dependabot %} is in {% data variables.release-phases.public_preview %} and subject to change.
 * {% data reusables.gated-features.dependency-vulnerable-calls %}
 
 {% endnote %}
diff --git a/data/reusables/dependency-review/dependency-review-action-beta-note.md b/data/reusables/dependency-review/dependency-review-action-beta-note.md
index 178f333a05..bf2d2668cb 100644
--- a/data/reusables/dependency-review/dependency-review-action-beta-note.md
+++ b/data/reusables/dependency-review/dependency-review-action-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note**: The {% data variables.dependency-review.action_name %} is currently in public beta and subject to change.
+**Note**: The {% data variables.dependency-review.action_name %} is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/enterprise-accounts/approved-domains-beta-note.md b/data/reusables/enterprise-accounts/approved-domains-beta-note.md
index 09e98c7761..09f86b2f4d 100644
--- a/data/reusables/enterprise-accounts/approved-domains-beta-note.md
+++ b/data/reusables/enterprise-accounts/approved-domains-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note**: The ability to approve a domain not owned by your organization or enterprise is currently in beta and subject to change.
+**Note**: The ability to approve a domain not owned by your organization or enterprise is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/enterprise-managed/sso-redirect-release-phase.md b/data/reusables/enterprise-managed/sso-redirect-release-phase.md
index 3b6f4e53ba..07fb3fc586 100644
--- a/data/reusables/enterprise-managed/sso-redirect-release-phase.md
+++ b/data/reusables/enterprise-managed/sso-redirect-release-phase.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Automatically redirecting users to sign in is currently in beta for {% data variables.product.prodname_emus %} and subject to change.
+**Note:** Automatically redirecting users to sign in is currently in {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_emus %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/enterprise/editor-role-note.md b/data/reusables/enterprise/editor-role-note.md
index 2a368351cf..fd0638b9d3 100644
--- a/data/reusables/enterprise/editor-role-note.md
+++ b/data/reusables/enterprise/editor-role-note.md
@@ -1,5 +1,5 @@
 >[!NOTE]
->The editor role was deprecated in patch release
+>The editor role is {% data variables.release-phases.closing_down %} in patch release
 {%- ifversion ghes = 3.12 %} 3.12.2{%- endif %}
 {%- ifversion ghes = 3.11 %} 3.11.8{%- endif %}
 {%- ifversion ghes = 3.10 %} 3.10.10{%- endif %}
diff --git a/data/reusables/gated-features/copilot-chat-availability.md b/data/reusables/gated-features/copilot-chat-availability.md
index 6d21413909..f01d654f90 100644
--- a/data/reusables/gated-features/copilot-chat-availability.md
+++ b/data/reusables/gated-features/copilot-chat-availability.md
@@ -1,3 +1,3 @@
-All users with a {% data variables.product.prodname_copilot_for_individuals %} subscription can access the {% data variables.product.prodname_copilot_chat %} beta in {% data variables.product.prodname_vscode %} and {% data variables.product.prodname_vs %}.
+All users with a {% data variables.product.prodname_copilot_for_individuals %} subscription can access the {% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview %} in {% data variables.product.prodname_vscode %} and {% data variables.product.prodname_vs %}.
 
-Owners of organizations {% ifversion ghec %}or enterprises {% endif %}with a {% data variables.product.prodname_copilot_business_short %} subscription can decide whether to grant access to the {% data variables.product.prodname_copilot_chat %} beta for {% data variables.product.prodname_vs %}{% ifversion ghec %}, {% data variables.product.prodname_vscode_shortname %}, and - with a {% data variables.product.prodname_copilot_enterprise_short %} subscription - {% data variables.product.prodname_dotcom_the_website %}{% else %} and {% data variables.product.prodname_vscode_shortname %}{% endif %}.
+Owners of organizations {% ifversion ghec %}or enterprises {% endif %}with a {% data variables.product.prodname_copilot_business_short %} subscription can decide whether to grant access to the {% data variables.product.prodname_copilot_chat %} {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_vs %}{% ifversion ghec %}, {% data variables.product.prodname_vscode_shortname %}, and - with a {% data variables.product.prodname_copilot_enterprise_short %} subscription - {% data variables.product.prodname_dotcom_the_website %}{% else %} and {% data variables.product.prodname_vscode_shortname %}{% endif %}.
diff --git a/data/reusables/gated-features/copilot-chat-callout-jetbrains-only.md b/data/reusables/gated-features/copilot-chat-callout-jetbrains-only.md
index 4b7f6c1046..1e869ad1f7 100644
--- a/data/reusables/gated-features/copilot-chat-callout-jetbrains-only.md
+++ b/data/reusables/gated-features/copilot-chat-callout-jetbrains-only.md
@@ -1,3 +1,3 @@
-If you have a {% data variables.product.prodname_copilot_individuals_short %} subscription, and you would like to use {% data variables.product.prodname_copilot_chat %} in a JetBrains IDE, you can join the [waitlist](https://github.com/github-copilot/chat_jetbrains_waitlist_signup/join). You will be notified by email when you are granted access to the beta. Joining the waitlist does not guarantee access to the beta.
+If you have a {% data variables.product.prodname_copilot_individuals_short %} subscription, and you would like to use {% data variables.product.prodname_copilot_chat %} in a JetBrains IDE, you can join the [waitlist](https://github.com/github-copilot/chat_jetbrains_waitlist_signup/join). You will be notified by email when you are granted access to the {% data variables.release-phases.public_preview %}. Joining the waitlist does not guarantee access to the {% data variables.release-phases.public_preview %}.
 
-If you are an owner of an invoiced organization or enterprise with a {% data variables.product.prodname_copilot_business_short %}{% ifversion ghec %} or {% data variables.product.prodname_copilot_enterprise_short %}{% endif %} subscription and would like to participate in the beta for {% data variables.product.prodname_copilot_chat %} in a JetBrains IDE, you can contact your account manager or solutions engineer to request access. Customers on Free, Team or self-serve Enterprise plans who do not have an account manager are not eligible for the private beta at this time.
+If you are an owner of an invoiced organization or enterprise with a {% data variables.product.prodname_copilot_business_short %}{% ifversion ghec %} or {% data variables.product.prodname_copilot_enterprise_short %}{% endif %} subscription and would like to participate in the {% data variables.release-phases.public_preview %} for {% data variables.product.prodname_copilot_chat %} in a JetBrains IDE, you can contact your account manager or solutions engineer to request access. Customers on Free, Team or self-serve Enterprise plans who do not have an account manager are not eligible for the {% data variables.release-phases.private_preview %} at this time.
diff --git a/data/reusables/gated-features/copilot-chat-jetbrains-beta.md b/data/reusables/gated-features/copilot-chat-jetbrains-beta.md
index 731210359a..b19e48a6e4 100644
--- a/data/reusables/gated-features/copilot-chat-jetbrains-beta.md
+++ b/data/reusables/gated-features/copilot-chat-jetbrains-beta.md
@@ -1 +1 @@
-{% data variables.product.prodname_copilot_chat %} in a JetBrains IDE is currently in beta, and is subject to change.
+{% data variables.product.prodname_copilot_chat %} in a JetBrains IDE is currently in {% data variables.release-phases.public_preview %}, and is subject to change.
diff --git a/data/reusables/gated-features/secret-scanning.md b/data/reusables/gated-features/secret-scanning.md
index cae5fed2d7..c3bdbceca6 100644
--- a/data/reusables/gated-features/secret-scanning.md
+++ b/data/reusables/gated-features/secret-scanning.md
@@ -4,7 +4,7 @@
 {% data variables.secret-scanning.user_alerts_caps %} are available for {% ifversion ghec %}user-owned {% endif %}public repositories for free. Organizations using {% data variables.product.prodname_ghe_cloud %} with a license for {% data variables.product.prodname_GH_advanced_security %} can also enable {% data variables.secret-scanning.user_alerts %} on their private and internal repositories. {% data reusables.secret-scanning.secret-scanning-user-owned-repos-beta %}
 
 {%- elsif ghes %}
-{% data variables.product.prodname_secret_scanning_caps %} is available for organization-owned repositories{% ifversion secret-scanning-user-owned-repos %}, and in beta for user-owned repositories{% endif %} in {% data variables.product.product_name %} if your enterprise has a license for {% data variables.product.prodname_GH_advanced_security %}.
+{% data variables.product.prodname_secret_scanning_caps %} is available for organization-owned repositories{% ifversion secret-scanning-user-owned-repos %}, and in {% data variables.release-phases.public_preview %} for user-owned repositories{% endif %} in {% data variables.product.product_name %} if your enterprise has a license for {% data variables.product.prodname_GH_advanced_security %}.
 
 {%- endif %} {% data reusables.advanced-security.more-info-ghas-secret-scanning %}
 
diff --git a/data/reusables/organizations/custom-org-roles-create-new-step.md b/data/reusables/organizations/custom-org-roles-create-new-step.md
index 99715e5c42..c1bb0b5d9b 100644
--- a/data/reusables/organizations/custom-org-roles-create-new-step.md
+++ b/data/reusables/organizations/custom-org-roles-create-new-step.md
@@ -7,7 +7,7 @@
 
       Once you've selected a base repository role, you can add additional permissions to the custom role. For more information about the available permissions, see "[Additional permissions for repository access](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles#additional-permissions-for-repository-access)."
 
-      >[!NOTE] Adding a repository role and permissions to a custom organization role is currently in public beta and subject to change.
+      >[!NOTE] Adding a repository role and permissions to a custom organization role is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% else %}
 1. Under "Add permissions", click the text field, then select the permissions you want to add to the custom role. For more information about the available permissions, see "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/about-custom-organization-roles#additional-permissions-for-custom-roles)."{% endif %}
diff --git a/data/reusables/organizations/follow-organizations-beta.md b/data/reusables/organizations/follow-organizations-beta.md
index efd0624663..ac2a895d9a 100644
--- a/data/reusables/organizations/follow-organizations-beta.md
+++ b/data/reusables/organizations/follow-organizations-beta.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** The ability to follow organizations is currently in public beta and subject to change.
+**Note:** The ability to follow organizations is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/organizations/security-manager-beta-note.md b/data/reusables/organizations/security-manager-beta-note.md
index 2d460ef111..9a12f034f1 100644
--- a/data/reusables/organizations/security-manager-beta-note.md
+++ b/data/reusables/organizations/security-manager-beta-note.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** The security manager role is in public beta and subject to change.
+**Note:** The security manager role is in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/organizations/team-discussions-api-deprecation.md b/data/reusables/organizations/team-discussions-api-deprecation.md
index cfd25d32c8..1514b01486 100644
--- a/data/reusables/organizations/team-discussions-api-deprecation.md
+++ b/data/reusables/organizations/team-discussions-api-deprecation.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-The team discussions and team discussion comments endpoints will be deprecated in {% data variables.product.prodname_ghe_server %} 3.13 in favor of {% data variables.product.prodname_discussions %}. For more information about {% data variables.product.prodname_discussions %}, see "[AUTOTITLE](/discussions)."
+The team discussions and team discussion comments endpoints are {% data variables.release-phases.closing_down %} in {% data variables.product.prodname_ghe_server %} 3.13 in favor of {% data variables.product.prodname_discussions %}. For more information about {% data variables.product.prodname_discussions %}, see "[AUTOTITLE](/discussions)."
 
 {% endnote %}
 
@@ -10,7 +10,7 @@ The team discussions and team discussion comments endpoints will be deprecated i
 
 {% note %}
 
-The team discussions and team discussion comments endpoints will be deprecated on 2023-11-28 in favor of {% data variables.product.prodname_discussions %}. For more information about {% data variables.product.prodname_discussions %}, see "[AUTOTITLE](/discussions)."
+The team discussions and team discussion comments endpoints are {% data variables.release-phases.closing_down %} on 2023-11-28 in favor of {% data variables.product.prodname_discussions %}. For more information about {% data variables.product.prodname_discussions %}, see "[AUTOTITLE](/discussions)."
 
 {% endnote %}
 
diff --git a/data/reusables/organizations/team-discussions-deprecation.md b/data/reusables/organizations/team-discussions-deprecation.md
index a05e814aab..521e46b62c 100644
--- a/data/reusables/organizations/team-discussions-deprecation.md
+++ b/data/reusables/organizations/team-discussions-deprecation.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note**: Team Discussions are now deprecated and this REST API endpoint will be removed from {% data variables.product.prodname_dotcom_the_website %} on 2023-07-05. You can read more about this deprecation on the [GitHub Blog](https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/).
+**Note**: Team Discussions are {% data variables.release-phases.retired %}. You can read more about this on the [GitHub Blog](https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/).
 
 You can use {% data variables.product.prodname_discussions %} to create organization-level discussions. For more information about {% data variables.product.prodname_discussions %}, see "[AUTOTITLE](/discussions)."
 
@@ -12,7 +12,7 @@ You can use {% data variables.product.prodname_discussions %} to create organiza
 
 {% note %}
 
-**Note**: Team Discussions are now deprecated and this REST API endpoint will be removed in {% data variables.product.product_name %} 3.12. You can read more about this deprecation on the [GitHub Blog](https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/).
+**Note**: Team Discussions are now {% data variables.release-phases.retired %}. You can read more about this on the [GitHub Blog](https://github.blog/changelog/2023-02-08-sunset-notice-team-discussions/).
 
 You can use {% data variables.product.prodname_discussions %} to create organization-level discussions. For more information about{% data variables.product.prodname_discussions %}, see "[AUTOTITLE](/discussions)."
 
diff --git a/data/reusables/organizations/team-discussions-migration.md b/data/reusables/organizations/team-discussions-migration.md
index d6b3f9dbcb..a4dd7dca57 100644
--- a/data/reusables/organizations/team-discussions-migration.md
+++ b/data/reusables/organizations/team-discussions-migration.md
@@ -1,7 +1,7 @@
 
 {% note %}
 
-**Note**: Team discussions will be deprecated in {% data variables.product.prodname_ghe_server %} 3.13 in favor of {% data variables.product.prodname_discussions %}. You can transfer your existing team discussions to a repository's discussions by using a migration tool that allows team admins to migrate both public and private team discussions. Click the "Transfer" button in the banner at the top of your team discussions page, then choose the repository in your organization that you want to migrate the discussions to.
+**Note**: Team discussions are {% data variables.release-phases.closing_down %} in {% data variables.product.prodname_ghe_server %} 3.13 in favor of {% data variables.product.prodname_discussions %}. You can transfer your existing team discussions to a repository's discussions by using a migration tool that allows team admins to migrate both public and private team discussions. Click the "Transfer" button in the banner at the top of your team discussions page, then choose the repository in your organization that you want to migrate the discussions to.
 
 For more information about {% data variables.product.prodname_discussions %}, see "[AUTOTITLE](/discussions)."
 
diff --git a/data/reusables/package_registry/container-registry-ghes-beta.md b/data/reusables/package_registry/container-registry-ghes-beta.md
index 99e7795600..41277365be 100644
--- a/data/reusables/package_registry/container-registry-ghes-beta.md
+++ b/data/reusables/package_registry/container-registry-ghes-beta.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note**: {% data variables.product.prodname_container_registry %} is currently in beta for {% data variables.product.product_name %} and subject to change.
+**Note**: {% data variables.product.prodname_container_registry %} is currently in {% data variables.release-phases.public_preview %} for {% data variables.product.product_name %} and subject to change.
 
 Both {% data variables.product.prodname_registry %} and subdomain isolation must be enabled to use {% data variables.product.prodname_container_registry %}. For more information, see "[AUTOTITLE](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)."
 
diff --git a/data/reusables/package_registry/delete-with-github-token-using-api-beta.md b/data/reusables/package_registry/delete-with-github-token-using-api-beta.md
index 2c8a529ce9..53dd649bed 100644
--- a/data/reusables/package_registry/delete-with-github-token-using-api-beta.md
+++ b/data/reusables/package_registry/delete-with-github-token-using-api-beta.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** The ability for {% data variables.product.prodname_actions %} workflows to delete and restore packages using the REST API is currently in public beta and subject to change.
+**Note:** The ability for {% data variables.product.prodname_actions %} workflows to delete and restore packages using the REST API is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/projects/org-templates-release-stage.md b/data/reusables/projects/org-templates-release-stage.md
index 3583a9591c..321a87503f 100644
--- a/data/reusables/projects/org-templates-release-stage.md
+++ b/data/reusables/projects/org-templates-release-stage.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** Project templates for organizations is currently in public beta and subject to change.
+**Note:** Project templates for organizations is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/data/reusables/projects/tasklists-release-stage.md b/data/reusables/projects/tasklists-release-stage.md
index 93d97c0cb8..a2d8e784cb 100644
--- a/data/reusables/projects/tasklists-release-stage.md
+++ b/data/reusables/projects/tasklists-release-stage.md
@@ -1,6 +1,6 @@
 {% note %}
 
-**Note:** Tasklists are in private beta and subject to change. We have currently paused onboarding to the beta.
+**Note:** Tasklists are in {% data variables.release-phases.private_preview %} and subject to change. We have currently paused onboarding to the {% data variables.release-phases.public_preview %}.
 
 {% endnote %}
 
diff --git a/data/reusables/release-notes/scim-custom-mappings-supported-change.md b/data/reusables/release-notes/scim-custom-mappings-supported-change.md
index 6bdbb16a6f..aa6ca2c813 100644
--- a/data/reusables/release-notes/scim-custom-mappings-supported-change.md
+++ b/data/reusables/release-notes/scim-custom-mappings-supported-change.md
@@ -1 +1 @@
-For participants in the private beta of SCIM for GitHub Enterprise Server, custom mappings for SAML user attributes are now supported. Custom mappings allow the use of a value other than `NameID` as the unique identifying claim during SAML authentication. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-user-provisioning-with-scim-for-your-enterprise#about-identities-and-claims)."
+For participants in the {% data variables.release-phases.private_preview %} of SCIM for GitHub Enterprise Server, custom mappings for SAML user attributes are now supported. Custom mappings allow the use of a value other than `NameID` as the unique identifying claim during SAML authentication. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-saml-for-enterprise-iam/configuring-user-provisioning-with-scim-for-your-enterprise#about-identities-and-claims)."
diff --git a/data/reusables/release-notes/scim-in-3-6-series.md b/data/reusables/release-notes/scim-in-3-6-series.md
index 81c035702f..5f7fb7dbd9 100644
--- a/data/reusables/release-notes/scim-in-3-6-series.md
+++ b/data/reusables/release-notes/scim-in-3-6-series.md
@@ -1 +1 @@
-Releases in the 3.6 series of GitHub Enterprise Server are no longer suitable for testing SCIM. To continue using the private beta of SCIM, upgrade your instance to version 3.7.3 or later. For more information, see "[AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/overview-of-the-upgrade-process)."
+Releases in the 3.6 series of GitHub Enterprise Server are no longer suitable for testing SCIM. To continue using the {% data variables.release-phases.private_preview %} of SCIM, upgrade your instance to version 3.7.3 or later. For more information, see "[AUTOTITLE](/admin/upgrading-your-instance/preparing-to-upgrade/overview-of-the-upgrade-process)."
diff --git a/data/reusables/release-notes/scim-saml-tokens-known-issue.md b/data/reusables/release-notes/scim-saml-tokens-known-issue.md
index a1c36d1008..7d355f61a8 100644
--- a/data/reusables/release-notes/scim-saml-tokens-known-issue.md
+++ b/data/reusables/release-notes/scim-saml-tokens-known-issue.md
@@ -1 +1 @@
-For participants in the private beta of SCIM for GitHub Enterprise Server, authentication for requests to resources other than the REST API using a {% data variables.product.pat_generic %} or SSH key may not succeed. A fix will be available in a forthcoming release of GitHub Enterprise Server.
+For participants in the {% data variables.release-phases.private_preview %} of SCIM for GitHub Enterprise Server, authentication for requests to resources other than the REST API using a {% data variables.product.pat_generic %} or SSH key may not succeed. A fix will be available in a forthcoming release of GitHub Enterprise Server.
diff --git a/data/reusables/repositories/about-push-rule-delegated-bypass.md b/data/reusables/repositories/about-push-rule-delegated-bypass.md
index e9aea25111..b71d974f9c 100644
--- a/data/reusables/repositories/about-push-rule-delegated-bypass.md
+++ b/data/reusables/repositories/about-push-rule-delegated-bypass.md
@@ -1,4 +1,4 @@
->[!NOTE] Delegated bypass for push rules is currently in beta and subject to change.
+>[!NOTE] Delegated bypass for push rules is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 Delegated bypass for push rulesets lets you control who can bypass push protection and which blocked pushes should be allowed.
 
diff --git a/data/reusables/repositories/managing-delegated-bypass.md b/data/reusables/repositories/managing-delegated-bypass.md
index 92a58161e2..6e15289928 100644
--- a/data/reusables/repositories/managing-delegated-bypass.md
+++ b/data/reusables/repositories/managing-delegated-bypass.md
@@ -1,6 +1,6 @@
 ## Managing requests to bypass push rules
 
->[!NOTE] Delegated bypass for push rules is currently in beta and subject to change.
+>[!NOTE] Delegated bypass for push rules is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 You can view and manage all requests for bypass privileges on the “Bypass Requests" page, located under the **Rules** settings of the repository.
 
diff --git a/data/reusables/repositories/repository-collaborators-release-phase.md b/data/reusables/repositories/repository-collaborators-release-phase.md
index a1d98ece09..2feeeec473 100644
--- a/data/reusables/repositories/repository-collaborators-release-phase.md
+++ b/data/reusables/repositories/repository-collaborators-release-phase.md
@@ -1 +1 @@
->[!NOTE] The repository collaborator role for enterprises that use {% data variables.enterprise.prodname_managed_users %} is in public beta and subject to change.
+>[!NOTE] The repository collaborator role for enterprises that use {% data variables.enterprise.prodname_managed_users %} is in {% data variables.release-phases.public_preview %} and subject to change.
diff --git a/data/reusables/repositories/ruleset-beta-note.md b/data/reusables/repositories/ruleset-beta-note.md
index a4de3e035d..b9260bb50d 100644
--- a/data/reusables/repositories/ruleset-beta-note.md
+++ b/data/reusables/repositories/ruleset-beta-note.md
@@ -2,7 +2,7 @@
 
 **Notes:**
 
-* Ruleset history is currently in public beta and subject to change.
-* Only changes made to a ruleset after the public beta release, on October 11, 2023, are included in the ruleset history.
+* Ruleset history is currently in {% data variables.release-phases.public_preview %} and subject to change.
+* Only changes made to a ruleset after the {% data variables.release-phases.public_preview %} release, on October 11, 2023, are included in the ruleset history.
 
 {% endnote %}
diff --git a/data/reusables/scim/after-you-configure-saml.md b/data/reusables/scim/after-you-configure-saml.md
index bedc6f0e1f..711d4e80b6 100644
--- a/data/reusables/scim/after-you-configure-saml.md
+++ b/data/reusables/scim/after-you-configure-saml.md
@@ -1,3 +1,3 @@
 By default, your IdP does not communicate with {% data variables.product.product_name %} automatically when you assign or unassign the application. {% data variables.product.product_name %} {% ifversion fpt or ghec %}provisions access to your resources on {% else %}creates a user account {% endif %}using SAML Just-in-Time (JIT) provisioning the first time someone navigates to {% ifversion fpt or ghec %}your resources on {% endif %} {% data variables.product.product_name %} and signs in by authenticating through your IdP. You may need to manually notify users when you grant access to {% data variables.product.product_name %}, and you must manually {% ifversion fpt or ghec %}deprovision access {% else %}deactivate the user account on {% endif %}{% data variables.product.product_name %} during offboarding.
 
-Alternatively, instead of SAML JIT provisioning, you can use SCIM to {% ifversion ghec %}provision or deprovision{% elsif ghes %}create or suspend{% endif %} {% ifversion fpt or ghec %}access to organizations owned by your enterprise on {% data variables.product.prodname_dotcom %} {% else %}user accounts and grant or deny access to {% data variables.location.product_location %} {% endif %}automatically after you assign or unassign the application on your IdP.{% ifversion ghes %} SCIM for {% data variables.product.product_name %} is currently in {% ifversion scim-for-ghes-public-beta %}public{% else %}private{% endif %} beta and is subject to change.{% endif %}
+Alternatively, instead of SAML JIT provisioning, you can use SCIM to {% ifversion ghec %}provision or deprovision{% elsif ghes %}create or suspend{% endif %} {% ifversion fpt or ghec %}access to organizations owned by your enterprise on {% data variables.product.prodname_dotcom %} {% else %}user accounts and grant or deny access to {% data variables.location.product_location %} {% endif %}automatically after you assign or unassign the application on your IdP.{% ifversion ghes %} SCIM for {% data variables.product.product_name %} is currently in {% ifversion scim-for-ghes-public-beta %}public{% else %}private{% endif %} {% data variables.release-phases.public_preview %} and is subject to change.{% endif %}
diff --git a/data/reusables/scim/ghec-open-scim-release-phase.md b/data/reusables/scim/ghec-open-scim-release-phase.md
index ba57830bdc..ea719aa51f 100644
--- a/data/reusables/scim/ghec-open-scim-release-phase.md
+++ b/data/reusables/scim/ghec-open-scim-release-phase.md
@@ -1 +1 @@
-Provisioning users with {% data variables.product.company_short %}'s public SCIM schema is in public beta and subject to change.
+Provisioning users with {% data variables.product.company_short %}'s public SCIM schema is in {% data variables.release-phases.public_preview %} and subject to change.
diff --git a/data/reusables/scim/ghes-beta-note.md b/data/reusables/scim/ghes-beta-note.md
index 45c009bcdb..1b464c8dd3 100644
--- a/data/reusables/scim/ghes-beta-note.md
+++ b/data/reusables/scim/ghes-beta-note.md
@@ -1,11 +1,11 @@
 {% ifversion scim-for-ghes-public-beta %}
 
->[!NOTE] SCIM for {% data variables.product.product_name %} is currently in public beta and subject to change. {% data variables.product.company_short %} recommends testing with a staging instance first. See "[AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance)."
+>[!NOTE] SCIM for {% data variables.product.product_name %} is currently in {% data variables.release-phases.public_preview %} and subject to change. {% data variables.product.company_short %} recommends testing with a staging instance first. See "[AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance)."
 
 {% elsif ghes < 3.14 %}
 
->[!NOTE] SCIM for {% data variables.product.product_name %} is currently in private beta and is subject to change. For access to the beta, contact your account manager on {% data variables.contact.contact_enterprise_sales %}. Please provide feedback in the [{% data variables.product.prodname_github_community %} discussion](https://github.com/orgs/community/discussions/36825).
+>[!NOTE] SCIM for {% data variables.product.product_name %} is currently in {% data variables.release-phases.private_preview %} and is subject to change. For access to the {% data variables.release-phases.public_preview %}, contact your account manager on {% data variables.contact.contact_enterprise_sales %}. Please provide feedback in the [{% data variables.product.prodname_github_community %} discussion](https://github.com/orgs/community/discussions/36825).
 
->[!WARNING] The beta is exclusively for testing and feedback, and no support is available. {% data variables.product.company_short %} recommends testing with a staging instance. For more information, see "[AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance)."
+>[!WARNING] The {% data variables.release-phases.public_preview %} is exclusively for testing and feedback, and no support is available. {% data variables.product.company_short %} recommends testing with a staging instance. For more information, see "[AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance)."
 
 {% endif %}
diff --git a/data/reusables/search/classic-search-code-search-note.md b/data/reusables/search/classic-search-code-search-note.md
index 7cbee4ea66..13a834fa63 100644
--- a/data/reusables/search/classic-search-code-search-note.md
+++ b/data/reusables/search/classic-search-code-search-note.md
@@ -1 +1 @@
-This article refers to the classic {% data variables.product.prodname_dotcom %} search experience. If you are participating in the new code search and code view beta and have enabled the new functionality, the syntax for searching code and the search interface will differ. However, the search syntax for non-code search types will stay the same.
+This article refers to the classic {% data variables.product.prodname_dotcom %} search experience. If you are participating in the new code search and code view {% data variables.release-phases.public_preview %} and have enabled the new functionality, the syntax for searching code and the search interface will differ. However, the search syntax for non-code search types will stay the same.
diff --git a/data/reusables/secret-scanning/api-beta.md b/data/reusables/secret-scanning/api-beta.md
index a5579fe470..ff75e718f2 100644
--- a/data/reusables/secret-scanning/api-beta.md
+++ b/data/reusables/secret-scanning/api-beta.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** The endpoints to manage {% data variables.product.prodname_secret_scanning %} are currently in beta and subject to change.
+**Note:** The endpoints to manage {% data variables.product.prodname_secret_scanning %} are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/data/reusables/secret-scanning/beta-dry-runs.md b/data/reusables/secret-scanning/beta-dry-runs.md
index 2d3121b0cd..7945ceb2ee 100644
--- a/data/reusables/secret-scanning/beta-dry-runs.md
+++ b/data/reusables/secret-scanning/beta-dry-runs.md
@@ -1,6 +1,6 @@
 
 {% note %}
 
-**Note:** The dry run feature is currently in beta and subject to change.
+**Note:** The dry run feature is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md b/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md
index f5dce90b74..8c8b759bb1 100644
--- a/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md
+++ b/data/reusables/secret-scanning/beta-prs-discussions-wikis-scanned.md
@@ -3,7 +3,7 @@
 
 {% note %}
 
-**Note:** The scanning of content in pull requests, {% data variables.product.prodname_discussions %}, and wikis is currently in beta and subject to change.
+**Note:** The scanning of content in pull requests, {% data variables.product.prodname_discussions %}, and wikis is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/data/reusables/secret-scanning/generic-secret-detection-ai.md b/data/reusables/secret-scanning/generic-secret-detection-ai.md
index 98a809dee5..460b8d76be 100644
--- a/data/reusables/secret-scanning/generic-secret-detection-ai.md
+++ b/data/reusables/secret-scanning/generic-secret-detection-ai.md
@@ -2,9 +2,9 @@
 {% note %}
 
 **Note:** {% ifversion secret-scanning-ai-generic-secret-detection %}
-Generic secret detection for {% data variables.product.prodname_secret_scanning %} is in beta. Functionality and documentation are subject to change. During this phase, generic secret detection is limited to looking for passwords in source code.
+Generic secret detection for {% data variables.product.prodname_secret_scanning %} is in {% data variables.release-phases.public_preview %}. Functionality and documentation are subject to change. During this phase, generic secret detection is limited to looking for passwords in source code.
 {% elsif fpt %}
-Generic secret detection for {% data variables.product.prodname_secret_scanning %} is in beta. Functionality and documentation are subject to change. The feature is available for enterprise accounts that use {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_cloud %}.
+Generic secret detection for {% data variables.product.prodname_secret_scanning %} is in {% data variables.release-phases.public_preview %}. Functionality and documentation are subject to change. The feature is available for enterprise accounts that use {% data variables.product.prodname_GH_advanced_security %} on {% data variables.product.prodname_ghe_cloud %}.
 {% endif %}
 
 {% endnote %}
diff --git a/data/reusables/secret-scanning/non-provider-patterns-beta.md b/data/reusables/secret-scanning/non-provider-patterns-beta.md
index 9ec046403a..dd545e3378 100644
--- a/data/reusables/secret-scanning/non-provider-patterns-beta.md
+++ b/data/reusables/secret-scanning/non-provider-patterns-beta.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** The detection of non-provider patterns is currently in beta and subject to change.
+**Note:** The detection of non-provider patterns is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/secret-scanning/push-protection-beta.md b/data/reusables/secret-scanning/push-protection-beta.md
index 2e40e4c004..2e82dcd39b 100644
--- a/data/reusables/secret-scanning/push-protection-beta.md
+++ b/data/reusables/secret-scanning/push-protection-beta.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** {% data variables.product.prodname_secret_scanning_caps %} as a protection push is currently in beta and subject to change.
+**Note:** {% data variables.product.prodname_secret_scanning_caps %} as a protection push is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/secret-scanning/push-protection-delegate-bypass-beta-note.md b/data/reusables/secret-scanning/push-protection-delegate-bypass-beta-note.md
index 8b964c148e..3957758c15 100644
--- a/data/reusables/secret-scanning/push-protection-delegate-bypass-beta-note.md
+++ b/data/reusables/secret-scanning/push-protection-delegate-bypass-beta-note.md
@@ -1 +1 @@
->[!NOTE] Delegated bypass for push protection is currently in beta and subject to change.
+>[!NOTE] Delegated bypass for push protection is currently in {% data variables.release-phases.public_preview %} and subject to change.
diff --git a/data/reusables/secret-scanning/push-protection-org-metrics-beta.md b/data/reusables/secret-scanning/push-protection-org-metrics-beta.md
index 093124de8a..9816abd909 100644
--- a/data/reusables/secret-scanning/push-protection-org-metrics-beta.md
+++ b/data/reusables/secret-scanning/push-protection-org-metrics-beta.md
@@ -1,6 +1,6 @@
 
 {% note %}
 
-**Note:** {% data variables.product.prodname_secret_scanning_caps %} metrics for push protection is currently in beta and subject to change.
+**Note:** {% data variables.product.prodname_secret_scanning_caps %} metrics for push protection is currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/reusables/secret-scanning/push-protection-web-UI-uploads-beta.md b/data/reusables/secret-scanning/push-protection-web-UI-uploads-beta.md
index a7f2513cd1..d6f723fe97 100644
--- a/data/reusables/secret-scanning/push-protection-web-UI-uploads-beta.md
+++ b/data/reusables/secret-scanning/push-protection-web-UI-uploads-beta.md
@@ -1 +1 @@
->[!NOTE] Push protection for file uploads in the web UI is currently in beta and subject to change.
+>[!NOTE] Push protection for file uploads in the web UI is currently in {% data variables.release-phases.public_preview %} and subject to change.
diff --git a/data/reusables/secret-scanning/secret-scanning-user-owned-repos-beta.md b/data/reusables/secret-scanning/secret-scanning-user-owned-repos-beta.md
index ae9c7d2d79..9d81e8bd9a 100644
--- a/data/reusables/secret-scanning/secret-scanning-user-owned-repos-beta.md
+++ b/data/reusables/secret-scanning/secret-scanning-user-owned-repos-beta.md
@@ -1 +1 @@
-{% ifversion secret-scanning-user-owned-repos %}Additionally, {% data variables.secret-scanning.user_alerts %}{% ifversion ghes %} is{% else %} are{% endif %} available and in beta on user-owned repositories{% ifversion ghec %} for {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_emus %}{% else %} in {% data variables.product.product_name %}{% endif %}.{% endif %}
+{% ifversion secret-scanning-user-owned-repos %}Additionally, {% data variables.secret-scanning.user_alerts %}{% ifversion ghes %} is{% else %} are{% endif %} available and in {% data variables.release-phases.public_preview %} on user-owned repositories{% ifversion ghec %} for {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_emus %}{% else %} in {% data variables.product.product_name %}{% endif %}.{% endif %}
diff --git a/data/reusables/security-overview/beta-org-risk-coverage.md b/data/reusables/security-overview/beta-org-risk-coverage.md
index b92cfb3bb5..2c27eb007d 100644
--- a/data/reusables/security-overview/beta-org-risk-coverage.md
+++ b/data/reusables/security-overview/beta-org-risk-coverage.md
@@ -2,7 +2,7 @@
 
 {% note %}
 
-**Note:** The "Security risk" and "Security coverage" views are currently in beta and subject to change.
+**Note:** The "Security risk" and "Security coverage" views are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
 
diff --git a/data/reusables/security-overview/beta-overview-dashboard.md b/data/reusables/security-overview/beta-overview-dashboard.md
index 0083ec4703..e6fae0d5bd 100644
--- a/data/reusables/security-overview/beta-overview-dashboard.md
+++ b/data/reusables/security-overview/beta-overview-dashboard.md
@@ -1 +1 @@
-> [!NOTE] The security overview dashboard is currently in beta and subject to change.
+> [!NOTE] The security overview dashboard is currently in {% data variables.release-phases.public_preview %} and subject to change.
diff --git a/data/reusables/ssh/fingerprints.md b/data/reusables/ssh/fingerprints.md
index 9011592392..261eb59e59 100644
--- a/data/reusables/ssh/fingerprints.md
+++ b/data/reusables/ssh/fingerprints.md
@@ -1,4 +1,4 @@
 * `SHA256:uNiVztksCsDhcc0u9e8BujQXVUpKZIDTMczCvj3tD2s` (RSA)
-* `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA - deprecated)
+* `SHA256:br9IjFspm1vxR3iA35FWE+4VTyz1hYVLIE2t1/CeyWQ` (DSA - {% data variables.release-phases.closing_down %})
 * `SHA256:p2QAMXNIC1TJYWeIOttrVc98/R1BUFWu3/LiyKgUfQM` (ECDSA)
 * `SHA256:+DiY3wvvV6TuJJhbpZisF/zLDA0zPMSvHdkr4UvCOqU` (Ed25519)
diff --git a/data/reusables/support/scope-of-support.md b/data/reusables/support/scope-of-support.md
index 1e142e3c1f..0b5c53fcd8 100644
--- a/data/reusables/support/scope-of-support.md
+++ b/data/reusables/support/scope-of-support.md
@@ -11,7 +11,7 @@ If your support request is outside of the scope of what our team can help you wi
 * Cloud provider configurations, such as virtual network setup, custom firewall, or proxy rules.
 * Container orchestration, such as Kubernetes setup, networking, etc.
 * Detailed assistance with workflows and data management
-* Beta features. Support for beta features is out of {% data variables.contact.github_support %}'s scope. {% ifversion ghec or ghes %}For support with beta features, you can contact your account manager on {% data variables.contact.contact_enterprise_sales %}.{% endif %}
+* {% data variables.release-phases.public_preview_caps %} features. Support for {% data variables.release-phases.public_preview %} features is out of {% data variables.contact.github_support %}'s scope. {% ifversion ghec or ghes %}For support with {% data variables.release-phases.public_preview %} features, you can contact your account manager on {% data variables.contact.contact_enterprise_sales %}.{% endif %}
 
 For detailed assistance with workflows and data management, consult [GitHub Expert Services](https://github.com/services/), which offer specialized support to help you optimize your use of the platform.
 
diff --git a/data/reusables/support/zendesk-old-tickets.md b/data/reusables/support/zendesk-old-tickets.md
index 83ddcdcea2..ae32b953b8 100644
--- a/data/reusables/support/zendesk-old-tickets.md
+++ b/data/reusables/support/zendesk-old-tickets.md
@@ -1,7 +1,7 @@
 {% ifversion ghes %}
 {% note %}
 
-**Note**: If you have previously contacted {% data variables.contact.enterprise_support %} through the GitHub Enterprise Support portal, which is now deprecated, you should use the {% data variables.contact.contact_enterprise_portal %} to open new tickets.
+**Note**: If you have previously contacted {% data variables.contact.enterprise_support %} through the GitHub Enterprise Support portal, which is {% data variables.release-phases.closing_down %}, you should use the {% data variables.contact.contact_enterprise_portal %} to open new tickets.
 
 {% endnote %}
 {% endif %}
diff --git a/data/reusables/user-settings/pat-v2-beta.md b/data/reusables/user-settings/pat-v2-beta.md
index e13430b1c9..d45e8c5e6e 100644
--- a/data/reusables/user-settings/pat-v2-beta.md
+++ b/data/reusables/user-settings/pat-v2-beta.md
@@ -1 +1 @@
-{% data variables.product.pat_v2_caps %} are currently in beta and subject to change. To leave feedback, see [the feedback discussion](https://github.com/community/community/discussions/36441).
+{% data variables.product.pat_v2_caps %} are currently in {% data variables.release-phases.public_preview %} and subject to change. To leave feedback, see [the feedback discussion](https://github.com/community/community/discussions/36441).
diff --git a/data/reusables/user-settings/pat-v2-org-opt-in.md b/data/reusables/user-settings/pat-v2-org-opt-in.md
index 6433da4b61..a98cf08bbf 100644
--- a/data/reusables/user-settings/pat-v2-org-opt-in.md
+++ b/data/reusables/user-settings/pat-v2-org-opt-in.md
@@ -2,6 +2,6 @@
 
 **Note**: {% data reusables.user-settings.pat-v2-beta %}
 
-During the beta, organizations must opt in to {% data variables.product.pat_v2 %}s. {% ifversion ghec or ghes %}If your organization is owned by an enterprise, and the enterprise has opted in to {% data variables.product.pat_v2 %}s, then your organization is opted in by default. {% endif %}If your organization has not already opted-in, then you will be prompted to opt-in and set policies when you follow the steps below.
+During the {% data variables.release-phases.public_preview %}, organizations must opt in to {% data variables.product.pat_v2 %}s. {% ifversion ghec or ghes %}If your organization is owned by an enterprise, and the enterprise has opted in to {% data variables.product.pat_v2 %}s, then your organization is opted in by default. {% endif %}If your organization has not already opted-in, then you will be prompted to opt-in and set policies when you follow the steps below.
 
 {% endnote %}
diff --git a/data/reusables/webhooks/discussions-webhooks-beta.md b/data/reusables/webhooks/discussions-webhooks-beta.md
index 28490d85d9..cff8d25c51 100644
--- a/data/reusables/webhooks/discussions-webhooks-beta.md
+++ b/data/reusables/webhooks/discussions-webhooks-beta.md
@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Webhook events for {% data variables.product.prodname_discussions %} are currently in beta and subject to change.
+**Note:** Webhook events for {% data variables.product.prodname_discussions %} are currently in {% data variables.release-phases.public_preview %} and subject to change.
 
 {% endnote %}
diff --git a/data/variables/product.yml b/data/variables/product.yml
index 78b4c3314b..63c96825da 100644
--- a/data/variables/product.yml
+++ b/data/variables/product.yml
@@ -12,7 +12,7 @@ company_short: 'GitHub'
 ## Use another variable if it is important to specify the environment (e.g. GHES)
 github: 'GitHub'
 
-## DEPRECATED: Use the `github` variable instead. (Writers found the name of this variable to be misleading.)
+## DO NOT USE. Use the `github` variable instead. (Writers found the name of this variable to be misleading.)
 prodname_dotcom: 'GitHub'
 
 product_name: >-
diff --git a/data/variables/release-phases.yml b/data/variables/release-phases.yml
new file mode 100644
index 0000000000..5b50818d05
--- /dev/null
+++ b/data/variables/release-phases.yml
@@ -0,0 +1,26 @@
+# Contains variables to identify GitHub's release phases. These are aligned with Microsoft standards.
+# For reference: https://github.com/github/docs-team/issues/4302
+
+public_preview: >-
+  {% ifversion ghes < 3.16 %}beta{% else %}beta{% endif %}
+
+public_preview_caps: >-
+  {% ifversion ghes < 3.16 %}Beta{% else %}Beta{% endif %}
+
+private_preview: >-
+  {% ifversion ghes < 3.16 %}private beta{% else %}private beta{% endif %}
+
+private_preview_caps: >-
+  {% ifversion ghes < 3.16 %}Private beta{% else %}Private beta{% endif %}
+
+closing_down: >-
+  {% ifversion ghes < 3.16 %}deprecated{% else %}deprecated{% endif %}
+
+closing_down_caps: >-
+  {% ifversion ghes < 3.16 %}Deprecated{% else %}Deprecated{% endif %}
+
+retired: >-
+  {% ifversion ghes < 3.16 %}sunset{% else %}sunset{% endif %}
+
+retired_caps: >-
+  {% ifversion ghes < 3.16 %}Sunset{% else %}Sunset{% endif %}

From 72faf23e06d8256a0a53574b4c9b8738e86da9b4 Mon Sep 17 00:00:00 2001
From: docs-bot <77750099+docs-bot@users.noreply.github.com>
Date: Fri, 27 Sep 2024 12:42:11 -0400
Subject: [PATCH 5/8] Update audit log event data (#52463)

---
 src/audit-logs/lib/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audit-logs/lib/config.json b/src/audit-logs/lib/config.json
index 2512590e0f..02cacced6c 100644
--- a/src/audit-logs/lib/config.json
+++ b/src/audit-logs/lib/config.json
@@ -3,5 +3,5 @@
     "apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
     "apiRequestEvent": "This event is only available via audit log streaming."
   },
-  "sha": "c2d5c0531bba159e3a134fca1b250dfb5faf194b"
+  "sha": "09ad55c88b779f1bf2180e3865e17df1a2f115cb"
 }
\ No newline at end of file

From 7c49068bb81b90436da07881f45dbc3231519186 Mon Sep 17 00:00:00 2001
From: Ashish Keshan <ashkeshan@gmail.com>
Date: Fri, 27 Sep 2024 10:54:59 -0700
Subject: [PATCH 6/8] [Content Linter Rule] Third Party Action References Must
 Use SHA (#52282)

Co-authored-by: Rachael Sewell <rachmari@github.com>
Co-authored-by: Ben Ahmady <32935794+subatoi@users.noreply.github.com>
Co-authored-by: Felicity Chapman <felicitymay@github.com>
---
 ...g-openid-connect-in-amazon-web-services.md |   2 +-
 .../configuring-openid-connect-in-azure.md    |   2 +-
 ...openid-connect-in-google-cloud-platform.md |   2 +-
 ...uring-openid-connect-in-hashicorp-vault.md |   4 +-
 .../configuring-openid-connect-in-pypi.md     |   2 +-
 .../creating-a-composite-action.md            |   4 +-
 .../creating-a-javascript-action.md           |   4 +-
 .../building-and-testing-python.md            |   2 +-
 .../deploying-docker-to-azure-app-service.md  |   6 +-
 .../deploying-php-to-azure-app-service.md     |   4 +-
 .../workflow-commands-for-github-actions.md   |   8 +-
 ...tomating-dependabot-with-github-actions.md |  10 +-
 .../using-the-dependency-submission-api.md    |   2 +-
 .../contributing/content-linter-rules.md      |   3 +-
 src/content-linter/lib/linting-rules/index.js |   2 +
 .../third-party-action-pinning.js             |  80 ++++++++++++
 src/content-linter/style/github-docs.js       |   6 +
 .../tests/unit/third-party-action-pinning.js  | 115 ++++++++++++++++++
 18 files changed, 231 insertions(+), 27 deletions(-)
 create mode 100644 src/content-linter/lib/linting-rules/third-party-action-pinning.js
 create mode 100644 src/content-linter/tests/unit/third-party-action-pinning.js

diff --git a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md
index 3eb93c0ae8..cd896b078c 100644
--- a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md
+++ b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-amazon-web-services.md
@@ -148,7 +148,7 @@ jobs:
       - name: Git clone the repository
         uses: {% data reusables.actions.action-checkout %}
       - name: configure aws credentials
-        uses: aws-actions/configure-aws-credentials@v3
+        uses: aws-actions/configure-aws-credentials@d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3
         with:
           role-to-assume: ROLE-TO-ASSUME
           role-session-name: samplerolesession
diff --git a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-azure.md b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-azure.md
index d4ac949dc7..6cb1a1b823 100644
--- a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-azure.md
+++ b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-azure.md
@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Az CLI login'
-        uses: azure/login@v1
+        uses: azure/login@a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
diff --git a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md
index 1e51b56164..9494d7c64b 100644
--- a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md
+++ b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-google-cloud-platform.md
@@ -82,7 +82,7 @@ jobs:
     steps:
     - id: 'auth'
       name: 'Authenticate to GCP'
-      uses: 'google-github-actions/auth@v0.3.1'
+      uses: 'google-github-actions/auth@f1e2d3c4b5a6f7e8d9c0b1a2c3d4e5f6a7b8c9d0'
       with:
           create_credentials_file: 'true'
           workload_identity_provider: 'WORKLOAD-IDENTITY-PROVIDER'
diff --git a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md
index b4ab66fd2e..d04d9ef644 100644
--- a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md
+++ b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-hashicorp-vault.md
@@ -138,7 +138,7 @@ jobs:
       contents: read
     steps:
       - name: Retrieve secret from Vault
-        uses: hashicorp/vault-action@v2.4.0
+        uses: hashicorp/vault-action@9a8b7c6d5e4f3a2b1c0d9e8f7a6b5c4d3e2f1a0b
         with:
           method: jwt
           url: VAULT-URL
@@ -176,7 +176,7 @@ jobs:
       contents: read
     steps:
       - name: Retrieve secret from Vault
-        uses: hashicorp/vault-action@v2.4.0
+        uses: hashicorp/vault-action@9a8b7c6d5e4f3a2b1c0d9e8f7a6b5c4d3e2f1a0b
         with:
           exportToken: true
           method: jwt
diff --git a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-pypi.md b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-pypi.md
index f49dd6f8ce..3f465f74ef 100644
--- a/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-pypi.md
+++ b/content/actions/security-for-github-actions/security-hardening-your-deployments/configuring-openid-connect-in-pypi.md
@@ -94,5 +94,5 @@ jobs:
           path: dist/
 
       - name: Publish release distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2f
 ```
diff --git a/content/actions/sharing-automations/creating-actions/creating-a-composite-action.md b/content/actions/sharing-automations/creating-actions/creating-a-composite-action.md
index 3307ae78a9..c4be0b28ea 100644
--- a/content/actions/sharing-automations/creating-actions/creating-a-composite-action.md
+++ b/content/actions/sharing-automations/creating-actions/creating-a-composite-action.md
@@ -155,7 +155,7 @@ Before you begin, you'll create a repository on {% data variables.product.github
 
 The following workflow code uses the completed hello world action that you made in "[AUTOTITLE](/actions/creating-actions/creating-a-composite-action#creating-an-action-metadata-file)".
 
-Copy the workflow code into a `.github/workflows/main.yml` file in another repository, replacing `OWNER` and `TAG` with the repository owner and the tag you created, respectively. You can also replace the `who-to-greet` input with your name.
+Copy the workflow code into a `.github/workflows/main.yml` file in another repository, replacing `actions` and `SHA` with the repository owner and the SHA of the commit you want to use, respectively. You can also replace the `who-to-greet` input with your name.
 
 ```yaml copy
 on: [push]
@@ -167,7 +167,7 @@ jobs:
     steps:
       - uses: {% data reusables.actions.action-checkout %}
       - id: foo
-        uses: OWNER/hello-world-composite-action@TAG
+        uses: OWNER/hello-world-composite-action@SHA
         with:
           who-to-greet: 'Mona the Octocat'
       - run: echo random-number "$RANDOM_NUMBER"
diff --git a/content/actions/sharing-automations/creating-actions/creating-a-javascript-action.md b/content/actions/sharing-automations/creating-actions/creating-a-javascript-action.md
index 31c200c419..d3a9e286ee 100644
--- a/content/actions/sharing-automations/creating-actions/creating-a-javascript-action.md
+++ b/content/actions/sharing-automations/creating-actions/creating-a-javascript-action.md
@@ -223,7 +223,7 @@ Public actions can be used by workflows in any repository. When an action is in
 
 This example demonstrates how your new public action can be run from within an external repository.
 
-Copy the following YAML into a new file at `.github/workflows/main.yml`, and update the `uses: octocat/hello-world-javascript-action@v1.1` line with your username and the name of the public repository you created above. You can also replace the `who-to-greet` input with your name.
+Copy the following YAML into a new file at `.github/workflows/main.yml`, and update the `uses: octocat/hello-world-javascript-action@1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b` line with your username and the name of the public repository you created above. You can also replace the `who-to-greet` input with your name.
 
 {% raw %}
 
@@ -237,7 +237,7 @@ jobs:
     steps:
       - name: Hello world action step
         id: hello
-        uses: octocat/hello-world-javascript-action@v1.1
+        uses: octocat/hello-world-javascript-action@1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f9a0b
         with:
           who-to-greet: 'Mona the Octocat'
       # Use the output from the `hello` step
diff --git a/content/actions/use-cases-and-examples/building-and-testing/building-and-testing-python.md b/content/actions/use-cases-and-examples/building-and-testing/building-and-testing-python.md
index b4034203ee..dfe2d13c27 100644
--- a/content/actions/use-cases-and-examples/building-and-testing/building-and-testing-python.md
+++ b/content/actions/use-cases-and-examples/building-and-testing/building-and-testing-python.md
@@ -456,7 +456,7 @@ jobs:
           path: dist/
 
       - name: Publish release distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@6f7e8d9c0b1a2c3d4e5f6a7b8c9d0e1f2a3b4c5d
 ```
 
 {% ifversion not ghes %}
diff --git a/content/actions/use-cases-and-examples/deploying/deploying-docker-to-azure-app-service.md b/content/actions/use-cases-and-examples/deploying/deploying-docker-to-azure-app-service.md
index 726eb8dfe5..46f3428b2a 100644
--- a/content/actions/use-cases-and-examples/deploying/deploying-docker-to-azure-app-service.md
+++ b/content/actions/use-cases-and-examples/deploying/deploying-docker-to-azure-app-service.md
@@ -101,10 +101,10 @@ jobs:
       - uses: {% data reusables.actions.action-checkout %}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@7a8b9c0d1e2f3a4b5c6d7e8f9a0b1c2d3e4f5a6b
 
       - name: Log in to GitHub container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@8c9d0e1f2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d
         with:
           registry: ghcr.io
           username: {% raw %}${{ github.actor }}{% endraw %}
@@ -114,7 +114,7 @@ jobs:
         run: echo "REPO=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
       - name: Build and push container image to registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@9e0f1a2b3c4d5e6f7a8b9c0d1e2f3a4b5c6d7e8f
         with:
           push: true
           tags: ghcr.io/{% raw %}${{ env.REPO }}{% endraw %}:{% raw %}${{ github.sha }}{% endraw %}
diff --git a/content/actions/use-cases-and-examples/deploying/deploying-php-to-azure-app-service.md b/content/actions/use-cases-and-examples/deploying/deploying-php-to-azure-app-service.md
index 546e603e85..69c83d7cec 100644
--- a/content/actions/use-cases-and-examples/deploying/deploying-php-to-azure-app-service.md
+++ b/content/actions/use-cases-and-examples/deploying/deploying-php-to-azure-app-service.md
@@ -84,13 +84,13 @@ jobs:
       - uses: {% data reusables.actions.action-checkout %}
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@1f2e3d4c5b6a7f8e9d0c1b2a3e4f5d6c7b8a9e0f
         with:
           php-version: {% raw %}${{ env.PHP_VERSION }}{% endraw %}
 
       - name: Check if composer.json exists
         id: check_files
-        uses: andstor/file-existence-action@v2
+        uses: andstor/file-existence-action@2a3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b
         with:
           files: 'composer.json'
 
diff --git a/content/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions.md b/content/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions.md
index 22ea1f600e..3ad0a0f612 100644
--- a/content/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions.md
+++ b/content/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions.md
@@ -412,7 +412,7 @@ jobs:
     outputs:
       handle: {% raw %}${{ steps.generate-secret.outputs.handle }}{% endraw %}
     steps:
-    - uses: some/secret-store@v1
+    - uses: some/secret-store@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:{% raw %}
         credentials: ${{ secrets.SECRET_STORE_CREDENTIALS }}
         instance: ${{ secrets.SECRET_STORE_INSTANCE }}{% endraw %}
@@ -428,7 +428,7 @@ jobs:
     runs-on: macos-latest
     needs: secret-generator
     steps:
-    - uses: some/secret-store@v1
+    - uses: some/secret-store@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:{% raw %}
         credentials: ${{ secrets.SECRET_STORE_CREDENTIALS }}
         instance: ${{ secrets.SECRET_STORE_INSTANCE }}{% endraw %}
@@ -452,7 +452,7 @@ jobs:
   secret-generator:
     runs-on: ubuntu-latest
     steps:
-    - uses: some/secret-store@v1
+    - uses: some/secret-store@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:{% raw %}
         credentials: ${{ secrets.SECRET_STORE_CREDENTIALS }}
         instance: ${{ secrets.SECRET_STORE_INSTANCE }}{% endraw %}
@@ -467,7 +467,7 @@ jobs:
     runs-on: macos-latest
     needs: secret-generator
     steps:
-    - uses: some/secret-store@v1
+    - uses: some/secret-store@27b31702a0e7fc50959f5ad993c78deac1bdfc29
       with:{% raw %}
         credentials: ${{ secrets.SECRET_STORE_CREDENTIALS }}
         instance: ${{ secrets.SECRET_STORE_INSTANCE }}{% endraw %}
diff --git a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md
index 34126a926e..7a8f3f2fd6 100644
--- a/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md
+++ b/content/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions.md
@@ -94,7 +94,7 @@ jobs:
         uses: {% data reusables.actions.action-checkout %}
 
       - name: Login to private container registry for dependencies
-        uses: docker/login-action@v2
+        uses: docker/login-action@3b4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c
         with:
           registry: https://1234567890.dkr.ecr.us-east-1.amazonaws.com
           username: {% raw %}${{ secrets.READONLY_AWS_ACCESS_KEY_ID }}{% endraw %}
@@ -136,7 +136,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       # The following properties are now available:
@@ -173,7 +173,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Add a label for all production dependencies
@@ -205,7 +205,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Approve a PR
@@ -248,7 +248,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Enable auto-merge for Dependabot PRs
diff --git a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md
index 1622db9a63..7a4fc3817e 100644
--- a/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md
+++ b/content/code-security/supply-chain-security/understanding-your-software-supply-chain/using-the-dependency-submission-api.md
@@ -156,7 +156,7 @@ jobs:
         name: sbom
         path: _manifest/spdx_2.2
     - name: SBOM upload
-      uses: advanced-security/spdx-dependency-submission-action@v0.0.1
+      uses: advanced-security/spdx-dependency-submission-action@5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d4e
       with:
         filePath: "_manifest/spdx_2.2/"
 ```
diff --git a/data/reusables/contributing/content-linter-rules.md b/data/reusables/contributing/content-linter-rules.md
index e399af383e..8733117230 100644
--- a/data/reusables/contributing/content-linter-rules.md
+++ b/data/reusables/contributing/content-linter-rules.md
@@ -63,4 +63,5 @@
 | GHD036 | image-no-gif | Image must not be a gif, styleguide reference: contributing/style-guide-and-content-model/style-guide.md#images | error | images |
 | GHD038 | expired-content | Expired content must be remediated. | error | expired |
 | GHD039 | expiring-soon | Content that expires soon should be proactively addressed. | warning | expired |
-| [GHD040](https://github.com/github/docs/blob/main/src/content-linter/README.md) | table-liquid-versioning | Tables must use the correct liquid versioning format | error | tables |
\ No newline at end of file
+| [GHD040](https://github.com/github/docs/blob/main/src/content-linter/README.md) | table-liquid-versioning | Tables must use the correct liquid versioning format | error | tables |
+| GHD041 | third-party-action-pinning | Code examples that use third-party actions must always pin to a full length commit SHA | error | feature, actions |
\ No newline at end of file
diff --git a/src/content-linter/lib/linting-rules/index.js b/src/content-linter/lib/linting-rules/index.js
index c03fc534b1..b361473375 100644
--- a/src/content-linter/lib/linting-rules/index.js
+++ b/src/content-linter/lib/linting-rules/index.js
@@ -30,6 +30,7 @@ import { raiReusableUsage } from './rai-reusable-usage.js'
 import { imageNoGif } from './image-no-gif.js'
 import { expiredContent, expiringSoon } from './expired-content.js'
 import { tableLiquidVersioning } from './table-liquid-versioning.js'
+import { thirdPartyActionPinning } from './third-party-action-pinning.js'
 
 const noDefaultAltText = markdownlintGitHub.find((elem) =>
   elem.names.includes('no-default-alt-text'),
@@ -75,5 +76,6 @@ export const gitHubDocsMarkdownlint = {
     expiredContent,
     expiringSoon,
     tableLiquidVersioning,
+    thirdPartyActionPinning,
   ],
 }
diff --git a/src/content-linter/lib/linting-rules/third-party-action-pinning.js b/src/content-linter/lib/linting-rules/third-party-action-pinning.js
new file mode 100644
index 0000000000..0e9a96f7bd
--- /dev/null
+++ b/src/content-linter/lib/linting-rules/third-party-action-pinning.js
@@ -0,0 +1,80 @@
+import yaml from 'js-yaml'
+import { addError, filterTokens } from 'markdownlint-rule-helpers'
+
+import { liquid } from '#src/content-render/index.js'
+import { allVersions } from '#src/versions/lib/all-versions.js'
+
+// Detects third-party actions in the format `owner/repo@ref`
+const actionRegex = /[\w-]+\/[\w-]+@[\w-]+/
+// Detects a full-length commit SHA (40 hexadecimal characters)
+const shaRegex = /[\w-]+\/[\w-]+@[0-9a-fA-F]{40}/
+// Detects first-party actions
+const firstPartyPrefixes = ['actions/', 'github/', 'octo-org/', 'OWNER/']
+
+export const thirdPartyActionPinning = {
+  names: ['GHD041', 'third-party-action-pinning'],
+  description:
+    'Code examples that use third-party actions must always pin to a full length commit SHA',
+  tags: ['feature', 'actions'],
+  parser: 'markdownit',
+  asynchronous: true,
+  function: (params, onError) => {
+    filterTokens(params, 'fence', async (token) => {
+      const lang = token.info.trim().split(/\s+/u).shift().toLowerCase()
+      if (lang !== 'yaml' && lang !== 'yml') return
+      if (!token.content.includes('steps:')) return
+      if (!token.content.includes('uses:')) return
+
+      const context = {
+        currentLanguage: 'en',
+        currentVersionObj: allVersions['free-pro-team@latest'],
+      }
+      // If we don't parse the Liquid first, yaml loading chokes on {% raw %} tags
+      const renderedYaml = await liquid.parseAndRender(token.content, context)
+      try {
+        const yamlObj = yaml.load(renderedYaml)
+        const steps = getWorkflowSteps(yamlObj)
+        if (!steps.some((step) => step.uses)) return
+
+        steps.forEach((step) => {
+          if (step.uses) {
+            const actionMatch = step.uses.match(actionRegex)
+            if (actionMatch) {
+              const isFirstParty = firstPartyPrefixes.some((prefix) => step.uses.startsWith(prefix))
+              if (!isFirstParty && !shaRegex.test(step.uses)) {
+                addError(
+                  onError,
+                  getLineNumber(token.content, step.uses) + token.lineNumber,
+                  'Code examples that use third-party actions must always pin to a full length commit SHA',
+                  step.uses,
+                )
+              }
+            }
+          }
+        })
+      } catch (e) {
+        if (e instanceof yaml.YAMLException) {
+          console.log('YAML Exception file:', params.name)
+          console.error('YAML Exception:', e.message)
+        } else {
+          console.error('Error parsing YAML:', e)
+        }
+      }
+    })
+  },
+}
+
+function getWorkflowSteps(yamlObj) {
+  if (yamlObj?.jobs) {
+    const jobs = Object.values(yamlObj.jobs)
+    return jobs.flatMap((job) => job.steps || [])
+  } else if (yamlObj?.steps) {
+    return yamlObj.steps
+  }
+  return []
+}
+
+function getLineNumber(tokenContent, step) {
+  const contentLines = tokenContent.split('\n')
+  return contentLines.findIndex((line) => line.includes(step)) + 1
+}
diff --git a/src/content-linter/style/github-docs.js b/src/content-linter/style/github-docs.js
index c1e9a8ef05..d2db8d18d5 100644
--- a/src/content-linter/style/github-docs.js
+++ b/src/content-linter/style/github-docs.js
@@ -155,6 +155,12 @@ const githubDocsConfig = {
     severity: 'error',
     'partial-markdown-files': true,
   },
+  'third-party-action-pinning': {
+    // GH041
+    severity: 'error',
+    'partial-markdown-files': true,
+    'yml-files': true,
+  },
 }
 
 export const githubDocsFrontmatterConfig = {
diff --git a/src/content-linter/tests/unit/third-party-action-pinning.js b/src/content-linter/tests/unit/third-party-action-pinning.js
new file mode 100644
index 0000000000..8ac68db078
--- /dev/null
+++ b/src/content-linter/tests/unit/third-party-action-pinning.js
@@ -0,0 +1,115 @@
+import { describe, expect, test } from 'vitest'
+
+import { runRule } from '../../lib/init-test.js'
+import { thirdPartyActionPinning } from '../../lib/linting-rules/third-party-action-pinning.js'
+
+describe(thirdPartyActionPinning.names.join(' - '), () => {
+  test('should not report an error for first-party actions', async () => {
+    const markdown = [
+      '```yaml',
+      'jobs:',
+      '  build:',
+      '    runs-on: ubuntu-latest',
+      '    steps:',
+      '      - uses: actions/javascript-action@main',
+      '```',
+    ].join('\n')
+    const result = await runRule(thirdPartyActionPinning, { strings: { markdown } })
+    const errors = result.markdown
+    expect(errors.length).toBe(0)
+  })
+
+  test('should not report an error for third-party actions pinned to a full-length commit SHA', async () => {
+    const markdown = [
+      '```yaml',
+      'jobs:',
+      '  build:',
+      '    runs-on: ubuntu-latest',
+      '    steps:',
+      '      - uses: google-github-actions/setup-gcloud@1bee7de035d65ec5da40a31f8589e240eba8fde5',
+      '```',
+    ].join('\n')
+    const result = await runRule(thirdPartyActionPinning, { strings: { markdown } })
+    const errors = result.markdown
+    expect(errors.length).toBe(0)
+  })
+
+  test('should report an error for third-party actions not pinned to a full-length commit SHA', async () => {
+    const markdown = [
+      '```yaml',
+      'jobs:',
+      '  build:',
+      '    runs-on: ubuntu-latest',
+      '    steps:',
+      '      - uses: google-github-actions/setup-gcloud@v0.2.0',
+      '```',
+    ].join('\n')
+    const result = await runRule(thirdPartyActionPinning, { strings: { markdown } })
+    const errors = result.markdown
+    expect(errors.length).toBe(1)
+    expect(errors[0].errorContext).toEqual('google-github-actions/setup-gcloud@v0.2.0')
+  })
+
+  test('should not report an error for multiple valid third-party actions', async () => {
+    const markdown = [
+      '```yaml',
+      'jobs:',
+      '  build:',
+      '    runs-on: ubuntu-latest',
+      '    steps:',
+      '      - uses: google-github-actions/setup-gcloud@1bee7de035d65ec5da40a31f8589e240eba8fde5',
+      '      - uses: monalisa/some-other-action@1234567890abcdef1234567890abcdef12345678',
+      '```',
+    ].join('\n')
+    const result = await runRule(thirdPartyActionPinning, { strings: { markdown } })
+    const errors = result.markdown
+    expect(errors.length).toBe(0)
+  })
+
+  test('should report an error for multiple invalid third-party actions', async () => {
+    const markdown = [
+      '```yaml',
+      'jobs:',
+      '  build:',
+      '    runs-on: ubuntu-latest',
+      '    steps:',
+      '      - uses: google-github-actions/setup-gcloud@v0.2.0',
+      '      - uses: monalisa/some-other-action@main',
+      '```',
+    ].join('\n')
+    const result = await runRule(thirdPartyActionPinning, { strings: { markdown } })
+    const errors = result.markdown
+    expect(errors.length).toBe(2)
+    expect(errors[0].errorContext).toEqual('google-github-actions/setup-gcloud@v0.2.0')
+    expect(errors[1].errorContext).toEqual('monalisa/some-other-action@main')
+  })
+
+  test('should report an error for hashicorp/vault-action pinned to a specific version', async () => {
+    const markdown = [
+      '```yaml',
+      'jobs:',
+      '  retrieve-secret:',
+      '    runs-on: ubuntu-latest',
+      '    permissions:',
+      '      id-token: write',
+      '      contents: read',
+      '    steps:',
+      '      - name: Retrieve secret from Vault',
+      '        uses: hashicorp/vault-action@v2.4.0',
+      '        with:',
+      '          method: jwt',
+      '          url: VAULT-URL',
+      '          namespace: VAULT-NAMESPACE # HCP Vault and Vault Enterprise only',
+      '          role: ROLE-NAME',
+      '          secrets: SECRET-PATH',
+      '',
+      '      - name: Use secret from Vault',
+      '        run: |',
+      '          # This step has access to the secret retrieved above; see hashicorp/vault-action for more details.',
+      '```',
+    ].join('\n')
+    const result = await runRule(thirdPartyActionPinning, { strings: { markdown } })
+    const errors = result.markdown
+    expect(errors.length).toBe(1)
+  })
+})

From 13acc98bb91a1ae0a6eed39f8dce356aa955b665 Mon Sep 17 00:00:00 2001
From: Rachael Rose Renk <91027132+rachaelrenk@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:48:37 -0600
Subject: [PATCH 7/8] Enhanced billing experience (Billing vNext) for existing
 enterprises (#52313)

Co-authored-by: Sophie <29382425+sophietheking@users.noreply.github.com>
---
 content/admin/index.md                        |  3 +-
 .../viewing-people-in-your-enterprise.md      |  2 +-
 ...guring-code-scanning-for-your-appliance.md | 26 ++++----
 ...ng-dependency-review-for-your-appliance.md |  2 +-
 ...ring-secret-scanning-for-your-appliance.md |  8 +--
 ...b-advanced-security-for-your-enterprise.md | 10 ++--
 ...d-security-features-for-your-enterprise.md |  4 +-
 ...and-groups-with-scim-using-the-rest-api.md |  2 +-
 ...g-up-a-trial-of-github-enterprise-cloud.md |  8 +--
 content/billing/index.md                      | 33 ++++-------
 .../index.md                                  | 22 +++++++
 ...bout-billing-for-git-large-file-storage.md |  3 +-
 .../downgrading-git-large-file-storage.md     |  3 +-
 .../index.md                                  |  2 +
 .../upgrading-git-large-file-storage.md       |  5 +-
 ...ewing-your-git-large-file-storage-usage.md |  3 +-
 .../about-billing-for-github-actions.md       |  1 +
 .../index.md                                  |  1 +
 ...-your-spending-limit-for-github-actions.md |  1 +
 .../viewing-your-github-actions-usage.md      |  1 +
 ...ut-billing-for-github-advanced-security.md |  7 ++-
 .../index.md                                  |  1 +
 ...your-github-advanced-security-licensing.md |  4 +-
 ...-up-a-trial-of-github-advanced-security.md |  2 +
 ...signing-up-for-github-advanced-security.md |  2 +
 ...nformation-for-github-advanced-security.md |  4 +-
 ...ing-your-github-advanced-security-usage.md |  7 ++-
 .../about-billing-for-github-codespaces.md    | 59 ++++++++++---------
 .../index.md                                  |  2 +
 ...he-spending-limit-for-github-codespaces.md |  6 +-
 .../viewing-your-github-codespaces-usage.md   |  9 +--
 .../about-billing-for-github-copilot.md       |  2 +
 .../index.md                                  |  2 +
 .../about-billing-for-github-marketplace.md   |  1 +
 .../canceling-a-github-marketplace-app.md     |  1 +
 ...lling-plan-for-a-github-marketplace-app.md |  1 +
 .../index.md                                  |  1 +
 ...lling-plan-for-a-github-marketplace-app.md |  1 +
 .../about-billing-for-github-packages.md      |  1 +
 .../index.md                                  |  1 +
 ...your-spending-limit-for-github-packages.md |  1 +
 .../viewing-your-github-packages-usage.md     |  1 +
 .../about-billing-for-github-sponsors.md      |  1 +
 .../downgrading-a-sponsorship.md              |  1 +
 .../index.md                                  |  1 +
 .../setting-an-end-date-to-a-sponsorship.md   |  2 +
 .../upgrading-a-sponsorship.md                |  1 +
 ...io-subscriptions-with-github-enterprise.md |  3 +-
 .../index.md                                  |  2 +
 ...io-subscriptions-with-github-enterprise.md |  4 +-
 .../about-per-user-pricing.md                 |  2 +-
 .../connecting-an-azure-subscription.md       | 16 ++---
 ...-downgrading-affect-the-billing-process.md |  6 +-
 .../upgrading-your-accounts-plan.md           |  2 +-
 ...ing-license-usage-for-github-enterprise.md |  2 +-
 ...ing-license-usage-for-github-enterprise.md |  6 +-
 .../about-billing-for-your-enterprise.md      | 19 +++++-
 .../about-billing-on-github.md                |  5 +-
 .../adding-a-sales-tax-certificate.md         |  2 +
 .../adding-information-to-your-receipts.md    |  1 +
 .../adding-or-editing-a-payment-method.md     |  1 +
 ...ging-the-duration-of-your-billing-cycle.md |  1 +
 .../index.md                                  |  5 +-
 .../redeeming-a-coupon.md                     |  1 +
 .../setting-your-billing-email.md             |  1 +
 ...eshooting-a-declined-credit-card-charge.md |  1 +
 .../unlocking-a-locked-account.md             |  1 +
 ...ewing-your-payment-history-and-receipts.md |  1 +
 ...ing-your-subscriptions-and-billing-date.md |  1 +
 .../about-the-billing-cycle.md                | 16 -----
 .../index.md                                  | 23 --------
 ...out-billing-for-git-large-file-storage.md} |  8 ++-
 .../about-the-billing-cycle.md                | 18 ++++++
 ...e-new-billing-platform-for-enterprises.md} | 24 ++++----
 .../about-usage-based-billing-for-licenses.md |  3 +-
 ...adding-seats-to-your-enterprise-account.md |  8 ++-
 .../charging-business-units.md                |  6 +-
 ...estimating-spending-for-your-enterprise.md |  6 +-
 .../gathering-insights-on-your-spending.md    |  6 +-
 ...-started-with-the-new-billing-platform.md} |  8 ++-
 .../using-the-new-billing-platform/index.md   | 24 ++++++++
 ...ng-your-payment-and-billing-information.md |  4 +-
 .../preventing-overspending.md                |  4 +-
 .../roles-for-the-new-billing-platform.md}    | 12 ++--
 ...ickstart-for-securing-your-organization.md |  4 +-
 content/code-security/index.md                |  2 +-
 ...-github-advanced-security-license-usage.md |  2 +-
 ...reating-a-custom-security-configuration.md |  3 +-
 ...nough-github-advanced-security-licenses.md |  2 +-
 ...rity-features-for-multiple-repositories.md |  4 +-
 .../deleting-a-codespace.md                   |  6 +-
 .../opening-an-existing-codespace.md          | 16 ++---
 .../understanding-the-codespace-lifecycle.md  |  2 +-
 content/codespaces/guides.md                  |  2 +-
 content/codespaces/index.md                   |  2 +-
 ...ays-for-codespaces-in-your-organization.md | 18 +++---
 ...ing-the-codespaces-in-your-organization.md |  4 +-
 ...-github-codespaces-in-your-organization.md |  8 +--
 .../restricting-access-to-machine-types.md    |  4 +-
 .../restricting-the-idle-timeout-period.md    |  2 +-
 ...ion-billed-codespaces-a-user-can-create.md |  4 +-
 ...ing-the-retention-period-for-codespaces.md |  2 +-
 content/codespaces/overview.md                | 16 ++---
 .../about-github-codespaces-prebuilds.md      |  4 +-
 .../configuring-prebuilds.md                  | 24 ++++----
 .../managing-prebuilds.md                     |  6 +-
 .../introduction-to-dev-containers.md         | 30 +++++-----
 ...mplate-repository-for-github-codespaces.md |  2 +-
 ...g-automatic-deletion-of-your-codespaces.md | 10 ++--
 ...ur-timeout-period-for-github-codespaces.md |  2 +-
 .../the-githubdev-web-based-editor.md         | 10 ++--
 .../exporting-changes-to-a-branch.md          |  2 +-
 ...ing-creation-and-deletion-of-codespaces.md |  2 +-
 .../troubleshooting-included-usage.md         | 30 +++++-----
 .../troubleshooting-prebuilds.md              |  2 +-
 ...github-codespaces-with-github-classroom.md | 16 ++---
 .../about-github-advanced-security.md         | 22 +++----
 .../transferring-a-repository.md              | 14 ++---
 ...-objects-in-archives-of-your-repository.md |  2 +-
 .../about-storage-and-bandwidth-usage.md      |  4 +-
 content/rest/repos/lfs.md                     |  2 +-
 data/learning-tracks/actions.yml              |  4 +-
 data/learning-tracks/admin.yml                | 15 ++---
 .../enterprise-server/3-12/0-rc1.yml          |  4 +-
 .../enterprise-server/3-12/0.yml              |  4 +-
 .../about-ghas-organization-policy.md         |  2 +-
 .../reusables/advanced-security/ghas-trial.md |  4 +-
 .../note-org-enable-uses-seats.md             |  2 +-
 .../advanced-security/purchase-ghas.md        |  2 +-
 .../enhanced-billing-platform-licenses.md     |  2 +-
 .../billing/enhanced-billing-platform.md      |  2 +-
 .../ghas-metered-billing-note-with-link.md    |  2 +-
 .../new-billing-platform-permissions.md       |  3 +
 .../about-multiple-configurations-link.md     |  2 +-
 .../codespaces/about-publishing-templates.md  |  2 +-
 .../codespaces-continue-by-paying.md          |  2 +-
 .../codespaces/codespaces-machine-types.md    |  2 +-
 .../education/student-codespaces-benefit.md   |  2 +-
 .../user-settings/context_switcher.md         |  2 +-
 .../fixtures/versionless-redirects.txt        |  9 ++-
 .../lib/static/redirect-exceptions.txt        |  4 +-
 src/secret-scanning/data/public-docs.yml      | 16 ++++-
 142 files changed, 512 insertions(+), 377 deletions(-)
 create mode 100644 content/billing/managing-billing-for-your-products/index.md
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md (90%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md (87%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-git-large-file-storage/index.md (88%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md (87%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md (91%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-actions/about-billing-for-github-actions.md (99%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-actions/index.md (92%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md (97%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-actions/viewing-your-github-actions-usage.md (97%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md (96%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-advanced-security/index.md (93%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md (86%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md (96%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md (94%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md (92%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md (93%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md (78%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-codespaces/index.md (87%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md (92%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md (81%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-copilot/about-billing-for-github-copilot.md (95%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-copilot/index.md (91%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md (97%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md (97%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md (96%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-marketplace-apps/index.md (92%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md (95%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-packages/about-billing-for-github-packages.md (99%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-packages/index.md (92%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md (97%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-packages/viewing-your-github-packages-usage.md (97%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md (91%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md (96%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-sponsors/index.md (91%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship.md (92%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md (92%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md (95%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md (78%)
 rename content/billing/{ => managing-billing-for-your-products}/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md (95%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/about-billing-for-your-enterprise.md (79%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/about-billing-on-github.md (95%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/adding-a-sales-tax-certificate.md (97%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/adding-information-to-your-receipts.md (97%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/adding-or-editing-a-payment-method.md (98%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/changing-the-duration-of-your-billing-cycle.md (97%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/index.md (94%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/redeeming-a-coupon.md (97%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/setting-your-billing-email.md (98%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/troubleshooting-a-declined-credit-card-charge.md (96%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/unlocking-a-locked-account.md (96%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/viewing-your-payment-history-and-receipts.md (95%)
 rename content/billing/{managing-your-github-billing-settings => using-the-billing-platform}/viewing-your-subscriptions-and-billing-date.md (95%)
 delete mode 100644 content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md
 delete mode 100644 content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md => using-the-new-billing-platform/about-billing-for-git-large-file-storage.md} (87%)
 create mode 100644 content/billing/using-the-new-billing-platform/about-the-billing-cycle.md
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md => using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises.md} (52%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises => using-the-new-billing-platform}/about-usage-based-billing-for-licenses.md (82%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises => using-the-new-billing-platform}/adding-seats-to-your-enterprise-account.md (53%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises => using-the-new-billing-platform}/charging-business-units.md (90%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises => using-the-new-billing-platform}/estimating-spending-for-your-enterprise.md (83%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises => using-the-new-billing-platform}/gathering-insights-on-your-spending.md (79%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform.md => using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md} (65%)
 create mode 100644 content/billing/using-the-new-billing-platform/index.md
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises => using-the-new-billing-platform}/managing-your-payment-and-billing-information.md (93%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises => using-the-new-billing-platform}/preventing-overspending.md (92%)
 rename content/billing/{using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md => using-the-new-billing-platform/roles-for-the-new-billing-platform.md} (60%)
 create mode 100644 data/reusables/billing/new-billing-platform-permissions.md

diff --git a/content/admin/index.md b/content/admin/index.md
index d455735cf1..8c3cf20b34 100644
--- a/content/admin/index.md
+++ b/content/admin/index.md
@@ -91,7 +91,7 @@ featuredLinks:
     - '{% ifversion ghec %}/admin/configuring-settings/configuring-user-applications-for-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise{% endif %}'
     - /admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/about-the-audit-log-for-your-enterprise
     - '{% ifversion ghec %}/admin/monitoring-activity-in-your-enterprise/exploring-user-activity-in-your-enterprise/managing-global-webhooks{% endif %}'
-    - '{% ifversion ghec %}/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise{% endif %}'
+    - '{% ifversion ghec %}/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise{% endif %}'
     - /support/learning-about-github-support/about-github-support
     - /admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities
 layout: product-landing
@@ -119,3 +119,4 @@ children:
   - /release-notes
   - /all-releases
 ---
+
diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
index 57c2322260..58b2f02255 100644
--- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
+++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/viewing-people-in-your-enterprise.md
@@ -159,7 +159,7 @@ In the list of pending members, for any individual account, you can cancel all i
 
 {% endnote %}
 
-If you use {% data variables.visual_studio.prodname_vss_ghe %}, the list of pending invitations includes all {% data variables.product.prodname_vs %} subscribers that haven't joined any of your organizations on {% data variables.product.prodname_dotcom %}, even if the subscriber does not have a pending invitation to join an organization. For more information about how to get {% data variables.product.prodname_vs %} subscribers access to {% data variables.product.prodname_enterprise %}, see "[AUTOTITLE](/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise)."
+If you use {% data variables.visual_studio.prodname_vss_ghe %}, the list of pending invitations includes all {% data variables.product.prodname_vs %} subscribers that haven't joined any of your organizations on {% data variables.product.prodname_dotcom %}, even if the subscriber does not have a pending invitation to join an organization. For more information about how to get {% data variables.product.prodname_vs %} subscribers access to {% data variables.product.prodname_enterprise %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise)."
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.people-tab %}
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md
index 7cfce4030a..659c29ee8f 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance.md
@@ -38,7 +38,7 @@ You can configure {% data variables.product.prodname_code_scanning %} to run {%
 
 ## Prerequisites for {% data variables.product.prodname_code_scanning %}
 
-* A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %}
+* A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %}
 
 * {% data variables.product.prodname_code_scanning_caps %} enabled in the management console (see "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise)")
 
@@ -59,17 +59,17 @@ You can configure {% data variables.product.prodname_code_scanning %} to run {%
 {% note %}
 
 **Notes:**
-  * If your enterprise uses {% data variables.product.prodname_dotcom %}-hosted runners with {% data variables.product.prodname_actions %}, proceed directly to configuring {% data variables.product.prodname_code_scanning %} through {% data variables.product.prodname_dotcom_the_website %}. For more information, see "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning)" and "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning-at-scale)."
-  * With the exception of Swift analysis, default setup can now run on {% data variables.actions.hosted_runners %}. For more information, see "[AUTOTITLE](/actions/using-github-hosted-runners/about-larger-runners/about-larger-runners)" and "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/configuring-larger-runners-for-default-setup)."
+  * If your enterprise uses {% data variables.product.prodname_dotcom %}-hosted runners with {% data variables.product.prodname_actions %}, proceed directly to configuring {% data variables.product.prodname_code_scanning %} through {% data variables.product.prodname_dotcom_the_website %}. See "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning)" and "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning-at-scale)."
+  * With the exception of Swift analysis, default setup can now run on {% data variables.actions.hosted_runners %}. See "[AUTOTITLE](/actions/using-github-hosted-runners/about-larger-runners/about-larger-runners)" and "[AUTOTITLE](/code-security/code-scanning/managing-your-code-scanning-configuration/configuring-larger-runners-for-default-setup)."
 
 {% endnote %}
 
 {% endif %}
 
-{% data variables.product.product_name %} can run {% data variables.product.prodname_code_scanning %} using a {% data variables.product.prodname_actions %} workflow. First, you need to provision one or more self-hosted {% data variables.product.prodname_actions %} runners in your environment. You can provision self-hosted runners at the repository, organization, or enterprise account level. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners)" and "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)."
+{% data variables.product.product_name %} can run {% data variables.product.prodname_code_scanning %} using a {% data variables.product.prodname_actions %} workflow. First, you need to provision one or more self-hosted {% data variables.product.prodname_actions %} runners in your environment. You can provision self-hosted runners at the repository, organization, or enterprise account level. See "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners)" and "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)."
 
 {% ifversion code-scanning-runner-label or default-setup-self-hosted-runners-GHEC %}
-If you are provisioning a self-hosted runner for {% data variables.product.prodname_codeql %} analysis, your runner must use a {% data variables.product.prodname_codeql %}-supported operating system version and CPU architecture. For more information, see the [{% data variables.product.prodname_codeql %} system requirements](https://codeql.github.com/docs/codeql-overview/system-requirements/).
+If you are provisioning a self-hosted runner for {% data variables.product.prodname_codeql %} analysis, your runner must use a {% data variables.product.prodname_codeql %}-supported operating system version and CPU architecture. See the [{% data variables.product.prodname_codeql %} system requirements](https://codeql.github.com/docs/codeql-overview/system-requirements/).
 
 If you are using default setup for {% data variables.product.prodname_code_scanning %}, assign the `code-scanning` label to your self-hosted runner. For more information about using labels with self-hosted runners, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/using-labels-with-self-hosted-runners)."{% ifversion code-scanning-default-setup-self-hosted-310 or default-setup-self-hosted-runners-GHEC %} For more information about using default setup for code scanning analysis of compiled languages, see "[AUTOTITLE](/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/codeql-code-scanning-for-compiled-languages)."{% endif %}
 
@@ -89,16 +89,16 @@ You must ensure that Git is in the PATH variable on any self-hosted runners you
 
 ### Provisioning a runner scale set
 
-You can use {% data variables.product.prodname_actions_runner_controller %} to create a dedicated runner scale set for your {% data variables.product.prodname_ghe_server %} instance. For more information, see "[AUTOTITLE](/enterprise-server@latest/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller#using-arc-with-dependabot-and-code-scanning)."
+You can use {% data variables.product.prodname_actions_runner_controller %} to create a dedicated runner scale set for your {% data variables.product.prodname_ghe_server %} instance. See "[AUTOTITLE](/enterprise-server@latest/actions/hosting-your-own-runners/managing-self-hosted-runners-with-actions-runner-controller/deploying-runner-scale-sets-with-actions-runner-controller#using-arc-with-dependabot-and-code-scanning)."
 
 ### Provisioning the actions for {% data variables.product.prodname_code_scanning %}
 
 {% ifversion ghes %}
 If you want to use actions to run {% data variables.product.prodname_code_scanning %} on {% data variables.product.prodname_ghe_server %}, the actions must be available on your appliance.
 
-The {% data variables.product.prodname_codeql %} action is included in your installation of {% data variables.product.prodname_ghe_server %}. If both {% data variables.product.prodname_ghe_server %} {{ allVersions[currentVersion].currentRelease }} and your {% data variables.product.prodname_actions %} runner have access to the internet, the action will automatically download the {% data variables.product.prodname_codeql %} {% data variables.product.codeql_cli_ghes_recommended_version %} bundle required to perform analysis. Alternatively, you can use a synchronization tool to make the latest released version of the {% data variables.product.prodname_codeql %} analysis bundle available locally. For more information, see "[Configuring {% data variables.product.prodname_codeql %} analysis on a server without internet access](#configuring-codeql-analysis-on-a-server-without-internet-access)" below.
+The {% data variables.product.prodname_codeql %} action is included in your installation of {% data variables.product.prodname_ghe_server %}. If both {% data variables.product.prodname_ghe_server %} {{ allVersions[currentVersion].currentRelease }} and your {% data variables.product.prodname_actions %} runner have access to the internet, the action will automatically download the {% data variables.product.prodname_codeql %} {% data variables.product.codeql_cli_ghes_recommended_version %} bundle required to perform analysis. Alternatively, you can use a synchronization tool to make the latest released version of the {% data variables.product.prodname_codeql %} analysis bundle available locally. See "[Configuring {% data variables.product.prodname_codeql %} analysis on a server without internet access](#configuring-codeql-analysis-on-a-server-without-internet-access)" below.
 
-You can also make third-party actions available to users for {% data variables.product.prodname_code_scanning %}, by setting up {% data variables.product.prodname_github_connect %}. For more information, see "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance#configuring-github-connect-to-sync-github-actions)" below.
+You can also make third-party actions available to users for {% data variables.product.prodname_code_scanning %}, by setting up {% data variables.product.prodname_github_connect %}. See "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance#configuring-github-connect-to-sync-github-actions)" below.
 
 ### Configuring {% data variables.product.prodname_codeql %} analysis on a server without internet access
 
@@ -110,14 +110,14 @@ If you configure the {% data variables.product.prodname_codeql %} action sync to
 
 ### Configuring {% data variables.product.prodname_github_connect %} to sync {% data variables.product.prodname_actions %}
 
-1. If you want to download action workflows on demand from {% data variables.product.prodname_dotcom_the_website %}, you need to enable {% data variables.product.prodname_github_connect %}. For more information, see "[AUTOTITLE](/admin/configuration/configuring-github-connect/managing-github-connect#enabling-github-connect)."
-1. You'll also need to enable {% data variables.product.prodname_actions %}. For more information, see "[AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server)."
-1. The next step is to configure access to actions on {% data variables.product.prodname_dotcom_the_website %} using {% data variables.product.prodname_github_connect %}. For more information, see "[AUTOTITLE](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)."
-1. Add a self-hosted runner to your repository, organization, or enterprise account. For more information, see "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)."
+1. If you want to download action workflows on demand from {% data variables.product.prodname_dotcom_the_website %}, you need to enable {% data variables.product.prodname_github_connect %}. See "[AUTOTITLE](/admin/configuration/configuring-github-connect/managing-github-connect#enabling-github-connect)."
+1. You'll also need to enable {% data variables.product.prodname_actions %}. See "[AUTOTITLE](/admin/github-actions/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server)."
+1. The next step is to configure access to actions on {% data variables.product.prodname_dotcom_the_website %} using {% data variables.product.prodname_github_connect %}. See "[AUTOTITLE](/admin/github-actions/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect)."
+1. Add a self-hosted runner to your repository, organization, or enterprise account. See "[AUTOTITLE](/actions/hosting-your-own-runners/managing-self-hosted-runners/adding-self-hosted-runners)."
 
 ## Running code scanning using the {% data variables.product.prodname_codeql_cli %}
 
 If you don't want to use {% data variables.product.prodname_actions %}, you should run {% data variables.product.prodname_code_scanning %} using the {% data variables.product.prodname_codeql_cli %}.
 
-The {% data variables.product.prodname_codeql_cli %} is a command-line tool that you use to analyze codebases on any machine, including a third-party CI/CD system. For more information, see "[AUTOTITLE](/code-security/code-scanning/integrating-with-code-scanning/using-code-scanning-with-your-existing-ci-system)."
+The {% data variables.product.prodname_codeql_cli %} is a command-line tool that you use to analyze codebases on any machine, including a third-party CI/CD system. See "[AUTOTITLE](/code-security/code-scanning/integrating-with-code-scanning/using-code-scanning-with-your-existing-ci-system)."
 {% endif %}
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-dependency-review-for-your-appliance.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-dependency-review-for-your-appliance.md
index 2461826861..c0e2925e0b 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-dependency-review-for-your-appliance.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-dependency-review-for-your-appliance.md
@@ -27,7 +27,7 @@ Some additional features, such as license checks, blocking of pull requests, and
 
 ## Prerequisites for dependency review
 
-* A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)").{% endif %}
+* A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)").{% endif %}
 
 * The dependency graph enabled for the instance. Site administrators can enable the dependency graph via the management console or the administrative shell (see "[AUTOTITLE](/admin/code-security/managing-supply-chain-security-for-your-enterprise/enabling-the-dependency-graph-for-your-enterprise)").
 
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md
index 37a0157f2b..ca3a488eec 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/configuring-secret-scanning-for-your-appliance.md
@@ -19,7 +19,7 @@ topics:
 
 ## About {% data variables.product.prodname_secret_scanning %}
 
-If someone checks a secret with a known pattern into a repository, {% data variables.product.prodname_secret_scanning %} catches the secret as it's checked in, and helps you mitigate the impact of the leak. Repository administrators are notified about any commit that contains a secret, and they can quickly view all detected secrets in the **Security** tab for the repository. For more information, see "[AUTOTITLE](/code-security/secret-scanning/introduction/about-secret-scanning)."
+If someone checks a secret with a known pattern into a repository, {% data variables.product.prodname_secret_scanning %} catches the secret as it's checked in, and helps you mitigate the impact of the leak. Repository administrators are notified about any commit that contains a secret, and they can quickly view all detected secrets in the **Security** tab for the repository. See "[AUTOTITLE](/code-security/secret-scanning/introduction/about-secret-scanning)."
 
 ## Checking whether your license includes {% data variables.product.prodname_GH_advanced_security %}
 
@@ -29,7 +29,7 @@ If someone checks a secret with a known pattern into a repository, {% data varia
 
 * The SSSE3 (Supplemental Streaming SIMD Extensions 3) CPU flag needs to be enabled on the VM/KVM that runs {% data variables.product.prodname_ghe_server %}. For more information about SSSE3, see [Intel 64 and IA-32 Architectures Optimization Reference Manual](https://cdrdv2-public.intel.com/671488/248966-Software-Optimization-Manual-R047.pdf) in the Intel documentation.
 
-* A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %}
+* A license for {% data variables.product.prodname_GH_advanced_security %}{% ifversion ghes %} (see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)"){% endif %}
 
 * {% data variables.product.prodname_secret_scanning_caps %} enabled in the management console (see "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise)")
 
@@ -37,14 +37,14 @@ If someone checks a secret with a known pattern into a repository, {% data varia
 
 The SSSE3 set of instructions is required because {% data variables.product.prodname_secret_scanning %} leverages hardware accelerated pattern matching to find potential credentials committed to your {% data variables.product.prodname_dotcom %} repositories. SSSE3 is enabled for most modern CPUs. You can check whether SSSE3 is enabled for the vCPUs available to your {% data variables.product.prodname_ghe_server %} instance.
 
-1. Connect to the administrative shell for your {% data variables.product.prodname_ghe_server %} instance. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh)."
+1. Connect to the administrative shell for your {% data variables.product.prodname_ghe_server %} instance. See "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/accessing-the-administrative-shell-ssh)."
 1. Enter the following command:
 
    ```shell
    grep -iE '^flags.*ssse3' /proc/cpuinfo >/dev/null | echo $?
    ```
 
-   If this returns the value `0`, it means that the SSSE3 flag is available and enabled. You can now enable {% data variables.product.prodname_secret_scanning %}. For more information, see "[Enabling {% data variables.product.prodname_secret_scanning %}](#enabling-secret-scanning)" below.
+   If this returns the value `0`, it means that the SSSE3 flag is available and enabled. You can now enable {% data variables.product.prodname_secret_scanning %}. See "[Enabling {% data variables.product.prodname_secret_scanning %}](#enabling-secret-scanning)" below.
 
    If this doesn't return `0`, SSSE3 is not enabled on your VM/KVM. You need to refer to the documentation of the hardware/hypervisor on how to enable the flag, or make it available to guest VMs.
 
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md
index 18ed006bde..cb97ed15a2 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise.md
@@ -21,7 +21,7 @@ topics:
 
 {% data reusables.advanced-security.ghas-helps-developers %}
 
-When you enable {% data variables.product.prodname_GH_advanced_security %} for your enterprise, repository administrators in all organizations can enable the features unless you set up a policy to restrict access. For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise)."
+When you enable {% data variables.product.prodname_GH_advanced_security %} for your enterprise, repository administrators in all organizations can enable the features unless you set up a policy to restrict access. See "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise)."
 
 {% ifversion secret-scanning-enterprise-level-api %}{% data reusables.secret-scanning.secret-scanning-enterprise-level-api %}{% endif %}
 
@@ -36,9 +36,9 @@ For guidance on a phased deployment of GitHub Advanced Security, see "[AUTOTITLE
 
 ## Prerequisites for enabling {% data variables.product.prodname_GH_advanced_security %}
 
-1. Upgrade your license for {% data variables.product.product_name %} to include {% data variables.product.prodname_GH_advanced_security %}. For information about licensing, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
-1. Download the new license file. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise)."
-1. Upload the new license file to {% data variables.product.prodname_ghe_server %}. For more information, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server)."
+1. Upgrade your license for {% data variables.product.product_name %} to include {% data variables.product.prodname_GH_advanced_security %}. For information about licensing, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+1. Download the new license file. See "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise)."
+1. Upload the new license file to {% data variables.product.prodname_ghe_server %}. See "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server)."
 1. Review the prerequisites for the features you plan to enable.
 
     * {% data variables.product.prodname_code_scanning_caps %}, see "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance#prerequisites-for-code-scanning)."
@@ -55,7 +55,7 @@ For guidance on a phased deployment of GitHub Advanced Security, see "[AUTOTITLE
 1. Under "Security," select the features that you want to enable and deselect any features you want to disable.
 {% data reusables.enterprise_management_console.save-settings %}
 
-When {% data variables.product.product_name %} has finished restarting, you're ready to set up any additional resources required for newly enabled features. For more information, see "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance)."
+When {% data variables.product.product_name %} has finished restarting, you're ready to set up any additional resources required for newly enabled features. See "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise/configuring-code-scanning-for-your-appliance)."
 
 ## Enabling or disabling {% data variables.product.prodname_GH_advanced_security %} features via the administrative shell (SSH)
 
diff --git a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md
index e6c77e8156..a03401f84f 100644
--- a/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md
+++ b/content/admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/managing-github-advanced-security-features-for-your-enterprise.md
@@ -24,7 +24,7 @@ To manage individual {% data variables.product.prodname_GH_advanced_security %}
 
 {% ifversion secret-scanning-enterprise-level-api %}{% data reusables.secret-scanning.secret-scanning-enterprise-level-api %}{% endif %}
 
-{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% endif %}
+{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% endif %}
 
 If you have disallowed {% data variables.product.prodname_GH_advanced_security %} for an organization, that organization will not be affected by enabling a feature for all existing repositories or for all new repositories. For more information about disallowing {% data variables.product.prodname_GH_advanced_security %} for an organization, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-code-security-and-analysis-for-your-enterprise)."
 
@@ -49,7 +49,7 @@ When you enable one or more security and analysis features for existing reposito
 
    {% note %}
 
-   **Note**: When a custom link is configured for an organization, the organization-level value overrides the custom link set for the enterprise. For more information, see "[AUTOTITLE](/code-security/secret-scanning/protecting-pushes-with-secret-scanning)."
+   **Note**: When a custom link is configured for an organization, the organization-level value overrides the custom link set for the enterprise. See "[AUTOTITLE](/code-security/secret-scanning/protecting-pushes-with-secret-scanning)."
 
    {% endnote %}
 
diff --git a/content/admin/managing-iam/provisioning-user-accounts-with-scim/provisioning-users-and-groups-with-scim-using-the-rest-api.md b/content/admin/managing-iam/provisioning-user-accounts-with-scim/provisioning-users-and-groups-with-scim-using-the-rest-api.md
index 17cd91aa6a..49ec4dfef5 100644
--- a/content/admin/managing-iam/provisioning-user-accounts-with-scim/provisioning-users-and-groups-with-scim-using-the-rest-api.md
+++ b/content/admin/managing-iam/provisioning-user-accounts-with-scim/provisioning-users-and-groups-with-scim-using-the-rest-api.md
@@ -224,7 +224,7 @@ To reprovision the user, you must use the `POST` method to create a new user. Th
 
 To control access to repositories in your enterprise, you can use groups on your identity management system to control organization and team membership for users in your enterprise. You can read about the associated API endpoints in the REST API documentation and see code examples, and you can review audit log events associated with each request.
 
-While your enterprise doesn't require an available license to provision a new user account, if you provision a group that results in the addition of users to an organization, you must have available licenses for those users.{% ifversion ghec %} If your enterprise only uses {% data variables.visual_studio.prodname_vss_ghe %}, the associated user must be assigned to a subscriber. For more information, see "[AUTOTITLE](/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise#about-licenses-for-visual-studio-subscriptions-with-github-enterprise)."{% endif %}
+While your enterprise doesn't require an available license to provision a new user account, if you provision a group that results in the addition of users to an organization, you must have available licenses for those users.{% ifversion ghec %} If your enterprise only uses {% data variables.visual_studio.prodname_vss_ghe %}, the associated user must be assigned to a subscriber. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise#about-licenses-for-visual-studio-subscriptions-with-github-enterprise)."{% endif %}
 
 * For an overview of the supported attributes for groups, see "[SCIM](/rest/enterprise-admin/scim#supported-scim-group-attributes)" in the REST API documentation.
 * For an overview of audit log events related to groups, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise#external_group)."
diff --git a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md
index 9933c818c7..dbecd4d72e 100644
--- a/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md
+++ b/content/admin/overview/setting-up-a-trial-of-github-enterprise-cloud.md
@@ -14,7 +14,7 @@ topics:
 shortTitle: Enterprise Cloud trial
 ---
 
-{% data reusables.enterprise.about-ghec %} For more information, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-github-enterprise-cloud)."
+{% data reusables.enterprise.about-ghec %} See "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/about-github-enterprise-cloud)."
 
 You can set up a trial to evaluate the additional features that come with {% data variables.product.prodname_ghe_cloud %}, such as SAML single sign-on (SSO), internal repositories, and audit log streaming. For a list of available features, see our [Pricing](https://github.com/pricing) page.
 
@@ -31,10 +31,10 @@ You do not need to provide a payment method during the trial.
 The trial lasts for **{% data reusables.enterprise.ghec-trial-length %} days** and includes the following features.
 
 * Access to **most** {% data variables.product.prodname_ghe_cloud %} features.{% ifversion metered-ghe-ghas%}
-* Access to the **enhanced billing platform**. See "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises)."{% endif %}
+* Access to the **new billing platform**. See "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises)."{% endif %}
 * An **enterprise account**, which allows you to manage multiple organizations. See "[AUTOTITLE](/enterprise-cloud@latest/get-started/learning-about-github/types-of-github-accounts)."
 * Up to **50 seats** to grant access to users.
-* The option to set up a free trial of **{% data variables.product.prodname_GH_advanced_security %}** to test features such as {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_secret_scanning %}. See "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)."
+* The option to set up a free trial of **{% data variables.product.prodname_GH_advanced_security %}** to test features such as {% data variables.product.prodname_code_scanning %} and {% data variables.product.prodname_secret_scanning %}. See "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)."
 
 ## Features not included in the trial
 
@@ -68,7 +68,7 @@ You can end your trial at any time by purchasing {% data variables.product.prodn
 If you **purchase {% data variables.product.prodname_enterprise %}**:
 
 {% ifversion metered-ghe-ghas%}
-* You can use usage-based billing for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GH_advanced_security %}, which means you pay monthly for the number of licenses you use. You will not need to buy a predefined number of licenses in advance. See, "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses)."
+* You can use usage-based billing for {% data variables.product.prodname_ghe_cloud %} and {% data variables.product.prodname_GH_advanced_security %}, which means you pay monthly for the number of licenses you use. You will not need to buy a predefined number of licenses in advance. See, "[AUTOTITLE](/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses)."
 
   If you did not set up a free trial and you want to use usage-based billing to pay for {% data variables.product.prodname_GH_advanced_security %} after the {% data variables.product.prodname_ghe_cloud %} trial ends, contact [{% data variables.product.prodname_dotcom %}'s Sales team](https://enterprise.github.com/contact).{% endif %}
 
diff --git a/content/billing/index.md b/content/billing/index.md
index 1e2c4ab1c8..08ff017cc5 100644
--- a/content/billing/index.md
+++ b/content/billing/index.md
@@ -1,16 +1,16 @@
 ---
 title: Billing and payments documentation
 shortTitle: Billing and payments
-intro: "Learn about the different components of your bill, and how you can view and manage those components."
+intro: 'Learn about the different components of your bill, and how you can view and manage those components.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github
   - /categories/setting-up-and-managing-billing-and-payments-on-github
 introLinks:
-  overview: '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/about-billing-on-github{% elsif ghes%}/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise{% endif %}'
+  overview: '{% ifversion fpt or ghec %}/billing/using-the-billing-platform/about-billing-on-github{% elsif ghes%}/billing/using-the-billing-platform/about-billing-for-your-enterprise{% endif %}'
 featuredLinks:
   startHere:
-    - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-your-github-billing-settings/setting-your-billing-email{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/using-the-billing-platform/adding-or-editing-a-payment-method{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/using-the-billing-platform/setting-your-billing-email{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/about-per-user-pricing{% endif %}'
     - '{% ifversion ghes %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/about-licenses-for-github-enterprise{% endif %}'
@@ -18,14 +18,14 @@ featuredLinks:
   popular:
     - '{% ifversion ghec %}/billing/managing-the-plan-for-your-github-account/viewing-the-subscription-and-usage-for-your-enterprise-account{% endif %}'
     - '{% ifversion fpt or ghec %}/billing/managing-the-plan-for-your-github-account/downgrading-your-accounts-plan{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-actions/about-billing-for-github-actions{% endif %}'
-    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
-    - '{% ifversion ghes %}/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions{% endif %}'
+    - '{% ifversion fpt or ghec %}/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security{% endif %}'
+    - '{% ifversion ghes %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/uploading-a-new-license-to-github-enterprise-server{% endif %}'
   guideCards:
     - /billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process
-    - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
+    - /billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/downloading-your-license-for-github-enterprise{% endif %}'
     - '{% ifversion ghes %}/billing/managing-your-license-for-github-enterprise/syncing-license-usage-between-github-enterprise-server-and-github-enterprise-cloud{% endif %}'
 layout: product-landing
@@ -36,18 +36,11 @@ versions:
 topics:
   - Billing
 children:
-  - /managing-your-github-billing-settings
+  - /using-the-billing-platform
+  - /using-the-new-billing-platform
   - /managing-the-plan-for-your-github-account
   - /managing-your-license-for-github-enterprise
-  - /managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
-  - /managing-billing-for-github-actions
-  - /managing-billing-for-github-codespaces
-  - /managing-billing-for-github-packages
-  - /managing-billing-for-github-copilot
-  - /managing-billing-for-github-advanced-security
-  - /managing-billing-for-github-sponsors
-  - /managing-billing-for-github-marketplace-apps
-  - /managing-billing-for-git-large-file-storage
+  - /managing-billing-for-your-products
   - /setting-up-paid-accounts-for-procurement-companies
-  - /using-the-enhanced-billing-platform-for-enterprises
 ---
+
diff --git a/content/billing/managing-billing-for-your-products/index.md b/content/billing/managing-billing-for-your-products/index.md
new file mode 100644
index 0000000000..8643696545
--- /dev/null
+++ b/content/billing/managing-billing-for-your-products/index.md
@@ -0,0 +1,22 @@
+---
+title: Managing billing for your products
+shortTitle: Product billing
+intro: "Learn how to view usage and manage billing for your specific products."
+versions:
+  fpt: '*'
+  ghes: '*'
+  ghec: '*'
+topics:
+  - Billing
+children:
+  - /managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
+  - /managing-billing-for-github-actions
+  - /managing-billing-for-github-codespaces
+  - /managing-billing-for-github-packages
+  - /managing-billing-for-github-copilot
+  - /managing-billing-for-github-advanced-security
+  - /managing-billing-for-github-sponsors
+  - /managing-billing-for-github-marketplace-apps
+  - /managing-billing-for-git-large-file-storage  
+
+---
diff --git a/content/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md
similarity index 90%
rename from content/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md
index 913c53dbac..036ee029b1 100644
--- a/content/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-git-large-file-storage
   - /articles/about-billing-for-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage
+  - /billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage
 versions:
   fpt: '*'
   ghec: '*'
@@ -31,7 +32,7 @@ shortTitle: About Git LFS billing
 
 ## Purchasing additional storage and bandwidth
 
-Additional storage and bandwidth is offered in a single data pack. One data pack costs {% data variables.large_files.pack_monthly_price %}, and provides a monthly quota of {% data variables.large_files.pack_monthly_bandwidth %} for bandwidth and {% data variables.large_files.pack_monthly_storage %} for storage. You can purchase as many data packs as you need. For example, if you need 150 GB of storage, you'd buy three data packs. For more information about how to purchase additional storage and bandwidth, see "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage)."
+Additional storage and bandwidth is offered in a single data pack. One data pack costs {% data variables.large_files.pack_monthly_price %}, and provides a monthly quota of {% data variables.large_files.pack_monthly_bandwidth %} for bandwidth and {% data variables.large_files.pack_monthly_storage %} for storage. You can purchase as many data packs as you need. For example, if you need 150 GB of storage, you'd buy three data packs. For more information about how to purchase additional storage and bandwidth, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage)."
 
 Purchasing data packs for {% data variables.large_files.product_name_short %} is independent of any other paid feature or product on {% data variables.product.product_name %}.
 
diff --git a/content/billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md
similarity index 87%
rename from content/billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md
index edadb6684d..86f16816ae 100644
--- a/content/billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/downgrading-storage-and-bandwidth-for-an-organization
   - /articles/downgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
+  - /billing/managing-billing-for-git-large-file-storage/downgrading-git-large-file-storage
 versions:
   fpt: '*'
   ghec: '*'
@@ -25,7 +26,7 @@ shortTitle: Downgrade Git LFS storage
 
 {% endif %}
 
-When you downgrade your number of data packs, your change takes effect on your next billing date. For more information, see "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)."
+When you downgrade your number of data packs, your change takes effect on your next billing date. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)."
 
 ## Downgrading storage and bandwidth for a personal account
 
diff --git a/content/billing/managing-billing-for-git-large-file-storage/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md
similarity index 88%
rename from content/billing/managing-billing-for-git-large-file-storage/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md
index 840f9dfce8..05918a295b 100644
--- a/content/billing/managing-billing-for-git-large-file-storage/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/index.md
@@ -8,6 +8,8 @@ redirect_from:
   - /articles/managing-large-file-storage-and-bandwidth-for-your-organization
   - /articles/managing-storage-and-bandwidth-usage
   - /articles/managing-billing-for-git-large-file-storage
+  - /billing/managing-billing-for-git-large-file-storage/index
+  - /billing/managing-billing-for-git-large-file-storage
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md
similarity index 87%
rename from content/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md
index 3dadacfee4..92efbf4ea4 100644
--- a/content/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/purchasing-additional-storage-and-bandwidth-for-an-organization
   - /articles/upgrading-git-large-file-storage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
+  - /billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage
 versions:
   fpt: '*'
   ghec: '*'
@@ -65,7 +66,7 @@ shortTitle: Upgrade Git LFS storage
 
 ## Further reading
 
-* "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)"
 * "[AUTOTITLE](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage)"
-* "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage)"
 * "[AUTOTITLE](/repositories/working-with-files/managing-large-files)"
diff --git a/content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
similarity index 91%
rename from content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
index 701d10deba..92ce0a5eef 100644
--- a/content/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/viewing-storage-and-bandwidth-usage-for-an-organization
   - /articles/viewing-your-git-large-file-storage-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage
+  - /billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage
 versions:
   fpt: '*'
   ghec: '*'
@@ -68,4 +69,4 @@ shortTitle: View Git LFS usage
 ## Further reading
 
 * "[AUTOTITLE](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage)"
-* "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage)"
diff --git a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md
similarity index 99%
rename from content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md
index 9874d3b4a5..1e652ec358 100644
--- a/content/billing/managing-billing-for-github-actions/about-billing-for-github-actions.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions.md
@@ -4,6 +4,7 @@ intro: 'If you want to use {% data variables.product.prodname_actions %} beyond
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-actions
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/about-billing-for-github-actions
+  - /billing/managing-billing-for-github-actions/about-billing-for-github-actions
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-actions/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md
similarity index 92%
rename from content/billing/managing-billing-for-github-actions/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md
index 7bae2c0bd6..4315d5fb34 100644
--- a/content/billing/managing-billing-for-github-actions/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/index.md
@@ -4,6 +4,7 @@ shortTitle: GitHub Actions
 intro: 'You can view your usage and set a spending limit for {% data variables.product.prodname_actions %}.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions
+  - /billing/managing-billing-for-github-actions
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
similarity index 97%
rename from content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
index 0adc1824e1..75d5125757 100644
--- a/content/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions.md
@@ -4,6 +4,7 @@ intro: 'You can set a spending limit for {% data variables.product.prodname_acti
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-actions
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions
+  - /billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
similarity index 97%
rename from content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
index ff1ef7d772..a77e848566 100644
--- a/content/billing/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-actions/viewing-your-github-actions-usage.md
@@ -4,6 +4,7 @@ intro: 'You can view details of your usage of minutes and storage for {% data va
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-actions-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-actions/viewing-your-github-actions-usage
+  - /billing/managing-billing-for-github-actions/viewing-your-github-actions-usage
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
similarity index 96%
rename from content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
index b20eb39d65..239e0ba159 100644
--- a/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
@@ -7,6 +7,7 @@ redirect_from:
   - /billing/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-licensing-for-github-advanced-security
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/about-licensing-for-github-advanced-security
+  - /billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security
 versions:
   fpt: '*'
   ghes: '*'
@@ -79,7 +80,7 @@ If you want to use {% data variables.product.prodname_GH_advanced_security %} fe
 
 {% endif %}
 
-{% data reusables.advanced-security.ghas-trial-availability %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)."
+{% data reusables.advanced-security.ghas-trial-availability %} See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)."
 
 {% data reusables.advanced-security.ghas-trial-invoiced %}
 
@@ -120,7 +121,7 @@ As soon as you free up some {% ifversion ghas-billing-UI-update %}licenses{% els
 
 You can enforce policies to allow or disallow the use of {% data variables.product.prodname_advanced_security %} by organizations owned by your enterprise account. See "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise)."
 
-For more information on viewing license usage, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
+For more information on viewing license usage, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
 
 ## Active committers and unique committers
 
@@ -136,7 +137,7 @@ If there are no unique {% ifversion ghas-billing-UI-update %}active {% endif %}c
 When you activate or deactivate {% data variables.product.prodname_advanced_security %} for repositories, {% data variables.product.prodname_dotcom %} displays an overview of changes to the use of your license. If you deactivate access to {% data variables.product.prodname_GH_advanced_security %}, any {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} used by unique active committers are freed up.
 
 {% ifversion ghec %}
-For more information on managing the number of committers, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing)."
+For more information on managing the number of committers, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing)."
 {% endif %}
 
 ## Understanding usage
diff --git a/content/billing/managing-billing-for-github-advanced-security/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md
similarity index 93%
rename from content/billing/managing-billing-for-github-advanced-security/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md
index 3676531550..52ea4a72ae 100644
--- a/content/billing/managing-billing-for-github-advanced-security/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/index.md
@@ -6,6 +6,7 @@ product: '{% data reusables.gated-features.ghas %}'
 redirect_from:
   - /billing/managing-licensing-for-github-advanced-security
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security
+  - /billing/managing-billing-for-github-advanced-security
 versions:
   fpt: '*'
   ghes: '*'
diff --git a/content/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md
similarity index 86%
rename from content/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md
index bb1a8c2852..5b9df032c2 100644
--- a/content/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing.md
@@ -6,6 +6,8 @@ product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   ghec: '*'
 type: how_to
+redirect_from:
+  - /billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing
 topics:
   - Advanced Security
   - Enterprise
@@ -13,7 +15,7 @@ shortTitle: Manage Advanced Security licensing
 ---
 ## About licensing for {% data variables.product.prodname_GH_advanced_security %}
 
-Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of accounts that can use these features. Each active committer to at least one repository with the feature enabled uses one {% ifversion ghas-billing-UI-update %}license{% else %}seat{% endif %}. A committer is considered active if one of their commits has been pushed to the repository within the last 90 days, regardless of when it was originally authored. For more information about committer numbers, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." For information about purchasing a license, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."
+Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of accounts that can use these features. Each active committer to at least one repository with the feature enabled uses one {% ifversion ghas-billing-UI-update %}license{% else %}seat{% endif %}. A committer is considered active if one of their commits has been pushed to the repository within the last 90 days, regardless of when it was originally authored. For more information about committer numbers, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)." For information about purchasing a license, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."
 
 ## Managing the number of committers in your subscription
 
diff --git a/content/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
similarity index 96%
rename from content/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
index 3223c29e57..99bfa3e2a9 100644
--- a/content/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
@@ -5,6 +5,8 @@ product: '{% data reusables.gated-features.ghas %}'
 versions:
   ghec: '*'
 type: how_to
+redirect_from:
+  - /billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security
 topics:
   - Advanced Security
   - Enterprise
diff --git a/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
similarity index 94%
rename from content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
index 13dd1f7ddb..a31faa3ec2 100644
--- a/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
@@ -6,6 +6,8 @@ product: '{% data reusables.gated-features.ghas-ghec %}'
 versions:
   ghec: '*'
 type: how_to
+redirect_from:
+  - /billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security
 topics:
   - Advanced Security
   - Enterprise
diff --git a/content/billing/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
similarity index 92%
rename from content/billing/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
index 631233837a..6f4b128e8c 100644
--- a/content/billing/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security.md
@@ -6,6 +6,8 @@ product: '{% data reusables.gated-features.ghas %}'
 versions:
   ghes: '*'
 type: how_to
+redirect_from:
+  - /billing/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security
 topics:
   - Advanced Security
   - Enterprise
@@ -20,7 +22,7 @@ If you currently use {% data variables.product.prodname_GH_advanced_security %},
 
 If you're considering using {% data variables.product.prodname_GH_advanced_security %}, you can use this tool to estimate potential costs to enable {% data variables.product.prodname_GH_advanced_security %}.
 
-For more information about billing for {% data variables.product.prodname_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+For more information about billing for {% data variables.product.prodname_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
 
 ## Viewing committer information
 
diff --git a/content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
similarity index 93%
rename from content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
index df90fb3cd7..9f080cced3 100644
--- a/content/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage.md
@@ -9,6 +9,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
   - /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-advanced-security-usage
+  - /billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage
 versions:
   ghes: '*'
   ghec: '*'
@@ -27,10 +28,10 @@ shortTitle: View Advanced Security usage
 
 ## About licenses for {% data variables.product.prodname_GH_advanced_security %}
 
-Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of {% ifversion ghas-billing-UI-update %}licenses {% endif %}that can use these features. Periodically you should check that your use is within your license capacity. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+Each license for {% data variables.product.prodname_GH_advanced_security %} specifies a maximum number of {% ifversion ghas-billing-UI-update %}licenses {% endif %}that can use these features. Periodically you should check that your use is within your license capacity. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
 
 {% ifversion ghas-committers-calculator %}
-You can estimate the number of licenses your enterprise would need to purchase {% data variables.product.prodname_GH_advanced_security %} or to enable {% data variables.product.prodname_GH_advanced_security %} for additional organizations and repositories. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security)."
+You can estimate the number of licenses your enterprise would need to purchase {% data variables.product.prodname_GH_advanced_security %} or to enable {% data variables.product.prodname_GH_advanced_security %} for additional organizations and repositories. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-committer-information-for-github-advanced-security)."
 {% endif %}
 
 {% ifversion security-configurations %}
@@ -50,7 +51,7 @@ You can view the enterprise account's current {% ifversion ghas-billing-UI-updat
 {% data reusables.enterprise-accounts.license-tab %}
    The "{% data variables.product.prodname_GH_advanced_security %}" section shows details of the current usage.
 
-   If you run out of licenses, the section will be red and show "Limit exceeded." You should either reduce your use of {% data variables.product.prodname_GH_advanced_security %} or purchase more licenses. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#getting-the-most-out-of-github-advanced-security)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing)."
+   If you run out of licenses, the section will be red and show "Limit exceeded." You should either reduce your use of {% data variables.product.prodname_GH_advanced_security %} or purchase more licenses. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#getting-the-most-out-of-github-advanced-security)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/managing-your-github-advanced-security-licensing)."
 
 {% ifversion security-configurations %}
       {% data reusables.security-configurations.managing-GHAS-licenses %}
diff --git a/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
similarity index 78%
rename from content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
index b386ae447d..d3b8da713b 100644
--- a/content/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces.md
@@ -16,6 +16,7 @@ redirect_from:
   - /codespaces/codespaces-reference/about-billing-for-codespaces
   - /codespaces/codespaces-reference/understanding-billing-for-codespaces
   - /codespaces/codespaces-reference/understanding-billing-for-github-codespaces.md
+  - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
 ---
 
 {% ifversion enhanced-billing-platform %}
@@ -32,7 +33,7 @@ redirect_from:
 
 {% data reusables.codespaces.codespaces-free-for-personal-intro %}
 
-Organizations can choose whether codespaces created from their repositories will be user-owned or organization-owned. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)." An organization pays for a codespace if all the following things are true.
+Organizations can choose whether codespaces created from their repositories will be user-owned or organization-owned. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)." An organization pays for a codespace if all the following things are true.
 
 * The organization has chosen for codespaces to be organization-owned.
 {% data reusables.codespaces.when-an-org-pays %}
@@ -62,21 +63,21 @@ The following storage and core hours of usage are included, free of charge, for
 
 **Notes**
 
-* The GB-month unit of storage is a time-based measurement, 1 GB-month being 1 GB of storage usage for one whole month. The disk space used by all of your codespaces and prebuilds is assessed once an hour and your current GB-month usage is recalculated. Therefore, while you have codespaces and prebuilds, your GB-month usage will increase throughout the month. For example, if the storage totals 15 GB, and remains unchanged throughout your monthly billing cycle, then you will have used 7.5 GB halfway through the month, and 15 GB at the end of the month. For more information, see "[About billing for storage usage](#about-billing-for-storage-usage)" later in this article.
+* The GB-month unit of storage is a time-based measurement, 1 GB-month being 1 GB of storage usage for one whole month. The disk space used by all of your codespaces and prebuilds is assessed once an hour and your current GB-month usage is recalculated. Therefore, while you have codespaces and prebuilds, your GB-month usage will increase throughout the month. For example, if the storage totals 15 GB, and remains unchanged throughout your monthly billing cycle, then you will have used 7.5 GB halfway through the month, and 15 GB at the end of the month. See "[About billing for storage usage](#about-billing-for-storage-usage)" later in this article.
 * A "core hour" is a measure used for included compute usage. To calculate core hours, multiply the number of hours for which a codespace has been active by the multiplier in the pricing table later in this article. For the basic machine types, the multiplier is the number of processor cores in the machine that hosts the codespace. For example, if you use a 2-core machine for your codespace and it's active for an hour, you have used 2 core hours. If you use an 8-core machine for an hour, you have used 8 core hours. If you use an 8-core machine for two hours, you have used 16 core hours.
 
 {% endnote %}
 
-You will be notified by email when you have used 75%, 90%, and 100% of your included quotas. Notifications are also displayed in a "toast" message within {% data variables.product.prodname_vscode_shortname %} and the {% data variables.product.prodname_vscode_shortname %} web client. You can turn off email notifications if required. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-usage-and-spending-limit-email-notifications)."
+You will be notified by email when you have used 75%, 90%, and 100% of your included quotas. Notifications are also displayed in a "toast" message within {% data variables.product.prodname_vscode_shortname %} and the {% data variables.product.prodname_vscode_shortname %} web client. You can turn off email notifications if required. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-usage-and-spending-limit-email-notifications)."
 
 When a personal account has used all of either the included storage or compute usage (whichever is reached first), and has no spending limit configured, use of {% data variables.product.prodname_github_codespaces %} will be blocked. You must set up a payment method and a spending limit to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. At the beginning of the next monthly billing cycle the included usage is reset. Storage will not be billed while use of {% data variables.product.prodname_github_codespaces %} is blocked.
 
-You can view details of your usage for the current month at any time. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+You can view details of your usage for the current month at any time. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 If you are blocked from resuming a codespace and you want to continue to work on changes you have made in your codespace, you can do any of the following:
 
 * Add a payment method and a spending limit greater than $0 USD.
-* Export the changes from the codespace to a branch. For more information, see "[AUTOTITLE](/codespaces/troubleshooting/exporting-changes-to-a-branch)."
+* Export the changes from the codespace to a branch. See "[AUTOTITLE](/codespaces/troubleshooting/exporting-changes-to-a-branch)."
 * Wait for your monthly included usage to reset at the start of the next monthly billing cycle.
 
 If you have used all of either your included storage usage or your included compute usage, and you have set up a payment method and a spending limit, any further use of codespaces owned by your personal account will incur charges for whichever type of usage has no remaining included quota. You will not be charged for the other type of usage until you have also used all of its included quota.
@@ -100,15 +101,15 @@ A {% data variables.product.prodname_github_codespaces %} instance (a "codespace
 
 For more information about the GB-month unit of measure, see "[About billing for storage usage](#about-billing-for-storage-usage)."
 
-If you enable prebuilding of codespaces this will incur additional charges. For more information, see "[About billing for {% data variables.product.prodname_codespaces %} prebuilds](#about-billing-for-codespaces-prebuilds)."
+If you enable prebuilding of codespaces this will incur additional charges. See "[About billing for {% data variables.product.prodname_codespaces %} prebuilds](#about-billing-for-codespaces-prebuilds)."
 
 ## About your bill for {% data variables.product.prodname_github_codespaces %}
 
 {% data variables.product.prodname_github_codespaces %} is billed in US dollars (USD) according to the amount of compute time and storage space your codespaces use. {% data reusables.codespaces.codespaces-monthly-billing %}
 
-Billing for {% data variables.product.prodname_github_codespaces %} shares your account's existing payment method, and receipt. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date)."
+Billing for {% data variables.product.prodname_github_codespaces %} shares your account's existing payment method, and receipt. See "[AUTOTITLE](/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date)."
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. See "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 ## About billing for compute usage
 
@@ -116,7 +117,7 @@ The compute usage of a codespace is the length of time for which that codespace
 
 As an example, if a codespace is active for 1 hour and 15 minutes, then the compute cost will be the hourly cost of the codespace, as determined by its machine type, multiplied by 1.25.
 
-You can control compute usage by stopping your codespaces. For information, see "[AUTOTITLE](/codespaces/developing-in-codespaces/stopping-and-starting-a-codespace)." Codespaces are stopped automatically after a configurable period of inactivity. The timeout period can be configured by the user, or at the organization level. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces)" and "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)."
+You can control compute usage by stopping your codespaces. For information, see "[AUTOTITLE](/codespaces/developing-in-codespaces/stopping-and-starting-a-codespace)." Codespaces are stopped automatically after a configurable period of inactivity. The timeout period can be configured by the user, or at the organization level. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces)" and "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period)."
 
 ## About billing for storage usage
 
@@ -126,7 +127,7 @@ For {% data variables.product.prodname_github_codespaces %} billing purposes, st
 
 **Note**
 
-When you use the default dev container configuration, your dev container will be built from the default Linux image for codespaces. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#using-the-default-dev-container-configuration)." Containers based on the default image are not counted as used storage, irrespective of whether you have added features in your dev container configuration. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/configuring-dev-containers/adding-features-to-a-devcontainer-file)."
+When you use the default dev container configuration, your dev container will be built from the default Linux image for codespaces. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#using-the-default-dev-container-configuration)." Containers based on the default image are not counted as used storage, irrespective of whether you have added features in your dev container configuration. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/configuring-dev-containers/adding-features-to-a-devcontainer-file)."
 
 If you use the default image, the storage usage for your codespace will be based on the files in your repository, and any files you subsequently add to the codespace. If you use an alternative base image, then the resulting container and all of the files in the codespace will be counted as used storage.
 
@@ -141,15 +142,15 @@ For example, if you have one codespace that uses 100 GB of storage and has exist
 For each hourly report, the storage usage for the previous hour is calculated in seconds. As a result, you won't be charged for a full hour of storage if a codespace did not exist for the full 60 minutes. At the end of the month, {% data variables.product.prodname_dotcom %} rounds your storage to the nearest MB.
 
 Organization owners can:
-* List the currently active and stopped codespaces for your organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization)." In addition to the cost of these codespaces, the cost of {% data variables.product.prodname_github_codespaces %} for the current month may include costs for codespaces that existed earlier in the current month but have since been deleted.
-* See the total {% data variables.product.prodname_github_codespaces %} compute and storage usage for your organization for the current month to date. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
-* Configure your organization settings to manage the cost of {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization)."
+* List the currently active and stopped codespaces for your organization. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization)." In addition to the cost of these codespaces, the cost of {% data variables.product.prodname_github_codespaces %} for the current month may include costs for codespaces that existed earlier in the current month but have since been deleted.
+* See the total {% data variables.product.prodname_github_codespaces %} compute and storage usage for your organization for the current month to date. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+* Configure your organization settings to manage the cost of {% data variables.product.prodname_github_codespaces %}. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization)."
 
 To estimate the costs for usage-based billing, you can use the {% data variables.product.prodname_dotcom %} [pricing calculator](https://github.com/pricing/calculator?feature=codespaces).
 
 ## About billing for {% data variables.product.prodname_codespaces %} prebuilds
 
-{% data reusables.codespaces.prebuilds-definition %} For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)."
+{% data reusables.codespaces.prebuilds-definition %} See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)."
 
 ### {% data variables.product.prodname_actions %} costs for prebuilds
 
@@ -157,7 +158,7 @@ Prebuilds are created and updated by running a {% data variables.product.prodnam
 
 As with other workflows, while prebuild workflows are running they consume {% data variables.product.prodname_actions %} minutes included with your account, if you have any, or they incur charges for {% data variables.product.prodname_actions %} minutes. For more information about pricing for {% data variables.product.prodname_actions %} minutes, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)." There is no associated {% data variables.product.prodname_codespaces %} compute cost for creating or updating prebuilds.
 
-You can track usage of prebuild workflows and storage by downloading a usage report for your account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+You can track usage of prebuild workflows and storage by downloading a usage report for your account. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 ### Storage costs for prebuilds
 
@@ -174,17 +175,17 @@ The total storage costs associated with a prebuild configuration will depend on
 
 The storage cost for the prebuilds generated by a prebuild configuration is therefore calculated as: `price per GB * size (GB) * regions * versions`.
 
-You can check how many GB-months of storage has been used by prebuilds by reviewing the current billing data for your personal or organization account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+You can check how many GB-months of storage has been used by prebuilds by reviewing the current billing data for your personal or organization account. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
-{% data reusables.codespaces.prebuilds-billing-for-forks %} For more information, see "[How billing is handled for forked repositories](#how-billing-is-handled-for-forked-repositories)."
+{% data reusables.codespaces.prebuilds-billing-for-forks %} See "[How billing is handled for forked repositories](#how-billing-is-handled-for-forked-repositories)."
 
 ### Controlling the cost of prebuilds
 
-To reduce consumption of Actions minutes, you can set a prebuild to be updated only when you make a change to your dev container configuration files, or only on a custom schedule. You can also manage your storage usage by adjusting the number of previous versions of each prebuild that are retained. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
+To reduce consumption of Actions minutes, you can set a prebuild to be updated only when you make a change to your dev container configuration files, or only on a custom schedule. You can also manage your storage usage by adjusting the number of previous versions of each prebuild that are retained. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
 
-To limit the storage costs associated with prebuilds, you can choose to create prebuilds only in selected regions, and you can specify the number of older versions of prebuilds that will be retained. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
+To limit the storage costs associated with prebuilds, you can choose to create prebuilds only in selected regions, and you can specify the number of older versions of prebuilds that will be retained. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
 
-If you delete a prebuild configuration, all the associated prebuilds are deleted, reducing your storage consumption from that point onward. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/managing-prebuilds#deleting-a-prebuild-configuration)."
+If you delete a prebuild configuration, all the associated prebuilds are deleted, reducing your storage consumption from that point onward. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/managing-prebuilds#deleting-a-prebuild-configuration)."
 
 {% note %}
 
@@ -202,13 +203,13 @@ Use of codespaces created using prebuilds is charged at the same rate as regular
 
 {% data reusables.codespaces.codespaces-spending-limit-requirement %}
 
-For information on managing and changing your account's spending limit, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
+For information on managing and changing your account's spending limit, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
 
 {% data reusables.codespaces.exporting-changes %}
 
 ## Viewing projected usage for an organization
 
-Organization owners and billing managers can view an estimated total usage cost for {% data variables.product.prodname_github_codespaces %} for the organization, for the current monthly billing cycle. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage#viewing-github-codespaces-usage-for-your-organization-account)."
+Organization owners and billing managers can view an estimated total usage cost for {% data variables.product.prodname_github_codespaces %} for the organization, for the current monthly billing cycle. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage#viewing-github-codespaces-usage-for-your-organization-account)."
 
 The projected usage shown on the billing page for an organization is calculated based on the total cost for {% data variables.product.prodname_codespaces %} compute and storage usage incurred during the previous seven days, prior to the current day. This is projected forward for the remainder of the billing month to give you an idea of how much the total cost might be for the current billing cycle.
 
@@ -220,31 +221,31 @@ The projected usage does not take into account information such as whether {% da
 
 ## Limiting the machine types for organization-owned codespaces
 
-By default the machine type with the lowest valid resources is used when a codespace is created. However, users may be able to choose a machine type with more resources. They can do this either when they create a codespace, or they can change the machine type of an existing codespace. For more information, see "[AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)" and "[AUTOTITLE](/codespaces/customizing-your-codespace/changing-the-machine-type-for-your-codespace)."
+By default the machine type with the lowest valid resources is used when a codespace is created. However, users may be able to choose a machine type with more resources. They can do this either when they create a codespace, or they can change the machine type of an existing codespace. See "[AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)" and "[AUTOTITLE](/codespaces/customizing-your-codespace/changing-the-machine-type-for-your-codespace)."
 
 If a machine type that has more resources is chosen, this will affect the per-hour charge for that codespace, as shown in the table [earlier in this article](#pricing-for-paid-usage).
 
-Organization owners can create a policy to limit the choice of machine types available to users for codespaces that are billed to an organization or enterprise account. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
+Organization owners can create a policy to limit the choice of machine types available to users for codespaces that are billed to an organization or enterprise account. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
 
 ## Limiting the number of organization-owned codespaces
 
-Organization owners can limit the number of codespaces that people can create, where the organization will be billed for the codespace. This can help to reduce storage charges for the organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create)."
+Organization owners can limit the number of codespaces that people can create, where the organization will be billed for the codespace. This can help to reduce storage charges for the organization. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create)."
 
 ## How billing is handled for forked repositories
 
 Usage of codespaces created from a forked repository will be billed to your personal account unless the upstream (or parent) repository is in an organization that has allowed you - as a member, or outside collaborator, of the organization - to use codespaces at the organization's expense.
 
-For example, consider a member, or outside collaborator, of an organization that has allowed billing for codespaces for that user. If the user has permission to fork an organization-owned private repository, they can subsequently create and use a codespace for the new repository at the organization's expense. This is because the organization is the owner of the parent repository. Note that the organization owner can remove the user's access to the private repository, the forked repository, and therefore also the codespace. The organization owner can also delete the parent repository which will also delete the forked repository. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository)."
+For example, consider a member, or outside collaborator, of an organization that has allowed billing for codespaces for that user. If the user has permission to fork an organization-owned private repository, they can subsequently create and use a codespace for the new repository at the organization's expense. This is because the organization is the owner of the parent repository. Note that the organization owner can remove the user's access to the private repository, the forked repository, and therefore also the codespace. The organization owner can also delete the parent repository which will also delete the forked repository. See "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-the-forking-policy-for-your-repository)."
 
 {% data reusables.codespaces.prebuilds-billing-for-forks %}
 
 ## How billing is handled when a repository is transferred to another organization
 
-Usage is calculated every hour. An organization pays for usage of codespaces created from any repository owned by the organization, where the organization settings permit the organization to be billed. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)." When a repository is transferred out of your organization, ownership and billing responsibility for any codespaces associated with that repository will change accordingly.
+Usage is calculated every hour. An organization pays for usage of codespaces created from any repository owned by the organization, where the organization settings permit the organization to be billed. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)." When a repository is transferred out of your organization, ownership and billing responsibility for any codespaces associated with that repository will change accordingly.
 
 ## How billing is handled for {% data variables.product.prodname_github_codespaces %} templates
 
-You can get started on a new project by creating a codespace from a template. Codespaces created from templates aren't initially associated with a repository, but you can publish the codespace to a repository owned by your personal account. For more information, see "[AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-from-a-template)."
+You can get started on a new project by creating a codespace from a template. Codespaces created from templates aren't initially associated with a repository, but you can publish the codespace to a repository owned by your personal account. See "[AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-from-a-template)."
 
 Any organization can maintain a template repository for use with {% data variables.product.prodname_github_codespaces %}. As with any other repository in an organization, a codespace created from a template repository is billed to the organization if the organization has set a spending limit for {% data variables.product.prodname_github_codespaces %} and allowed the user creating the codespace to do so at the organization's expense. Otherwise, the codespace is billed to the user who creates the codespace.
 
@@ -258,7 +259,7 @@ If a user publishes a codespace created from a template, the codespace is publis
 * A {% data variables.enterprise.prodname_managed_user %} can only create a codespace from a template if the codespace is billed to an organization.
 * A {% data variables.enterprise.prodname_managed_user %} cannot publish a codespace created from a template to a new repository.
 
-For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users)."
+See "[AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users)."
 
 {% endnote %}
 
diff --git a/content/billing/managing-billing-for-github-codespaces/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md
similarity index 87%
rename from content/billing/managing-billing-for-github-codespaces/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md
index 58807b8abb..238c8cc4bd 100644
--- a/content/billing/managing-billing-for-github-codespaces/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/index.md
@@ -5,6 +5,8 @@ intro: 'You can view your usage and set a spending limit for {% data variables.p
 versions:
   fpt: '*'
   ghec: '*'
+redirect_from:
+  - /billing/managing-billing-for-github-codespaces
 children:
   - /about-billing-for-github-codespaces
   - /viewing-your-github-codespaces-usage
diff --git a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
similarity index 92%
rename from content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
index 75caa3976d..d591105a09 100644
--- a/content/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces.md
@@ -15,7 +15,7 @@ topics:
   - Billing
 redirect_from:
   - /billing/managing-billing-for-github-codespaces/managing-spending-limits-for-codespaces
-  - /billing/managing-billing-for-github-codespaces/managing-spending-limits-for-github-codespaces
+  - /billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces
 ---
 
 {% ifversion enhanced-billing-platform %}
@@ -26,7 +26,7 @@ redirect_from:
 
 ## About the {% data variables.product.prodname_github_codespaces %} spending limit
 
-{% data reusables.codespaces.codespaces-free-for-personal-intro %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+{% data reusables.codespaces.codespaces-free-for-personal-intro %} See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 {% data reusables.codespaces.codespaces-spending-limit-requirement %}
 {% data reusables.codespaces.codespaces-monthly-billing %}
@@ -35,7 +35,7 @@ Once you've reached your spending limit, you will no longer be able to create ne
 
 ## Using your Azure Subscription
 
-If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
+If you are an organization owner{% ifversion ghec %} or enterprise owner{% endif%}, you can connect an Azure Subscription ID to your organization {% ifversion ghec %}or enterprise{% endif%} account to enable and pay for {% data variables.product.prodname_github_codespaces %} usage. See "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 
 ## Managing the {% data variables.product.prodname_github_codespaces %} spending limit for your personal account
 
diff --git a/content/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md
similarity index 81%
rename from content/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md
index 8b845dfa87..2b12016b84 100644
--- a/content/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage.md
@@ -11,6 +11,7 @@ topics:
   - Billing
 redirect_from:
   - /billing/managing-billing-for-github-codespaces/viewing-your-codespaces-usage
+  - /billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage
 ---
 
 {% ifversion enhanced-billing-platform %}
@@ -29,7 +30,7 @@ You can see how much of the usage included in your personal account you have use
 
    ![Screenshot of the "{% data variables.product.prodname_codespaces %}" section of the billing page showing figures for "Usage hours" and "Storage."](/assets/images/help/codespaces/view-personal-usage-collapsed.png)
 
-   For information about "core hours" and "GB-months," see "[AUTOTITLE](/free-pro-team@latest/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+   For information about "core hours" and "GB-months," see "[AUTOTITLE](/free-pro-team@latest/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 1. Optionally, click **Usage hours** and **Storage** to see more details.
 
@@ -37,7 +38,7 @@ You can see how much of the usage included in your personal account you have use
 
    The **Included** column shows how many of the core hours of compute usage, or GB-months of storage, included free with your account, you have used so far this month. The **Paid** column shows how many billed core hours of usage, or GB-months of storage, you have used. The figures are updated once every hour.
 
-   In the screenshot above, the entire quota of included storage for the month has been used. When you've used all of either the included compute usage or storage (whichever is reached first), you must set up a payment method and a spending limit to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)" and "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-personal-account)."
+   In the screenshot above, the entire quota of included storage for the month has been used. When you've used all of either the included compute usage or storage (whichever is reached first), you must set up a payment method and a spending limit to continue using {% data variables.product.prodname_github_codespaces %} during the current billing month. See "[AUTOTITLE](/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-personal-account)."
 
    {% data reusables.codespaces.tips-included-usage %}
 
@@ -58,9 +59,9 @@ Organization owners and billing managers can view {% data variables.product.prod
 
    {% endnote %}
 
-   You can also see and update your current spending limit. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
+   You can also see and update your current spending limit. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
 
-   The **Projected usage** figure gives an estimate of the total usage for the current billing month, assuming the compute and storage usage for the past seven days continues unchanged for the remainder of the billing month. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#viewing-projected-usage-for-an-organization)."
+   The **Projected usage** figure gives an estimate of the total usage for the current billing month, assuming the compute and storage usage for the past seven days continues unchanged for the remainder of the billing month. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#viewing-projected-usage-for-an-organization)."
 
 {% data reusables.codespaces.usage-report-download %}
 
diff --git a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
similarity index 95%
rename from content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
index ec89440404..e1b8ab684e 100644
--- a/content/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/about-billing-for-github-copilot.md
@@ -6,6 +6,8 @@ versions:
   feature: copilot
 topics:
   - Copilot
+redirect_from:
+  - /billing/managing-billing-for-github-copilot/about-billing-for-github-copilot
 ---
 
 ## {% data variables.product.prodname_copilot %} in your enterprise
diff --git a/content/billing/managing-billing-for-github-copilot/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md
similarity index 91%
rename from content/billing/managing-billing-for-github-copilot/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md
index cec5fef63f..e6bf5965cb 100644
--- a/content/billing/managing-billing-for-github-copilot/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-copilot/index.md
@@ -4,6 +4,8 @@ shortTitle: GitHub Copilot
 intro: '{% ifversion fpt %}You can set up a {% data variables.product.prodname_copilot %} subscription through your personal or organization account. You can modify or cancel your subscription at any time.{% endif %}{% ifversion ghec %}You can view your usage of {% data variables.product.prodname_copilot_for_business %}, and learn about how the costs are calculated.{% endif %}'
 versions:
   feature: copilot
+redirect_from:
+  - /billing/managing-billing-for-github-copilot
 children:
   - /about-billing-for-github-copilot
 ---
diff --git a/content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md
similarity index 97%
rename from content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md
index 98db1ef92d..94fbc9f31f 100644
--- a/content/billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-marketplace
   - /articles/about-billing-for-github-marketplace
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace
+  - /billing/managing-billing-for-github-marketplace-apps/about-billing-for-github-marketplace
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
similarity index 97%
rename from content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
index 748d7c55ac..3a9ccace65 100644
--- a/content/billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/canceling-an-app-for-your-organization
   - /articles/canceling-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app
+  - /billing/managing-billing-for-github-marketplace-apps/canceling-a-github-marketplace-app
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
similarity index 96%
rename from content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
index 1b31b39a10..752a0ef3ea 100644
--- a/content/billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/downgrading-an-app-for-your-organization
   - /articles/downgrading-the-billing-plan-for-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app
+  - /billing/managing-billing-for-github-marketplace-apps/downgrading-the-billing-plan-for-a-github-marketplace-app
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-marketplace-apps/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/index.md
similarity index 92%
rename from content/billing/managing-billing-for-github-marketplace-apps/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/index.md
index 3b0caf19f6..f0a575228b 100644
--- a/content/billing/managing-billing-for-github-marketplace-apps/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/index.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/managing-your-personal-account-s-apps
   - /articles/managing-your-organization-s-apps
   - /articles/managing-billing-for-github-marketplace-apps
+  - /billing/managing-billing-for-github-marketplace-apps
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
similarity index 95%
rename from content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
index d761bee575..2ff4cc159d 100644
--- a/content/billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app.md
@@ -7,6 +7,7 @@ redirect_from:
   - /articles/upgrading-an-app-for-your-organization
   - /articles/upgrading-the-billing-plan-for-a-github-marketplace-app
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app
+  - /billing/managing-billing-for-github-marketplace-apps/upgrading-the-billing-plan-for-a-github-marketplace-app
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md
similarity index 99%
rename from content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md
index 8d0958503c..a8aab444fe 100644
--- a/content/billing/managing-billing-for-github-packages/about-billing-for-github-packages.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/about-billing-for-github-packages.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.packages %}'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/about-billing-for-github-packages
+  - /billing/managing-billing-for-github-packages/about-billing-for-github-packages
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-packages/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md
similarity index 92%
rename from content/billing/managing-billing-for-github-packages/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md
index e092c7e857..a3098f8378 100644
--- a/content/billing/managing-billing-for-github-packages/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/index.md
@@ -4,6 +4,7 @@ shortTitle: GitHub Packages
 intro: 'You can view your {% data variables.product.prodname_registry %} usage and set a spending limit for {% data variables.product.prodname_registry %}.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages
+  - /billing/managing-billing-for-github-packages
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
similarity index 97%
rename from content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
index a3fa486c68..c400fe3c58 100644
--- a/content/billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.packages %}'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-spending-limit-for-github-packages
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages
+  - /billing/managing-billing-for-github-packages/managing-your-spending-limit-for-github-packages
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-packages/viewing-your-github-packages-usage.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md
similarity index 97%
rename from content/billing/managing-billing-for-github-packages/viewing-your-github-packages-usage.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md
index b37bf0a651..7e48cabd92 100644
--- a/content/billing/managing-billing-for-github-packages/viewing-your-github-packages-usage.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-packages/viewing-your-github-packages-usage.md
@@ -5,6 +5,7 @@ product: '{% data reusables.gated-features.packages %}'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/viewing-your-github-packages-usage
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-packages/viewing-your-github-packages-usage
+  - /billing/managing-billing-for-github-packages/viewing-your-github-packages-usage
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md
similarity index 91%
rename from content/billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md
index 616f6d34d7..343a8d5c2f 100644
--- a/content/billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/about-billing-for-github-sponsors.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-sponsors
   - /articles/about-billing-for-github-sponsors
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/about-billing-for-github-sponsors
+  - /billing/managing-billing-for-github-sponsors/about-billing-for-github-sponsors
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md
similarity index 96%
rename from content/billing/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md
index 847c15483c..7b61840854 100644
--- a/content/billing/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/downgrading-a-sponsorship.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/downgrading-a-sponsorship
   - /articles/downgrading-a-sponsorship
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/downgrading-a-sponsorship
+  - /billing/managing-billing-for-github-sponsors/downgrading-a-sponsorship
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-sponsors/index.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/index.md
similarity index 91%
rename from content/billing/managing-billing-for-github-sponsors/index.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/index.md
index fdec3e3b6e..03173cd80b 100644
--- a/content/billing/managing-billing-for-github-sponsors/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/index.md
@@ -5,6 +5,7 @@ intro: You can upgrade or downgrade the tier for each of your sponsorships.
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors
   - /articles/managing-billing-for-github-sponsors
+  - /billing/managing-billing-for-github-sponsors
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship.md
similarity index 92%
rename from content/billing/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship.md
index d5d24e596f..dc956da0b2 100644
--- a/content/billing/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship.md
@@ -4,6 +4,8 @@ intro: You can set an end date to an existing or new sponsorship.
 versions:
   fpt: '*'
   ghec: '*'
+redirect_from:
+  - /billing/managing-billing-for-github-sponsors/setting-an-end-date-to-a-sponsorship
 type: how_to
 topics:
   - Sponsors
diff --git a/content/billing/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md
similarity index 92%
rename from content/billing/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md
rename to content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md
index 71d235c35c..9c2ba14598 100644
--- a/content/billing/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md
+++ b/content/billing/managing-billing-for-your-products/managing-billing-for-github-sponsors/upgrading-a-sponsorship.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/upgrading-a-sponsorship
   - /articles/upgrading-a-sponsorship
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-billing-for-github-sponsors/upgrading-a-sponsorship
+  - /billing/managing-billing-for-github-sponsors/upgrading-a-sponsorship
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md b/content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
similarity index 95%
rename from content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
rename to content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
index 0bd2890500..fde906e4ad 100644
--- a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
+++ b/content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise.md
@@ -10,6 +10,7 @@ redirect_from:
   - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
   - /github/setting-up-and-managing-your-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
   - /billing/managing-your-license-for-github-enterprise/managing-licenses-for-visual-studio-subscription-with-github-enterprise
+  - /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise
 versions:
   ghec: '*'
 type: overview
@@ -25,7 +26,7 @@ shortTitle: About
 
 To use the {% data variables.product.prodname_enterprise %} portion of the license, each subscriber's personal account on {% data variables.product.prodname_dotcom_the_website %} must be or become a member of an organization owned by your enterprise on {% data variables.product.prodname_dotcom_the_website %}. To accomplish this, organization owners can invite new members to an organization by email address. The subscriber can accept the invitation with an existing personal account on {% data variables.product.prodname_dotcom_the_website %} or create a new account.
 
-For more information about the setup of {% data variables.visual_studio.prodname_vss_ghe %}, see "[AUTOTITLE](/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise)."
+For more information about the setup of {% data variables.visual_studio.prodname_vss_ghe %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise)."
 
 ## About licenses for {% data variables.visual_studio.prodname_vss_ghec %}
 
diff --git a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md b/content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md
similarity index 78%
rename from content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md
rename to content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md
index aa388b4c2b..93c0b84163 100644
--- a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md
+++ b/content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/index.md
@@ -4,6 +4,8 @@ shortTitle: Visual Studio & GitHub Enterprise
 intro: '{% data reusables.enterprise-accounts.vss-ghe-description %}'
 versions:
   ghec: '*'
+redirect_from:
+  - /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise
 children:
   - /about-visual-studio-subscriptions-with-github-enterprise
   - /setting-up-visual-studio-subscriptions-with-github-enterprise
diff --git a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md b/content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
similarity index 95%
rename from content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
rename to content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
index 3d15e5b184..7b1865a477 100644
--- a/content/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
+++ b/content/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise.md
@@ -3,6 +3,8 @@ title: Setting up Visual Studio subscriptions with GitHub Enterprise
 intro: 'Your team''s subscription to {% data variables.product.prodname_vs %} can also provide access to {% data variables.product.prodname_enterprise %}.'
 versions:
   ghec: '*'
+redirect_from:
+  - /billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/setting-up-visual-studio-subscriptions-with-github-enterprise
 type: how_to
 topics:
   - Enterprise
@@ -12,7 +14,7 @@ shortTitle: Set up
 
 ## About setup of {% data variables.visual_studio.prodname_vss_ghe %}
 
-{% data reusables.enterprise-accounts.vss-ghe-description %} For more information, see "[AUTOTITLE](/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)."
+{% data reusables.enterprise-accounts.vss-ghe-description %} See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)."
 
 This guide shows you how your team can get {% data variables.product.prodname_vs %} subscribers licensed and started with {% data variables.product.prodname_enterprise %}.
 
diff --git a/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md b/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
index 2819003eb2..9ddad87202 100644
--- a/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
+++ b/content/billing/managing-the-plan-for-your-github-account/about-per-user-pricing.md
@@ -41,7 +41,7 @@ In addition to licensed seats, your bill may include other charges, such as {% d
 
 ## Two billing models for {% data variables.product.prodname_enterprise %} licenses
 
-If you created a trial of {% data variables.product.prodname_ghe_cloud %} on or after August 1, 2024, you use usage-based billing to pay for your licenses. With usage-based billing, you pay for the number of licenses you use each month. You do not need to buy a predefined number of licenses in advance. See, "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses)."
+If you created a trial of {% data variables.product.prodname_ghe_cloud %} on or after August 1, 2024, you use usage-based billing to pay for your licenses. With usage-based billing, you pay for the number of licenses you use each month. You do not need to buy a predefined number of licenses in advance. See, "[AUTOTITLE](/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses)."
 
 If you currently pay for your {% data variables.product.prodname_enterprise %} licenses by invoice with a volume, subscription, or prepaid agreement, you will continue to be billed in this way until your agreement expires. At renewal, you have the option to switch to the metered billing model.
 
diff --git a/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
index c8d7160554..cd676c5f58 100644
--- a/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
+++ b/content/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription.md
@@ -40,7 +40,7 @@ If you use {% data variables.product.product_name %} through a Microsoft Enterpr
 
 | Billed feature or situation                                                                     | Information about billing                                                                                                                                            |                                                                                    Information about spending limits |
 | :---------------------------------------------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------: |
-| {% data variables.product.prodname_github_codespaces %} usage                                   | "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)"                                                                   |                   "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)" |
+| {% data variables.product.prodname_github_codespaces %} usage                                   | "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)"                                                                   |                   "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)" |
 | {% data variables.product.prodname_actions %} usage beyond the amounts included with your plan  | "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)"                                                                         |   "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions#about-spending-limits)" |
 | {% data variables.product.prodname_registry %} usage beyond the amounts included with your plan | "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages)"                                                                       | "[AUTOTITLE](/billing/managing-billing-for-github-packages/about-billing-for-github-packages#about-spending-limits)" |
 | {% data variables.product.prodname_copilot_business_short %} usage                              | "[AUTOTITLE](/billing/managing-billing-for-github-copilot/about-billing-for-github-copilot#about-billing-for-github-copilot-business-and-github-copilot-enterprise)" |                                                                                                                  N/A |
@@ -62,21 +62,21 @@ For example, you link your Azure subscription to your organization {% ifversion
 
 * You must have {% ifversion ghec %}either {% endif %}an organization {% ifversion ghec %}or an enterprise {% endif %}account on {% data variables.location.product_location %}. For more information about the differences between these two types of accounts, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-  If the organization you want to connect an Azure subscription to belongs to an enterprise account, you must connect your Azure subscription to the enterprise account, not the organization. {% ifversion fpt %}For more information, see [the {% data variables.product.prodname_ghe_cloud %} version](/enterprise-cloud@latest/{{ currentArticle }}) of this article.{% endif %}
+  If the organization you want to connect an Azure subscription to belongs to an enterprise account, you must connect your Azure subscription to the enterprise account, not the organization. {% ifversion fpt %}See [the {% data variables.product.prodname_ghe_cloud %} version](/enterprise-cloud@latest/{{ currentArticle }}) of this article.{% endif %}
 
-* You must be an owner of the organization{% ifversion ghec %} or enterprise{% endif %} account. For more information, see {% ifversion fpt %}"[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."{% elsif ghec %}the following articles.
+* You must be an owner of the organization{% ifversion ghec %} or enterprise{% endif %} account. See {% ifversion fpt %}"[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)."{% elsif ghec %}the following articles.
 
   * "[AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization)"
   * "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise)"
     {% endif %}
 
-* You must be logged into Azure as a user who is able to provide tenant-wide admin consent, which is required to install {% data variables.product.company_short %}'s Subscription Permission Validation app on the Azure AD tenant. The app requires read access to display a list of available subscriptions, and is only used during this one-time process of connecting the Azure subscription. For more information, see [Grant tenant-wide admin consent to an application](https://learn.microsoft.com/azure/active-directory/manage-apps/grant-admin-consent) in Microsoft Docs.
+* You must be logged into Azure as a user who is able to provide tenant-wide admin consent, which is required to install {% data variables.product.company_short %}'s Subscription Permission Validation app on the Azure AD tenant. The app requires read access to display a list of available subscriptions, and is only used during this one-time process of connecting the Azure subscription. See [Grant tenant-wide admin consent to an application](https://learn.microsoft.com/azure/active-directory/manage-apps/grant-admin-consent) in Microsoft Docs.
 
-  * Alternatively, before following the instructions in this article, users who are not able to provide tenant-wide admin consent can work with an Azure AD global administrator to configure an admin consent workflow. For more information, see [User and admin consent in Azure Active Directory](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/user-admin-consent-overview#admin-consent-workflow) in Microsoft Docs.
+  * Alternatively, before following the instructions in this article, users who are not able to provide tenant-wide admin consent can work with an Azure AD global administrator to configure an admin consent workflow. See [User and admin consent in Azure Active Directory](https://learn.microsoft.com/en-us/azure/active-directory/manage-apps/user-admin-consent-overview#admin-consent-workflow) in Microsoft Docs.
 
-* To select an Azure subscription from the list of available subscriptions, the user must be an owner of the Azure subscription. For more information, see [Assign a user as an administrator of an Azure subscription](https://learn.microsoft.com/azure/role-based-access-control/role-assignments-portal-subscription-admin) in Microsoft docs.
+* To select an Azure subscription from the list of available subscriptions, the user must be an owner of the Azure subscription. See [Assign a user as an administrator of an Azure subscription](https://learn.microsoft.com/azure/role-based-access-control/role-assignments-portal-subscription-admin) in Microsoft docs.
 
-* You must know your Azure subscription ID. For more information, see [Get subscription and tenant IDs in the Azure portal](https://learn.microsoft.com/en-us/azure/azure-portal/get-subscription-tenant-id) in the Microsoft Docs or [contact Azure support](https://azure.microsoft.com/support/).
+* You must know your Azure subscription ID. See [Get subscription and tenant IDs in the Azure portal](https://learn.microsoft.com/en-us/azure/azure-portal/get-subscription-tenant-id) in the Microsoft Docs or [contact Azure support](https://azure.microsoft.com/support/).
 
 {% ifversion fpt %}
 
@@ -86,7 +86,7 @@ To connect your Azure subscription, you must have owner permissions to the Azure
 
 {% note %}
 
-**Note**: If your organization account on {% data variables.location.product_location %} belongs an enterprise account, you must connect your Azure subscription to the enterprise account instead of the organization account. For more information, see "[Connecting your Azure subscription to your enterprise account](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} version of this article.
+**Note**: If your organization account on {% data variables.location.product_location %} belongs an enterprise account, you must connect your Azure subscription to the enterprise account instead of the organization account. See "[Connecting your Azure subscription to your enterprise account](/enterprise-cloud@latest/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription#connecting-your-azure-subscription-to-your-enterprise-account)" in the {% data variables.product.prodname_ghe_cloud %} version of this article.
 
 {% endnote %}
 
diff --git a/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md b/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
index 0e62a84125..11dcc77b67 100644
--- a/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
+++ b/content/billing/managing-the-plan-for-your-github-account/how-does-upgrading-or-downgrading-affect-the-billing-process.md
@@ -19,7 +19,7 @@ shortTitle: Billing process
 ---
 Changes to your paid personal account or organization subscription does not affect subscriptions or payments for other paid {% data variables.product.prodname_dotcom %} features, such as {% data variables.large_files.product_name_long %} or paid apps purchased in {% data variables.product.prodname_marketplace %}.
 
-For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github)."
+For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github)."
 
 ## Example of canceling a paid subscription for a personal account or organization
 
@@ -40,6 +40,6 @@ Stefan's organization pays for 50 seats every year on May 20th. If Stefan remove
 ## Further reading
 
 * "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account)"
-* "[AUTOTITLE](/billing/managing-billing-for-github-marketplace-apps)"
-* "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-marketplace-apps)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage)"
 * "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/about-per-user-pricing)"
diff --git a/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
index 30d11880eb..4477fec020 100644
--- a/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
+++ b/content/billing/managing-the-plan-for-your-github-account/upgrading-your-accounts-plan.md
@@ -108,7 +108,7 @@ If you'd like additional users to have access to your {% data variables.product.
 
 ## Adding seats to your enterprise account
 
-If you have access to the enhanced billing platform, you can add seats to your enterprise account through the "Licensing" page. See, "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account)."
+If you have access to the enhanced billing platform, you can add seats to your enterprise account through the "Licensing" page. See, "[AUTOTITLE](/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account)."
 
 {% data reusables.enterprise-accounts.billing-perms %}
 
diff --git a/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
index 112022d83b..4e359e2ae2 100644
--- a/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
+++ b/content/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise.md
@@ -24,7 +24,7 @@ For privacy reasons, enterprise owners cannot directly access the details of use
 
 {% note %}
 
-**Note:** For {% data variables.visual_studio.prodname_vs_subscriber %}s, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)."
+**Note:** For {% data variables.visual_studio.prodname_vs_subscriber %}s, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise)."
 
 {% endnote %}
 
diff --git a/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md b/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md
index 104ee3acec..97c12cfce0 100644
--- a/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md
+++ b/content/billing/managing-your-license-for-github-enterprise/viewing-license-usage-for-github-enterprise.md
@@ -30,7 +30,7 @@ For more information about viewing license usage on {% data variables.product.pr
 
 {% endif %}
 
-You can also use the REST API to return consumed licenses data and the status of the license sync job. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/rest/enterprise-admin/license)."
+You can also use the REST API to return consumed licenses data and the status of the license sync job. See "[AUTOTITLE](/enterprise-cloud@latest/rest/enterprise-admin/license)."
 
 To learn more about the license data associated with your enterprise account and how the number of consumed user {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} are calculated, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise)."
 
@@ -45,7 +45,7 @@ You can view the license usage for your enterprise and download a file with lice
 {% data reusables.enterprise-accounts.license-tab %}
 1. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.
 
-   * If you purchased {% data variables.product.prodname_GH_advanced_security %}, you can review your total {% ifversion ghas-billing-UI-update %}license{% else %}seat{% endif %} usage. To learn about the information displayed, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
+   * If you purchased {% data variables.product.prodname_GH_advanced_security %}, you can review your total {% ifversion ghas-billing-UI-update %}license{% else %}seat{% endif %} usage. To learn about the information displayed, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
 
 1. To download a CSV report of the license usage, click {% octicon "kebab-horizontal" aria-label="Licensing dropdown" %} to the right of the usage you want to download, then click {% octicon "download" aria-hidden="true" %} **CSV report**.
 
@@ -56,7 +56,7 @@ You can view the license usage for your enterprise and download a file with lice
 {% data reusables.enterprise-accounts.license-tab %}
 1. Review your current {% data variables.product.prodname_enterprise %} license, as well as consumed and available user licenses.{% ifversion ghes %}
     * To download the consumed license report as a JSON file, in the top right under "Quick links", choose **Export license usage**. For more information about reviewing the data in this report, see "[AUTOTITLE](/billing/managing-your-license-for-github-enterprise/troubleshooting-license-usage-for-github-enterprise)."
-    * If you have purchased {% data variables.product.prodname_GH_advanced_security %}, you can review your total {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} used as well as a per-organization breakdown of active committers. For more information, see "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise)."{% endif %}
+    * If you have purchased {% data variables.product.prodname_GH_advanced_security %}, you can review your total {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} used as well as a per-organization breakdown of active committers. See "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise)."{% endif %}
 
 {% endif %}
 {% ifversion ghec %}
diff --git a/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md b/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md
similarity index 79%
rename from content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
rename to content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md
index acf46b35f8..822478ed00 100644
--- a/content/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise.md
+++ b/content/billing/using-the-billing-platform/about-billing-for-your-enterprise.md
@@ -7,6 +7,7 @@ redirect_from:
   - /enterprise/admin/overview/managing-billing-for-github-enterprise
   - /admin/overview/managing-billing-for-github-enterprise
   - /billing/managing-billing-for-your-github-account/about-billing-for-your-enterprise
+  - /billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
 versions:
   ghec: '*'
   ghes: '*'
@@ -45,7 +46,7 @@ Each user on {% data variables.location.product_location %} consumes a seat on y
 Administrators for your enterprise account on {% data variables.product.prodname_dotcom_the_website %} can access and manage billing for the enterprise. For more information, see "[Roles in an enterprise]({% ifversion ghes %}/enterprise-cloud@latest{% endif %}/admin/user-management/managing-users-in-your-enterprise/roles-in-an-enterprise){% ifversion ghec %}."{% elsif ghes %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
 
 {% ifversion ghec %}
-{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} For more information, see "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
+{% data reusables.enterprise-accounts.billing-azure-subscription-enterprise-only %} See "[AUTOTITLE](/billing/managing-the-plan-for-your-github-account/connecting-an-azure-subscription)."
 {% endif %}
 
 {% ifversion ghes %}
@@ -54,6 +55,22 @@ Administrators for your enterprise account on {% data variables.product.prodname
 
 {% endif %}
 
+{% ifversion enhanced-billing-platform %}
+
+## How do I know which billing platform I'm using?
+
+You have access to the new billing platform if you have an enterprise account, or if you are part of an organization owned by an enterprise account, created after June 2, 2024. Enterprises that participated in the beta program also have access to the new billing platform. See "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises)."
+
+{% data reusables.billing.new-billing-platform-permissions %}
+
+To check if you have access:
+
+{% data reusables.enterprise-accounts.access-enterprise %}
+
+If you have access, there will be a {% octicon "credit-card" aria-hidden="true" %} **Billing & Licensing** option in the enterprise account sidebar.
+
+{% endif %}
+
 ## Further reading
 
 * "[AUTOTITLE](/admin/overview/about-enterprise-accounts)"
diff --git a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md b/content/billing/using-the-billing-platform/about-billing-on-github.md
similarity index 95%
rename from content/billing/managing-your-github-billing-settings/about-billing-on-github.md
rename to content/billing/using-the-billing-platform/about-billing-on-github.md
index 41d7bdb276..ee2c31ecbe 100644
--- a/content/billing/managing-your-github-billing-settings/about-billing-on-github.md
+++ b/content/billing/using-the-billing-platform/about-billing-on-github.md
@@ -5,6 +5,7 @@ redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/about-billing-on-github
   - /articles/about-billing-on-github
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/about-billing-on-github
+  - /billing/managing-your-github-billing-settings/about-billing-on-github
 versions:
   fpt: '*'
   ghec: '*'
@@ -21,7 +22,7 @@ topics:
 
 {% data variables.product.company_short %} bills separately for each account. This means that you will receive a separate bill for your personal account and for each organization or enterprise account you own. For more information about account types, see "[AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts)."
 
-You can switch between the billing settings for each of your accounts by using the context switcher. For more information, see "[Switching between settings for your different accounts](#switching-between-settings-for-your-different-accounts)."
+You can switch between the billing settings for each of your accounts by using the context switcher. See "[Switching between settings for your different accounts](#switching-between-settings-for-your-different-accounts)."
 
 The bill for each account is a combination of subscriptions and usage-based billing. Subscriptions include your account's plan, such as {% data variables.product.prodname_pro %} or {% data variables.product.prodname_team %}, as well as paid products that have a consistent monthly cost, such as {% data variables.product.prodname_copilot %} and apps from {% data variables.product.prodname_marketplace %}.
 
@@ -127,7 +128,7 @@ Payments can be made via credit card, PayPal, or Azure subscription. When you up
 
 {% endif %}
 
-For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings)."
+See "[AUTOTITLE](/billing/managing-your-github-billing-settings)."
 
 ## Switching between settings for your different accounts
 
diff --git a/content/billing/managing-your-github-billing-settings/adding-a-sales-tax-certificate.md b/content/billing/using-the-billing-platform/adding-a-sales-tax-certificate.md
similarity index 97%
rename from content/billing/managing-your-github-billing-settings/adding-a-sales-tax-certificate.md
rename to content/billing/using-the-billing-platform/adding-a-sales-tax-certificate.md
index 6d90fdb97c..6625b6910c 100644
--- a/content/billing/managing-your-github-billing-settings/adding-a-sales-tax-certificate.md
+++ b/content/billing/using-the-billing-platform/adding-a-sales-tax-certificate.md
@@ -1,6 +1,8 @@
 ---
 title: Adding a sales tax certificate
 intro: If you're a customer in the United States with a {% data variables.product.company_short %} Customer Agreement and you're exempt from sales tax, you can upload a certificate to ensure the correct sales tax amount is calculated.
+redirect_from:
+  - /billing/managing-your-github-billing-settings/adding-a-sales-tax-certificate
 versions:
   feature: us-sales-tax
 type: how_to
diff --git a/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md b/content/billing/using-the-billing-platform/adding-information-to-your-receipts.md
similarity index 97%
rename from content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md
rename to content/billing/using-the-billing-platform/adding-information-to-your-receipts.md
index 3bad103feb..e9275edbcf 100644
--- a/content/billing/managing-your-github-billing-settings/adding-information-to-your-receipts.md
+++ b/content/billing/using-the-billing-platform/adding-information-to-your-receipts.md
@@ -13,6 +13,7 @@ redirect_from:
   - /articles/adding-information-to-your-organization-s-receipts
   - /articles/adding-information-to-your-receipts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/adding-information-to-your-receipts
+  - /billing/managing-your-github-billing-settings/adding-information-to-your-receipts
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md b/content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md
similarity index 98%
rename from content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md
rename to content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md
index 94d29b2cb7..4626e42c95 100644
--- a/content/billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method.md
+++ b/content/billing/using-the-billing-platform/adding-or-editing-a-payment-method.md
@@ -17,6 +17,7 @@ redirect_from:
   - /articles/switching-payment-methods-for-your-organization
   - /articles/adding-or-editing-a-payment-method
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/adding-or-editing-a-payment-method
+  - /billing/managing-your-github-billing-settings/adding-or-editing-a-payment-method
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md b/content/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle.md
similarity index 97%
rename from content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md
rename to content/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle.md
index 8347c001c2..32249e4607 100644
--- a/content/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle.md
+++ b/content/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle.md
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/switching-between-monthly-and-yearly-billing-for-your-organization
   - /articles/changing-the-duration-of-your-billing-cycle
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle
+  - /billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/index.md b/content/billing/using-the-billing-platform/index.md
similarity index 94%
rename from content/billing/managing-your-github-billing-settings/index.md
rename to content/billing/using-the-billing-platform/index.md
index f36a133b4e..7732c9e583 100644
--- a/content/billing/managing-your-github-billing-settings/index.md
+++ b/content/billing/using-the-billing-platform/index.md
@@ -1,6 +1,6 @@
 ---
-title: Managing your GitHub billing settings
-shortTitle: Billing settings
+title: Using the billing platform
+shortTitle: Billing platform
 intro: 'Your account''s billing settings apply to every paid feature or product you add to the account. You can manage settings like your payment method, billing cycle, and billing email. You can also view billing information such as your subscription, billing date, payment history, and past receipts.'
 redirect_from:
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings
@@ -11,6 +11,7 @@ redirect_from:
   - /categories/paying-for-organization-accounts/articles
   - /categories/99/articles
   - /articles/managing-your-github-billing-settings
+  - /billing/managing-your-github-billing-settings
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md b/content/billing/using-the-billing-platform/redeeming-a-coupon.md
similarity index 97%
rename from content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md
rename to content/billing/using-the-billing-platform/redeeming-a-coupon.md
index 0b54826872..92ccf3aaef 100644
--- a/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md
+++ b/content/billing/using-the-billing-platform/redeeming-a-coupon.md
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/redeeming-a-coupon-for-organizations
   - /articles/redeeming-a-coupon
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/redeeming-a-coupon
+  - /billing/managing-your-github-billing-settings/redeeming-a-coupon
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/setting-your-billing-email.md b/content/billing/using-the-billing-platform/setting-your-billing-email.md
similarity index 98%
rename from content/billing/managing-your-github-billing-settings/setting-your-billing-email.md
rename to content/billing/using-the-billing-platform/setting-your-billing-email.md
index 0b93bbafb5..330d2bf3f8 100644
--- a/content/billing/managing-your-github-billing-settings/setting-your-billing-email.md
+++ b/content/billing/using-the-billing-platform/setting-your-billing-email.md
@@ -9,6 +9,7 @@ redirect_from:
   - /articles/setting-your-organization-s-billing-email
   - /articles/setting-your-billing-email
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/setting-your-billing-email
+  - /billing/managing-your-github-billing-settings/setting-your-billing-email
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md b/content/billing/using-the-billing-platform/troubleshooting-a-declined-credit-card-charge.md
similarity index 96%
rename from content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md
rename to content/billing/using-the-billing-platform/troubleshooting-a-declined-credit-card-charge.md
index 86eb57610c..35d5c9db27 100644
--- a/content/billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge.md
+++ b/content/billing/using-the-billing-platform/troubleshooting-a-declined-credit-card-charge.md
@@ -6,6 +6,7 @@ redirect_from:
   - /articles/what-do-i-do-if-my-card-is-declined
   - /articles/troubleshooting-a-declined-credit-card-charge
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge
+  - /billing/managing-your-github-billing-settings/troubleshooting-a-declined-credit-card-charge
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md b/content/billing/using-the-billing-platform/unlocking-a-locked-account.md
similarity index 96%
rename from content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
rename to content/billing/using-the-billing-platform/unlocking-a-locked-account.md
index dfe95086a4..c9a2dc60a5 100644
--- a/content/billing/managing-your-github-billing-settings/unlocking-a-locked-account.md
+++ b/content/billing/using-the-billing-platform/unlocking-a-locked-account.md
@@ -11,6 +11,7 @@ redirect_from:
   - /articles/unlocking-a-locked-organization-account
   - /articles/unlocking-a-locked-account
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/unlocking-a-locked-account
+  - /billing/managing-your-github-billing-settings/unlocking-a-locked-account
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md b/content/billing/using-the-billing-platform/viewing-your-payment-history-and-receipts.md
similarity index 95%
rename from content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md
rename to content/billing/using-the-billing-platform/viewing-your-payment-history-and-receipts.md
index caa735ee7c..3215ef5051 100644
--- a/content/billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts.md
+++ b/content/billing/using-the-billing-platform/viewing-your-payment-history-and-receipts.md
@@ -8,6 +8,7 @@ redirect_from:
   - /articles/downloading-receipts-for-organizations
   - /articles/viewing-your-payment-history-and-receipts
   - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts
+  - /billing/managing-your-github-billing-settings/viewing-your-payment-history-and-receipts
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md b/content/billing/using-the-billing-platform/viewing-your-subscriptions-and-billing-date.md
similarity index 95%
rename from content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
rename to content/billing/using-the-billing-platform/viewing-your-subscriptions-and-billing-date.md
index 9bf04b251f..ca5e536fc4 100644
--- a/content/billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date.md
+++ b/content/billing/using-the-billing-platform/viewing-your-subscriptions-and-billing-date.md
@@ -9,6 +9,7 @@ redirect_from:
   - /articles/finding-your-organization-s-next-billing-date
   - /articles/viewing-your-plans-and-billing-date
   - /articles/viewing-your-subscriptions-and-billing-date
+  - /billing/managing-your-github-billing-settings/viewing-your-subscriptions-and-billing-date
 versions:
   fpt: '*'
   ghec: '*'
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md
deleted file mode 100644
index 3f55acf39c..0000000000
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle.md
+++ /dev/null
@@ -1,16 +0,0 @@
----
-title: About the billing cycle
-intro: Learn about the billing cycle for the enhanced billing platform.
-versions:
-  feature: enhanced-billing-platform
-type: overview
-topics:
-  - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
----
-
->[!IMPORTANT] If you are on not on the new billing platform, this article does not apply to you. To check if you are on the new billing platform, see "[How do I know if I can access the enhanced billing platform?](/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform)." For more information about the billing cycle for your enterprise account, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/changing-the-duration-of-your-billing-cycle#changing-the-duration-of-your-enterprise-accounts-billing-cycle)."
-
-If your enterprise is on the enhanced billing platform, you have a fixed billing period for metered usage which runs from the first day of the month to the last day of the month. When the month ends, the usage is scheduled to be billed on your bill cycle day. Your bill cycle day is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted on the fifteenth of the month, you will be billed on the fifteenth of each subsequent month.
-
-This applies to all products available through the enhanced billing platform.
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md b/content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md
deleted file mode 100644
index 416fbdef53..0000000000
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/index.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: Using the enhanced billing platform for enterprises
-shortTitle: Enhanced billing platform
-intro: 'The enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls.'
-redirect_from:
-  - /early-access/billing/billing-private-beta
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
-versions:
-  feature: enhanced-billing-platform
-children:
-  - /about-the-enhanced-billing-platform-for-enterprises
-  - /getting-started-with-the-enhanced-billing-platform
-  - /about-the-billing-cycle
-  - /about-usage-based-billing-for-licenses
-  - /adding-seats-to-your-enterprise-account
-  - /roles-for-the-enhanced-billing-platform
-  - /estimating-spending-for-your-enterprise
-  - /gathering-insights-on-your-spending
-  - /charging-business-units
-  - /preventing-overspending
-  - /managing-your-payment-and-billing-information
-  - /about-enhanced-billing-for-git-large-file-storage
----
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md b/content/billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage.md
similarity index 87%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md
rename to content/billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage.md
index f11c5ea08b..39e9f8f0d0 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage.md
+++ b/content/billing/using-the-new-billing-platform/about-billing-for-git-large-file-storage.md
@@ -1,15 +1,17 @@
 ---
-title: About enhanced billing for Git Large File Storage
+title: About billing for Git Large File Storage
 intro: 'Learn about billing for {% data variables.large_files.product_name_long %}.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/about-enhanced-billing-for-git-large-file-storage
 type: overview
 topics:
   - Billing
   - LFS
   - Enterprise
 shortTitle: About Git LFS billing
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
 ---
 
 ## About billing for {% data variables.large_files.product_name_long %}
@@ -55,7 +57,7 @@ In this example, {% data variables.product.company_short %} would bill for 1.5 G
 
 ## Managing your budget for {% data variables.large_files.product_name_long %}
 
-The default budget for paid usage is $0 for accounts that do not have a payment method on file. For accounts that do have a payment method on file, the default budget is unlimited. You can take steps to manage your {% data variables.large_files.product_name_short %} budget. For more information, see "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending)."
+The default budget for paid usage is $0 for accounts that do not have a payment method on file. For accounts that do have a payment method on file, the default budget is unlimited. You can take steps to manage your {% data variables.large_files.product_name_short %} budget. See "[AUTOTITLE](/billing/using-the-new-billing-platform/preventing-overspending)."
 
 ## Further reading
 
diff --git a/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md b/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md
new file mode 100644
index 0000000000..87e0c4fedb
--- /dev/null
+++ b/content/billing/using-the-new-billing-platform/about-the-billing-cycle.md
@@ -0,0 +1,18 @@
+---
+title: About the billing cycle
+intro: Learn about the billing cycle for the enhanced billing platform.
+versions:
+  feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/about-the-billing-cycle
+type: overview
+topics:
+  - Enterprise
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
+---
+
+>[!IMPORTANT] If you are on not on the new billing platform, this article does not apply to you. To check if you are on the new billing platform, see "[How do I know if I can access the enhanced billing platform?](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform)." For more information about the billing cycle for your enterprise account, see "[AUTOTITLE](/billing/using-the-billing-platform/changing-the-duration-of-your-billing-cycle#changing-the-duration-of-your-enterprise-accounts-billing-cycle)."
+
+If your enterprise is on the new billing platform, you have a fixed billing period for metered usage which runs from the first day of the month to the last day of the month. When the month ends, the usage is scheduled to be billed on your bill cycle day. Your bill cycle day is dictated by the moment you converted from a trial to a paid enterprise account. For example, if you converted on the fifteenth of the month, you will be billed on the fifteenth of each subsequent month.
+
+This applies to all products available through the new billing platform.
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises.md
similarity index 52%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md
rename to content/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises.md
index 2b9ac67c62..88c888bec8 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises.md
+++ b/content/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises.md
@@ -1,20 +1,22 @@
 ---
-title: About the enhanced billing platform for enterprises
-intro: This article explores the billing platform's key functionalities, and how it can help you manage your spending more effectively.
+title: About the new billing platform for enterprises
+intro: Learn about the billing platform's key functionalities, and how it can help you manage your spending more effectively.
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises
 type: overview
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
-shortTitle: About the enhanced billing platform
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
+shortTitle: About the new billing platform
 ---
 
-The enhanced billing platform provides better spending control and detailed usage insights with granular controls.
+The new billing platform provides better spending control and detailed usage insights with granular controls.
 
 ## Available products
 
-The following products are available in the enhanced billing platform:
+The following products are available in the new billing platform:
 
 * {% data variables.product.prodname_actions %}
 * {% data variables.product.prodname_GH_advanced_security %} (only available with a trial of {% data variables.product.prodname_ghe_cloud %})
@@ -32,7 +34,7 @@ The following products are available in the enhanced billing platform:
 
 ## Key functionalities
 
-With the enhanced billing platform, you can:
+With the new billing platform, you can:
 
 * **Estimate spending:** Understand where your (annual, monthly, etc.) spending is trending based on the usage across costs centers and budgets.
 * **Gather insights and data:** Generate usage reports to share with your team or stakeholders, and know if you're on track with your budget.
@@ -40,9 +42,11 @@ With the enhanced billing platform, you can:
 * **Prevent overspending:** Use budgets and alerts to track and control your spending.
 * **Observe and understand spending:** Understand how your spending changes over time and across which products.
 
-## How do I know if I can access the enhanced billing platform?
+## How do I know if I can access the new billing platform?
 
-You have access to the enhanced billing platform if you have an enterprise account, or if you are part of an organization owned by an enterprise account, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform. To check if you have access:
+{% data reusables.billing.new-billing-platform-permissions %}
+
+To check if you have access:
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 
@@ -50,4 +54,4 @@ If you have access, there will be a {% octicon "credit-card" aria-hidden="true"
 
 ## Next steps
 
-* To **get started with the enhanced billing plaform**, see "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform)."
+* To **get started with the new billing plaform**, see "[AUTOTITLE](/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform)."
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses.md b/content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md
similarity index 82%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses.md
rename to content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md
index 85d37f56f5..179de35e48 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses.md
+++ b/content/billing/using-the-new-billing-platform/about-usage-based-billing-for-licenses.md
@@ -7,6 +7,7 @@ redirect_from:
   - /early-access/billing/managing-usage-based-billing-for-githubs-products-on-azure
   - /early-access/billing/managing-billing-for-githubs-products-through-azure
   - /early-access/billing/managing-usage-based-billing-for-github-licenses
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/about-usage-based-billing-for-licenses
 versions:
   feature: enhanced-billing-platform
 type: overview
@@ -16,7 +17,7 @@ permissions: Enterprise administrators
 shortTitle: Usage-based billing for licenses
 ---
 
-With the enhanced billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses you use. You will not need to buy a predefined number of licenses in advance.
+With the new billing platform, you pay monthly for the number of {% data variables.product.prodname_enterprise %} and {% data variables.product.prodname_GH_advanced_security %} licenses you use. You will not need to buy a predefined number of licenses in advance.
 
 If a user starts consuming a license seat during the month, you will pay pro rata for the user's license usage that month. If a user stops consuming a license seat during the month, your bill for the following month will reflect the change.
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account.md b/content/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account.md
similarity index 53%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account.md
rename to content/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account.md
index 32df369a84..f77dc9eed5 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account.md
+++ b/content/billing/using-the-new-billing-platform/adding-seats-to-your-enterprise-account.md
@@ -1,18 +1,20 @@
 ---
 title: Adding seats to your enterprise account
-intro: Learn how to add seats to your enterprise account using the enhanced billing platform.
+intro: Learn how to add seats to your enterprise account using the new billing platform.
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/adding-seats-to-your-enterprise-account
 type: overview
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
 shortTitle: Add seats to your enterprise
 ---
 
 >[!IMPORTANT] If you pay by invoice, you need to contact your account manager in {% data variables.contact.contact_enterprise_sales %} to add seats to your enterprise account.
 
-If you have access to the enhanced billing platform, you can add seats to your enterprise account through the "Licensing" page. To check if you have access, see "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/about-the-enhanced-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-enhanced-billing-platform)."
+If you have access to the new billing platform, you can add seats to your enterprise account through the "Licensing" page. To check if you have access, see "[AUTOTITLE](/billing/using-the-new-billing-platform/about-the-new-billing-platform-for-enterprises#how-do-i-know-if-i-can-access-the-new-billing-platform)."
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units.md b/content/billing/using-the-new-billing-platform/charging-business-units.md
similarity index 90%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units.md
rename to content/billing/using-the-new-billing-platform/charging-business-units.md
index 700c496535..dc5e1e869a 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units.md
+++ b/content/billing/using-the-new-billing-platform/charging-business-units.md
@@ -3,14 +3,16 @@ title: Charging business units
 intro: 'Learn how to create and use cost centers to manage business units at scale.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/charging-business-units
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
 shortTitle: Charge business units
 ---
 
-To drive accountability and control costs, the enhanced billing platform lets you create cost centers. A cost center manages expenses without generating revenue. You can create cost centers and assign users, organizations, and repositories to them, and set budgets. This enhances spending control and resource allocation.
+To drive accountability and control costs, the new billing platform lets you create cost centers. A cost center manages expenses without generating revenue. You can create cost centers and assign users, organizations, and repositories to them, and set budgets. This enhances spending control and resource allocation.
 
 If your account is billed to Azure, you will have the option to add an Azure subscription ID. Cost centers allows for multiple Azure subscription IDs so that different business units, within an enterprise, can directly pay for their usage.
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise.md b/content/billing/using-the-new-billing-platform/estimating-spending-for-your-enterprise.md
similarity index 83%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise.md
rename to content/billing/using-the-new-billing-platform/estimating-spending-for-your-enterprise.md
index 19d69304a4..d5ad3c558e 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise.md
+++ b/content/billing/using-the-new-billing-platform/estimating-spending-for-your-enterprise.md
@@ -3,14 +3,16 @@ title: Estimating spending for your enterprise
 intro: 'Understand where your spending is trending based on the usage across products.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/estimating-spending-for-your-enterprise
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
 shortTitle: Estimate spending
 ---
 
-The enhanced billing platform provides a high-level view of your spending trends based on the usage across products. You can use this information to estimate your spending and make informed decisions about your budget.
+The new billing platform provides a high-level view of your spending trends based on the usage across products. You can use this information to estimate your spending and make informed decisions about your budget.
 
 ## Viewing your spending
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending.md b/content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md
similarity index 79%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending.md
rename to content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md
index b5a6b3371e..2f8c1e1b3c 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending.md
+++ b/content/billing/using-the-new-billing-platform/gathering-insights-on-your-spending.md
@@ -3,14 +3,16 @@ title: Gathering insights on your spending
 intro: 'Get insights into the usage of your enterprise members.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.<br><br> As an enterprise owner or billing manager you can view and download your enterprise's usage. As an organization owner, you can view and download usage for the organizations you manage
+permissions: The new billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.<br><br> As an enterprise owner or billing manager you can view and download your enterprise's usage. As an organization owner, you can view and download usage for the organizations you manage
 shortTitle: Gather insights
 ---
 
-The enhanced billing platform provides you with the tools to:
+The new billing platform provides you with the tools to:
 
 * **Get insights** into the usage of your enterprise members to understand how your resources are being used.
 * **Generate reports** on the usage of your enterprise members to import into your own tools for visualization and analysis.
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform.md b/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md
similarity index 65%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform.md
rename to content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md
index 7969b1c9c0..441f64a416 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform.md
+++ b/content/billing/using-the-new-billing-platform/getting-started-with-the-new-billing-platform.md
@@ -1,8 +1,10 @@
 ---
-title: Getting started with the enhanced billing platform
-intro: 'Learn how to start using the enhanced billing platform for your enterprise account.'
+title: Getting started with the new billing platform
+intro: 'Learn how to start using the new billing platform for your enterprise account.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/getting-started-with-the-enhanced-billing-platform
 type: overview
 topics:
   - Enterprise
@@ -10,7 +12,7 @@ permissions: Enterprise administrators
 shortTitle: Get started
 ---
 
-If you don't already have access to the enhanced billing platform, there are three ways to get started.
+If you don't already have access to the new billing platform, there are three ways to get started.
 
 * If you are **new** to {% data variables.product.prodname_ghe_cloud %}, set up a trial of {% data variables.product.prodname_ghe_cloud %}. See "[AUTOTITLE](/admin/overview/setting-up-a-trial-of-github-enterprise-cloud)."
 * If you have an **existing** enterprise account and pay by **invoice**, contact your account manager in {% data variables.contact.contact_enterprise_sales %} to discuss switching when your contract renews.
diff --git a/content/billing/using-the-new-billing-platform/index.md b/content/billing/using-the-new-billing-platform/index.md
new file mode 100644
index 0000000000..7290bb32dd
--- /dev/null
+++ b/content/billing/using-the-new-billing-platform/index.md
@@ -0,0 +1,24 @@
+---
+title: Using the new billing platform
+shortTitle: New billing platform
+intro: 'The new billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls.'
+redirect_from:
+  - /early-access/billing/billing-private-beta
+  - /billing/using-the-enhanced-billing-platform-for-enterprises
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
+versions:
+  feature: enhanced-billing-platform
+children:
+  - /about-the-new-billing-platform-for-enterprises
+  - /getting-started-with-the-new-billing-platform
+  - /about-the-billing-cycle
+  - /about-usage-based-billing-for-licenses
+  - /adding-seats-to-your-enterprise-account
+  - /roles-for-the-new-billing-platform
+  - /estimating-spending-for-your-enterprise
+  - /gathering-insights-on-your-spending
+  - /charging-business-units
+  - /preventing-overspending
+  - /managing-your-payment-and-billing-information
+  - /about-billing-for-git-large-file-storage
+---
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information.md b/content/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information.md
similarity index 93%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information.md
rename to content/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information.md
index 0d62504dbb..647bb43113 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information.md
+++ b/content/billing/using-the-new-billing-platform/managing-your-payment-and-billing-information.md
@@ -3,10 +3,12 @@ title: Managing your payment and billing information
 intro: 'Learn how to manage your payment information and history, and update your billing contacts.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/managing-your-payment-and-billing-information
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
 shortTitle: Manage your payment information
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending.md b/content/billing/using-the-new-billing-platform/preventing-overspending.md
similarity index 92%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending.md
rename to content/billing/using-the-new-billing-platform/preventing-overspending.md
index ad591143da..3707a45e57 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending.md
+++ b/content/billing/using-the-new-billing-platform/preventing-overspending.md
@@ -3,10 +3,12 @@ title: Preventing overspending
 intro: 'Learn how to set budgets and track when they are nearing or above a threshold to prevent overspending.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/preventing-overspending
 type: how_to
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
+permissions: '{% data reusables.billing.new-billing-platform-permissions %}'
 shortTitle: Prevent overspending
 ---
 
diff --git a/content/billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md b/content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md
similarity index 60%
rename from content/billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md
rename to content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md
index 947c993c18..3daa3a7b49 100644
--- a/content/billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform.md
+++ b/content/billing/using-the-new-billing-platform/roles-for-the-new-billing-platform.md
@@ -1,19 +1,21 @@
 ---
-title: Roles for the enhanced billing platform
-intro: 'Learn about the three different roles that have access to the enhanced billing platform.'
+title: Roles for the new billing platform
+intro: 'Learn about the three different roles that have access to the new billing platform.'
 versions:
   feature: enhanced-billing-platform
+redirect_from:
+  - /billing/using-the-enhanced-billing-platform-for-enterprises/roles-for-the-enhanced-billing-platform
 type: reference
 topics:
   - Enterprise
-permissions: The enhanced billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
+permissions: The new billing platform is available to all enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 ---
 
-Three roles have access to the enhanced billing platform: enterprise owners, billing managers, and organization owners. See "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise)."
+Three roles have access to the new billing platform: enterprise owners, billing managers, and organization owners. See "[AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise)."
 
 ## Enterprise owners and billing managers
 
-As an enterprise owner or a billing manager, you can access the enhanced billing platform for your enterprise account. You can:
+As an enterprise owner or a billing manager, you can access the new billing platform for your enterprise account. You can:
 
 * View all metered usage in your enterprise and set budgets for your enterprise and organizations.
 * See enterprise usage, including costs for organizations and repositories.
diff --git a/content/code-security/getting-started/quickstart-for-securing-your-organization.md b/content/code-security/getting-started/quickstart-for-securing-your-organization.md
index 9a7256f37e..d1a503932b 100644
--- a/content/code-security/getting-started/quickstart-for-securing-your-organization.md
+++ b/content/code-security/getting-started/quickstart-for-securing-your-organization.md
@@ -90,7 +90,7 @@ On this view, you can use checkboxes to select specific repositories, or you can
 
 {% endif %}
 
-If you have a limited number of licenses for {% data variables.product.prodname_GH_advanced_security %}, you may want to prioritize repositories that contain critical projects, or that have the highest commit frequencies. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+If you have a limited number of licenses for {% data variables.product.prodname_GH_advanced_security %}, you may want to prioritize repositories that contain critical projects, or that have the highest commit frequencies. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
 
 {% data reusables.security-overview.settings-limitations %}
 
@@ -104,7 +104,7 @@ You can choose to enable a security feature automatically in all new repositorie
 1. In the left sidebar, click {% octicon "codescan" aria-hidden="true" %} **Code security and analysis**.
 1. Below the name of the feature, select the option for automatically enabling the feature in applicable future repositories.
 
-   ![Screenshot of the "Code security and analysis" page. Below "Dependabot alerts", a checkbox for enabling the feature in future repositories is highlighted with an orange outline.](/assets/images/help/security/enable-for-new-repos.png)
+   ![Screenshot of "Code security and analysis" page. Below "Dependabot alerts", a checkbox to enable the feature in future repositories is highlighted in orange.](/assets/images/help/security/enable-for-new-repos.png)
 
 ## Monitoring the impact of security features
 
diff --git a/content/code-security/index.md b/content/code-security/index.md
index b49b9c8c8a..c18e6d121a 100644
--- a/content/code-security/index.md
+++ b/content/code-security/index.md
@@ -6,7 +6,7 @@ redirect_from:
   - /code-security/guides
 introLinks:
   overview: /code-security/getting-started/github-security-features
-  try_ghas_for_free: '{% ifversion ghec %}/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security{% endif %}'
+  try_ghas_for_free: '{% ifversion ghec %}/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security{% endif %}'
 featuredLinks:
   startHere:
     - /code-security/getting-started/quickstart-for-securing-your-repository
diff --git a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md
index 8f2a492d08..1f3556aeb1 100644
--- a/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md
+++ b/content/code-security/securing-your-organization/managing-the-security-of-your-organization/managing-your-github-advanced-security-license-usage.md
@@ -23,7 +23,7 @@ For information on managing your {% data variables.product.prodname_GH_advanced_
 
 To use {% data variables.product.prodname_GH_advanced_security %} (GHAS) features on private or internal repositories with unique active committers, you must have available GHAS licenses. With {% data variables.product.prodname_security_configurations %}, you can easily understand the GHAS license usage of repositories in your organization, as well as the number of available GHAS licenses in your enterprise. Additionally, if you need to make more GHAS licenses available to secure a high-impact repository, you can quickly disable GHAS features on private and internal repositories at scale.
 
-To learn about GHAS licenses, as well as unique and active committers, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+To learn about GHAS licenses, as well as unique and active committers, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
 
 ## Understanding your {% data variables.product.prodname_GH_advanced_security %} license usage
 
diff --git a/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md b/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md
index bbde41aead..d3cff0bf9e 100644
--- a/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md
+++ b/content/code-security/securing-your-organization/meeting-your-specific-security-needs-with-custom-security-configurations/creating-a-custom-security-configuration.md
@@ -30,7 +30,7 @@ With {% data variables.product.prodname_custom_security_configurations %}, you c
 {% data reusables.security-configurations.view-configurations-page %}
 1. In the "Code security configurations" section, click **New configuration**.
 1. To help identify your {% data variables.product.prodname_custom_security_configuration %} and clarify its purpose on the "Code {% data variables.product.prodname_security_configurations %}" page, name your configuration and create a description.
-1. In the "{% data variables.product.prodname_GH_advanced_security %} features" row, choose whether to include or exclude {% data variables.product.prodname_GH_advanced_security %} (GHAS) features. If you plan to apply a {% data variables.product.prodname_custom_security_configuration %} with GHAS features to private repositories, you must have available GHAS licenses for each active unique committer to those repositories, or the features will not be enabled. To learn more about committers and GHAS licensing, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+1. In the "{% data variables.product.prodname_GH_advanced_security %} features" row, choose whether to include or exclude {% data variables.product.prodname_GH_advanced_security %} (GHAS) features. If you plan to apply a {% data variables.product.prodname_custom_security_configuration %} with GHAS features to private repositories, you must have available GHAS licenses for each active unique committer to those repositories, or the features will not be enabled. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
 1. In the "Dependency graph" section of the security settings table, choose whether you want to enable, disable, or keep the existing settings for the following security features:
     * Dependency graph. To learn about dependency graph, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-the-dependency-graph)."{%- ifversion maven-transitive-dependencies %}
     * Automatic dependency submission. To learn about automatic dependency submission, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/configuring-automatic-dependency-submission-for-your-repository)."{%- endif %}
@@ -58,7 +58,6 @@ With {% data variables.product.prodname_custom_security_configurations %}, you c
 1. Optionally, in the "Policy" section, you can choose to automatically apply the {% data variables.product.prodname_security_configuration %} to newly created repositories depending on their visibility. Select the **None** {% octicon "triangle-down" aria-hidden="true" %} dropdown menu, then click **Public**, or **Private and internal**, or both.
 
     {% data reusables.security-configurations.default-configuration-exception-repo-transfers %}
-
 1. Optionally, in the "Policy" section, you can enforce the configuration and block repository owners from changing features that are enabled or disabled by the configuration (features that are not set aren't enforced). Next to "Enforce configuration", select **Enforce** from the dropdown menu.
 
     >[!NOTE]
diff --git a/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md b/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md
index 8c8bc04484..677acbc6f1 100644
--- a/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md
+++ b/content/code-security/securing-your-organization/troubleshooting-security-configurations/not-enough-github-advanced-security-licenses.md
@@ -11,7 +11,7 @@ topics:
   - Security
 ---
 
-You must have an available {% data variables.product.prodname_GH_advanced_security %} (GHAS) license for each unique active committer to enable GHAS features on a private{% ifversion ghec or ghes %} or internal{% endif %} repository. To learn about GHAS licensing, as well as unique and active committers, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+You must have an available {% data variables.product.prodname_GH_advanced_security %} (GHAS) license for each unique active committer to enable GHAS features on a private{% ifversion ghec or ghes %} or internal{% endif %} repository. To learn about GHAS licensing, as well as unique and active committers, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
 
 If you try to apply a {% data variables.product.prodname_security_configuration %} with GHAS features to your repositories and don't have enough GHAS licenses, the configuration will only be successfully applied to public repositories. For private {% ifversion ghec or ghes %}and internal {% endif %}repositories, only free security features will be enabled due to the license limitation, resulting in the following outcomes:
 
diff --git a/content/code-security/security-overview/enabling-security-features-for-multiple-repositories.md b/content/code-security/security-overview/enabling-security-features-for-multiple-repositories.md
index c21488aa84..9dd03190d3 100644
--- a/content/code-security/security-overview/enabling-security-features-for-multiple-repositories.md
+++ b/content/code-security/security-overview/enabling-security-features-for-multiple-repositories.md
@@ -6,7 +6,7 @@ permissions: '{% data reusables.security-overview.permissions %}'
 product: '{% data reusables.gated-features.security-overview %}'
 allowTitleToDifferFromFilename: true
 versions:
-  feature: pre-security-configurations
+  feature: security-configurations-beta-and-pre-beta
 type: how_to
 topics:
   - Security overview
@@ -29,7 +29,7 @@ You can use checkboxes to select which repositories you want to include, or use
 
 For more information on filters you can use in different parts of security overview, see "[AUTOTITLE](/code-security/security-overview/filtering-alerts-in-security-overview)."
 
-For more information about the different ways of enabling security features in an organization, see "[AUTOTITLE](/code-security/getting-started/quickstart-for-securing-your-organization)."
+For more information about the different ways of enabling security features in an organization, see {% ifversion security-configurations %}"[AUTOTITLE](/code-security/securing-your-organization)."{% else %}"[AUTOTITLE](/code-security/getting-started/quickstart-for-securing-your-organization)."{% endif %}
 
 ## Enabling security features for multiple repositories
 
diff --git a/content/codespaces/developing-in-a-codespace/deleting-a-codespace.md b/content/codespaces/developing-in-a-codespace/deleting-a-codespace.md
index 7198f1ed8e..26d284a072 100644
--- a/content/codespaces/developing-in-a-codespace/deleting-a-codespace.md
+++ b/content/codespaces/developing-in-a-codespace/deleting-a-codespace.md
@@ -18,7 +18,7 @@ shortTitle: Delete a codespace
 
 ## Overview
 
-{% data reusables.codespaces.automatic-deletion %} For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces?tool=webui)."
+{% data reusables.codespaces.automatic-deletion %} See "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces?tool=webui)."
 
 You can manually delete a codespace in a variety of ways:
 * In the terminal by using {% data variables.product.prodname_cli %}
@@ -35,7 +35,7 @@ Use the tabs at the top of this article to display instructions for each of thes
 
 ## Why you should delete unused codespaces
 
-There are costs associated with storing codespaces. You should therefore delete any codespaces you no longer need. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+There are costs associated with storing codespaces. You should therefore delete any codespaces you no longer need. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 {% data reusables.codespaces.max-number-codespaces %}
 
@@ -143,7 +143,7 @@ For more information, click the "{% data variables.product.prodname_cli %}" tab
 
 {% endcli %}
 
-You can also use the REST API to delete codespaces for your organization. For more information, see "[AUTOTITLE](/rest/codespaces/organizations#delete-a-codespace-from-the-organization)."
+You can also use the REST API to delete codespaces for your organization. See "[AUTOTITLE](/rest/codespaces/organizations#delete-a-codespace-from-the-organization)."
 
 ## Further reading
 
diff --git a/content/codespaces/developing-in-a-codespace/opening-an-existing-codespace.md b/content/codespaces/developing-in-a-codespace/opening-an-existing-codespace.md
index e7f0788061..32092a93f5 100644
--- a/content/codespaces/developing-in-a-codespace/opening-an-existing-codespace.md
+++ b/content/codespaces/developing-in-a-codespace/opening-an-existing-codespace.md
@@ -20,15 +20,15 @@ redirect_from:
 
 {% endjetbrains_beta %}
 
-You can reopen any of your active or stopped codespaces on {% data variables.product.github %}, in a JetBrains IDE, in {% data variables.product.prodname_vscode %}, or by using {% data variables.product.prodname_cli %}. You can't reopen a codespace that has been deleted. For more information, see "[AUTOTITLE](/codespaces/getting-started/understanding-the-codespace-lifecycle)."
+You can reopen any of your active or stopped codespaces on {% data variables.product.github %}, in a JetBrains IDE, in {% data variables.product.prodname_vscode %}, or by using {% data variables.product.prodname_cli %}. You can't reopen a codespace that has been deleted. See "[AUTOTITLE](/codespaces/getting-started/understanding-the-codespace-lifecycle)."
 
 You can view all your codespaces on the "Your codespaces" page at [github.com/codespaces](https://github.com/codespaces). From this page, you can:
 
 * Open, stop, or delete your codespaces.
-* See who owns (and may be billed for) your codespaces: your personal account, or organizations you belong to. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+* See who owns (and may be billed for) your codespaces: your personal account, or organizations you belong to. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 * See the machine type, size, and status of your codespaces.
-* Create a new codespace, either by choosing one of {% data variables.product.company_short %}'s templates or by clicking **New codespace**. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-from-a-template)" and "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository)."
-* Prevent automatic deletion of a codespace. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces?tool=webui#avoiding-automatic-deletion-of-codespaces)."
+* Create a new codespace, either by choosing one of {% data variables.product.company_short %}'s templates or by clicking **New codespace**. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-from-a-template)" and "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository)."
+* Prevent automatic deletion of a codespace. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces?tool=webui#avoiding-automatic-deletion-of-codespaces)."
 
 {% webui %}
 
@@ -57,7 +57,7 @@ You can bookmark the address of this page if you want to get back to it quickly
 ## Opening an existing codespace from the "Your codespaces" page
 
 {% data reusables.codespaces.your-codespaces-procedure-step %}
-1. To open a codespace in your default editor, click the name of the codespace. {% data reusables.codespaces.about-changing-default-editor %} For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-default-editor-for-github-codespaces)."
+1. To open a codespace in your default editor, click the name of the codespace. {% data reusables.codespaces.about-changing-default-editor %} See "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-default-editor-for-github-codespaces)."
 
    To open the codespace in an editor other than your default:
 
@@ -87,7 +87,7 @@ You can bookmark the address of this page if you want to get back to it quickly
 
 {% note %}
 
-**Note:** {% data reusables.codespaces.using-codespaces-in-vscode %} For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/using-github-codespaces-in-visual-studio-code)."
+**Note:** {% data reusables.codespaces.using-codespaces-in-vscode %} See "[AUTOTITLE](/codespaces/developing-in-a-codespace/using-github-codespaces-in-visual-studio-code)."
 
 {% endnote %}
 
@@ -124,7 +124,7 @@ You can also access the commands listed above by navigating to the Remote Explor
 
      {% note %}
 
-     **Note**: You must have {% data variables.product.prodname_vscode_shortname %} installed on your local machine. For more information, see "[Setting up {% data variables.product.prodname_vscode %}](https://code.visualstudio.com/docs/setup/setup-overview)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
+     **Note**: You must have {% data variables.product.prodname_vscode_shortname %} installed on your local machine. See "[Setting up {% data variables.product.prodname_vscode %}](https://code.visualstudio.com/docs/setup/setup-overview)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
 
      {% endnote %}
 
@@ -155,7 +155,7 @@ You can also access the commands listed above by navigating to the Remote Explor
 1. Using the arrow keys, navigate to the codespace that you want to open.
 1. To open the codespace, press <kbd>Enter</kbd>.
 
-For more information, see [`gh codespace code`](https://cli.github.com/manual/gh_codespace_code) in the {% data variables.product.prodname_cli %} manual.
+See [`gh codespace code`](https://cli.github.com/manual/gh_codespace_code) in the {% data variables.product.prodname_cli %} manual.
 
 {% endcli %}
 
diff --git a/content/codespaces/getting-started/understanding-the-codespace-lifecycle.md b/content/codespaces/getting-started/understanding-the-codespace-lifecycle.md
index d703cea9d5..4eeff5f368 100644
--- a/content/codespaces/getting-started/understanding-the-codespace-lifecycle.md
+++ b/content/codespaces/getting-started/understanding-the-codespace-lifecycle.md
@@ -67,7 +67,7 @@ If you try to delete a codespace with unpushed git commits, your editor will not
 
 Codespaces that have been stopped and remain inactive for a specified period of time will be deleted automatically. By default, inactive codespaces are deleted after 30 days, but you can customize your codespace retention period. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces)."
 
-If you create a codespace, it will continue to accrue storage charges until it is deleted, irrespective of whether it is active or stopped. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)." Deleting a codespace does not reduce the current billable amount for {% data variables.product.prodname_github_codespaces %}, which accumulates during each monthly billing cycle. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+If you create a codespace, it will continue to accrue storage charges until it is deleted, irrespective of whether it is active or stopped. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)." Deleting a codespace does not reduce the current billable amount for {% data variables.product.prodname_github_codespaces %}, which accumulates during each monthly billing cycle. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 For more information on deleting a codespace, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/deleting-a-codespace)."
 
diff --git a/content/codespaces/guides.md b/content/codespaces/guides.md
index 6f849a29ef..396ec7aa27 100644
--- a/content/codespaces/guides.md
+++ b/content/codespaces/guides.md
@@ -53,7 +53,7 @@ includeGuides:
   - /codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces
   - /codespaces/managing-codespaces-for-your-organization/restricting-the-visibility-of-forwarded-ports
   - /codespaces/managing-codespaces-for-your-organization/reviewing-your-organizations-audit-logs-for-github-codespaces
-  - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
+  - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
   - /codespaces/reference/using-the-vs-code-command-palette-in-codespaces
   - /codespaces/reference/disaster-recovery-for-github-codespaces
   - /codespaces/reference/security-in-github-codespaces
diff --git a/content/codespaces/index.md b/content/codespaces/index.md
index 6623c71849..32c007c711 100644
--- a/content/codespaces/index.md
+++ b/content/codespaces/index.md
@@ -11,7 +11,7 @@ featuredLinks:
     - /codespaces/getting-started/understanding-the-codespace-lifecycle
     - /codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers
     - /codespaces/managing-your-codespaces/managing-repository-access-for-your-codespaces
-    - /billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
+    - /billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces
   guideCards:
     - /codespaces/getting-started/deep-dive
     - /codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository
diff --git a/content/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization.md b/content/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization.md
index b5f88faeb2..73cbf0939f 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization.md
@@ -11,7 +11,7 @@ topics:
   - Codespaces
   - Billing
   - Administrator
-product: 'Organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for their members'' use of {% data variables.product.prodname_github_codespaces %}. These organizations can then access policies that apply to codespaces paid for by the organization. For more information, see "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."'
+product: 'Organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for their members'' use of {% data variables.product.prodname_github_codespaces %}. These organizations can then access policies that apply to codespaces paid for by the organization. See "[AUTOTITLE](/get-started/learning-about-github/githubs-products)."'
 ---
 
 ## Overview
@@ -20,13 +20,13 @@ If you're the owner of an organization on a {% data variables.product.prodname_t
 
 To pay for usage, you must do all of the following things:
 
-* Allow at least some of your members and collaborators to use {% data variables.product.prodname_github_codespaces %} in your organization's private {% ifversion ghec %}and internal {% endif %}repositories. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization#enabling-or-disabling-github-codespaces)."
-* Choose for codespaces created from your organization's repositories to be **organization-owned**. For more information, see "[Choosing who owns and pays for codespaces](#choosing-who-owns-and-pays-for-codespaces)."
-* Set a non-zero spending limit for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)."
+* Allow at least some of your members and collaborators to use {% data variables.product.prodname_github_codespaces %} in your organization's private {% ifversion ghec %}and internal {% endif %}repositories. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization#enabling-or-disabling-github-codespaces)."
+* Choose for codespaces created from your organization's repositories to be **organization-owned**. See "[Choosing who owns and pays for codespaces](#choosing-who-owns-and-pays-for-codespaces)."
+* Set a non-zero spending limit for {% data variables.product.prodname_github_codespaces %}. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)."
 
 ## About choosing who pays for codespaces
 
-Paying for a codespace means paying for the storage and compute costs of the codespace over the codespace's lifetime. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+Paying for a codespace means paying for the storage and compute costs of the codespace over the codespace's lifetime. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 Organizations on a {% data variables.product.prodname_free_team %} plan cannot pay for {% data variables.product.prodname_github_codespaces %}, so the user who creates the codespace always pays.
 
@@ -43,7 +43,7 @@ For more information about enabling {% data variables.product.prodname_github_co
 {% ifversion ghec %}
 {% note %}
 
-**Note:** If you own an {% data variables.enterprise.prodname_emu_org %} and do not allow {% data variables.product.prodname_github_codespaces %} to be billed to your organization, members with {% data variables.enterprise.prodname_managed_users %} will not be able to use {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users#abilities-and-restrictions-of-managed-user-accounts)."
+**Note:** If you own an {% data variables.enterprise.prodname_emu_org %} and do not allow {% data variables.product.prodname_github_codespaces %} to be billed to your organization, members with {% data variables.enterprise.prodname_managed_users %} will not be able to use {% data variables.product.prodname_github_codespaces %}. See "[AUTOTITLE](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/about-enterprise-managed-users#abilities-and-restrictions-of-managed-user-accounts)."
 
 {% endnote %}
 {% endif %}
@@ -74,7 +74,7 @@ If you change from **user ownership** to **organization ownership**, existing co
 
 {% note %}
 
-**Note:** If you cannot access the option to make codespaces **organization-owned**, this may be because you have disabled {% data variables.product.prodname_github_codespaces %} for all users in your organization's private{% ifversion ghec %} and internal{% endif %} repositories. For more information, see "[About choosing who pays for codespaces](#about-choosing-who-pays-for-codespaces)."
+**Note:** If you cannot access the option to make codespaces **organization-owned**, this may be because you have disabled {% data variables.product.prodname_github_codespaces %} for all users in your organization's private{% ifversion ghec %} and internal{% endif %} repositories. See "[About choosing who pays for codespaces](#about-choosing-who-pays-for-codespaces)."
 
 {% endnote %}
 
@@ -86,10 +86,10 @@ If you change from **user ownership** to **organization ownership**, existing co
    * **Organization ownership**: Codespaces can be owned and paid for by your organization.
    * **User ownership**: Codespaces are always owned and paid for by the user who creates the codespace.
 
-1. Optionally, under "Codespaces access," review the members and collaborators for whom you have enabled {% data variables.product.prodname_codespaces %}. These are the only users who can create codespaces that your organization pays for. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization)."
+1. Optionally, under "Codespaces access," review the members and collaborators for whom you have enabled {% data variables.product.prodname_codespaces %}. These are the only users who can create codespaces that your organization pays for. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization)."
 
 ## Setting a spending limit
 
 {% data reusables.codespaces.codespaces-spending-limit-requirement %}
 
-For information on managing and changing your account's spending limit, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)."
+For information on managing and changing your account's spending limit, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)."
diff --git a/content/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization.md b/content/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization.md
index 87adad54b8..1cb07c30b1 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/listing-the-codespaces-in-your-organization.md
@@ -15,11 +15,11 @@ product: '{% data reusables.gated-features.codespaces-org %}'
 
 ## Overview
 
-As an organization owner, you can list all of the currently active and stopped codespaces for your organization. You might want to do this to check how many codespaces users are creating, to make sure they aren't incurring unnecessary costs. For information about pricing, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+As an organization owner, you can list all of the currently active and stopped codespaces for your organization. You might want to do this to check how many codespaces users are creating, to make sure they aren't incurring unnecessary costs. For information about pricing, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 The easiest way to list the codespaces for an organization is by using {% data variables.product.prodname_cli %}. You can also use the REST API, which provides more information about each codespace.
 
-For information on how to see the current total {% data variables.product.prodname_codespaces %} usage for your organization or enterprise, and generate a detailed report, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+For information on how to see the current total {% data variables.product.prodname_codespaces %} usage for your organization or enterprise, and generate a detailed report, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 ### Using {% data variables.product.prodname_cli %} to list codespaces
 
diff --git a/content/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization.md b/content/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization.md
index 924cd4920c..70c8a38229 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/managing-the-cost-of-github-codespaces-in-your-organization.md
@@ -20,21 +20,21 @@ product: '{% data reusables.gated-features.codespaces-org %}'
 
 Your organization is billed according to its compute and storage usage for {% data variables.product.prodname_github_codespaces %}. This article explains the ways in which you, as an organization owner, can manage these costs.
 
-To learn about pricing for {% data variables.product.prodname_github_codespaces %}, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
+To learn about pricing for {% data variables.product.prodname_github_codespaces %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
 
 ## Spending limits
 
-You can set a spending limit for {% data variables.product.prodname_github_codespaces %} for your organization. This limit is applied to the total compute and storage cost for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
+You can set a spending limit for {% data variables.product.prodname_github_codespaces %} for your organization. This limit is applied to the total compute and storage cost for {% data variables.product.prodname_github_codespaces %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
 
 * **Compute usage:** This is the total time during which all {% data variables.product.prodname_github_codespaces %} instances ("codespaces") were active in a billing month.
 
 * **Storage usage:** For {% data variables.product.prodname_github_codespaces %} billing purposes, this includes all files used by all codespaces and prebuilds in your account. This includes resources such as cloned repositories, configuration files, and extensions, among others.
 
-You can check the compute and storage usage for {% data variables.product.prodname_github_codespaces %} for the current billing month. For information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+You can check the compute and storage usage for {% data variables.product.prodname_github_codespaces %} for the current billing month. For information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 {% note %}
 
-**Note**: Prebuilds for {% data variables.product.prodname_github_codespaces %} are created and updated using {% data variables.product.prodname_actions %}. This may incur billable costs for {% data variables.product.prodname_actions %}. You can set a spending limit for {% data variables.product.prodname_actions %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)" and "[AUTOTITLE](/billing/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions)." Storage of the generated prebuilds is charged at the same rate as your codespaces, and is included in your {% data variables.product.prodname_github_codespaces %} spending limit.
+**Note**: Prebuilds for {% data variables.product.prodname_github_codespaces %} are created and updated using {% data variables.product.prodname_actions %}. This may incur billable costs for {% data variables.product.prodname_actions %}. You can set a spending limit for {% data variables.product.prodname_actions %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-actions/managing-your-spending-limit-for-github-actions)." Storage of the generated prebuilds is charged at the same rate as your codespaces, and is included in your {% data variables.product.prodname_github_codespaces %} spending limit.
 
 {% endnote %}
 
diff --git a/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md b/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
index 0d0a91f16f..973a412f4c 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types.md
@@ -16,7 +16,7 @@ product: '{% data reusables.gated-features.codespaces-org %}'
 
 Typically, when you create a codespace you are offered a choice of specifications for the machine that will run your codespace. You can choose the machine type that best suits your needs. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)."
 
-If you pay for using {% data variables.product.prodname_github_codespaces %} then your choice of machine type will affect how much you are billed. The compute cost for a codespace is proportional to the number of processor cores in the machine type you choose. For example, the compute cost of using a codespace for an hour on a 16-core machine is eight times greater than a 2-core machine. For more information about pricing, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+If you pay for using {% data variables.product.prodname_github_codespaces %} then your choice of machine type will affect how much you are billed. The compute cost for a codespace is proportional to the number of processor cores in the machine type you choose. For example, the compute cost of using a codespace for an hour on a 16-core machine is eight times greater than a 2-core machine. For more information about pricing, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 As an organization owner, you may want to configure constraints on the types of machine that are available. For example, if the work in your organization doesn't require significant compute power or storage space, you can remove the highly resourced machines from the list of options that people can choose from. You do this by defining one or more policies in the {% data variables.product.prodname_github_codespaces %} settings for your organization.
 
@@ -86,4 +86,4 @@ You can edit an existing policy. For example, you may want to add or remove cons
 
 ## Further reading
 
-* "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)"
diff --git a/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md b/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md
index 84d0c30299..a4589ae21d 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/restricting-the-idle-timeout-period.md
@@ -26,7 +26,7 @@ As an organization owner, you may want to configure constraints on the maximum i
 
 {% endnote %}
 
-For more information about pricing for {% data variables.product.prodname_github_codespaces %} compute usage, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
+For more information about pricing for {% data variables.product.prodname_github_codespaces %} compute usage, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
 
 ### Inactivity defined
 
diff --git a/content/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create.md b/content/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create.md
index b87f6b7fed..281554de90 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/restricting-the-number-of-organization-billed-codespaces-a-user-can-create.md
@@ -16,13 +16,13 @@ product: '{% data reusables.gated-features.codespaces-org %}'
 
 By default, if organization members, or collaborators, are permitted to create codespaces that are billable to your organization, they can create multiple such codespaces. The number of organization-billed codespaces someone can create is governed by a limit to the total number of codespaces that they can create across all repositories they can access. This limit is set by {% data variables.product.company_short %}.
 
-As an organization owner, you can restrict the number of codespaces that each user can create, where the costs of the codespace are billable to the organization. This can help to reduce the overall cost of {% data variables.product.prodname_github_codespaces %} to the organization, as there is a charge for codespace storage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)."
+As an organization owner, you can restrict the number of codespaces that each user can create, where the costs of the codespace are billable to the organization. This can help to reduce the overall cost of {% data variables.product.prodname_github_codespaces %} to the organization, as there is a charge for codespace storage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)."
 
 To restrict the maximum number of organization-billed codespaces that users can create, you create a policy in the {% data variables.product.prodname_codespaces %} settings for your organization. For example, if you set the maximum to 2, users who already have 2 active or stopped codespaces that are billed to your organization will have to delete one of these before they can create a new codespace that's billed to the organization.
 
 This setting does not restrict users from creating codespaces that are not billed to your organization. For example, they can create additional codespaces for public repositories, using their personal {% data variables.product.prodname_codespaces %} usage allowance. However, users who are permitted to create organization-billed codespaces, but have reached the limit for such codespaces, cannot choose to create a codespace for an organization-owned repository using their personal included allowance.
 
-For information about the free use of {% data variables.product.prodname_github_codespaces %} for personal accounts, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#monthly-included-storage-and-core-hours-for-personal-accounts)." For information on how to choose who can create codespaces that are billed to your organization, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization#choose-who-can-create-codespaces-that-are-billed-to-your-organization)."
+For information about the free use of {% data variables.product.prodname_github_codespaces %} for personal accounts, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#monthly-included-storage-and-core-hours-for-personal-accounts)." For information on how to choose who can create codespaces that are billed to your organization, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization#choose-who-can-create-codespaces-that-are-billed-to-your-organization)."
 
 Policies with the "Maximum codespaces per user" constraint are applied to every repository in your organization. You can't, therefore, add this constraint to an existing policy that is configured to apply only to selected repositories.
 
diff --git a/content/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces.md b/content/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces.md
index 38f09b7e56..ce0d4ff35f 100644
--- a/content/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces.md
+++ b/content/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces.md
@@ -18,7 +18,7 @@ product: '{% data reusables.gated-features.codespaces-org %}'
 
 {% data variables.product.prodname_dotcom %} users can set a personal retention period of less than 30 days for codespaces they create. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces)."
 
-As an organization owner, you may want to configure constraints on the maximum retention period for codespaces created for the repositories owned by your organization. This can help you to limit the storage costs associated with codespaces that are stopped and then left unused until they are automatically deleted. For more information about storage charges, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)." You can set a maximum retention period for all, or for specific, repositories owned by your organization.
+As an organization owner, you may want to configure constraints on the maximum retention period for codespaces created for the repositories owned by your organization. This can help you to limit the storage costs associated with codespaces that are stopped and then left unused until they are automatically deleted. For more information about storage charges, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)." You can set a maximum retention period for all, or for specific, repositories owned by your organization.
 
 {% note %}
 
diff --git a/content/codespaces/overview.md b/content/codespaces/overview.md
index 1e98643790..6b0cf6b5a2 100644
--- a/content/codespaces/overview.md
+++ b/content/codespaces/overview.md
@@ -19,7 +19,7 @@ topics:
 
 ## What is a codespace?
 
-A codespace is a development environment that's hosted in the cloud. You can customize your project for {% data variables.product.prodname_github_codespaces %} by committing configuration files to your repository (often known as Configuration-as-Code), which creates a repeatable codespace configuration for all users of your project. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers)."
+A codespace is a development environment that's hosted in the cloud. You can customize your project for {% data variables.product.prodname_github_codespaces %} by committing configuration files to your repository (often known as Configuration-as-Code), which creates a repeatable codespace configuration for all users of your project. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers)."
 
 Each codespace you create is hosted by {% data variables.product.prodname_dotcom %} in a Docker container, running on a virtual machine. You can choose from a selection of virtual machine types, from 2 cores, 8 GB RAM, and 32 GB storage, up to 32 cores, 64 GB RAM, and 128 GB storage.
 
@@ -38,7 +38,7 @@ Reasons for choosing to work in a codespace include:
 * **Work anywhere** - All you need is a web browser. You can work in a codespace on your own computer, on a friend's laptop, or on a tablet. Open your codespace and pick up from where you left off on a different device.
 * **Choose your editor** - Work in the browser in the {% data variables.product.prodname_vscode_shortname %} web client, or choose from a selection of desktop-based applications.
 * **Work on multiple projects** - You can use multiple codespaces to work on separate projects, or on different branches of the same repository, compartmentalizing your work to avoid changes made for one piece of work accidentally affecting something else you're working on.
-* **Pair program with a teammate** - If you work on a codespace in {% data variables.product.prodname_vscode_shortname %}, you can use Live Share to work collaboratively with other people on your team. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/working-collaboratively-in-a-codespace)."
+* **Pair program with a teammate** - If you work on a codespace in {% data variables.product.prodname_vscode_shortname %}, you can use Live Share to work collaboratively with other people on your team. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/working-collaboratively-in-a-codespace)."
 * **Publish your web app from a codespace** - Forward a port from your codespace and then share the URL, to allow teammates to try out the changes you've made to the application before you submit those changes in a pull request.
 * **Try out a framework** - {% data variables.product.prodname_github_codespaces %} reduces the setup time when you want to learn a new framework. Just create a codespace from one of the [quickstart templates](https://github.com/codespaces/templates).
 
@@ -62,9 +62,9 @@ If you create a codespace from an organization-owned repository, use of the code
 
 ### Using organization-owned codespaces
 
-Owners of organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for their members' and collaborators' use of {% data variables.product.prodname_github_codespaces %}. This applies to codespaces created from repositories owned by the organization. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)." You can set a spending limit for use of {% data variables.product.prodname_github_codespaces %} on your organization or enterprise account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
+Owners of organizations on {% data variables.product.prodname_team %} and {% data variables.product.prodname_enterprise %} plans can pay for their members' and collaborators' use of {% data variables.product.prodname_github_codespaces %}. This applies to codespaces created from repositories owned by the organization. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/choosing-who-owns-and-pays-for-codespaces-in-your-organization)." You can set a spending limit for use of {% data variables.product.prodname_github_codespaces %} on your organization or enterprise account. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
 
-If use of a codespace will be billed to an organization or enterprise, this is shown when the codespace is created. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)." Codespaces that are billed to an organization, or its parent enterprise, are owned by the organization and can be deleted by an organization owner. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/deleting-a-codespace#deleting-codespaces-in-your-organization)."
+If use of a codespace will be billed to an organization or enterprise, this is shown when the codespace is created. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)." Codespaces that are billed to an organization, or its parent enterprise, are owned by the organization and can be deleted by an organization owner. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/deleting-a-codespace#deleting-codespaces-in-your-organization)."
 
 {% data reusables.codespaces.when-you-can-create-codespaces %}
 
@@ -72,16 +72,16 @@ If use of a codespace will be billed to an organization or enterprise, this is s
 
 To customize the runtimes and tools in your codespace, you can create one or more dev container configurations for your repository. Adding dev container configurations to your repository allows you to define a choice of different development environments that are appropriate for the work people will do in your repository.
 
-If you create a codespace from a repository without any dev container configurations, {% data variables.product.prodname_github_codespaces %} will clone your repository into an environment with the default dev container image that includes many tools, languages, and runtime environments. If you create a codespace from a template, you might start with some initial configuration on top of the default image. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers)."
+If you create a codespace from a repository without any dev container configurations, {% data variables.product.prodname_github_codespaces %} will clone your repository into an environment with the default dev container image that includes many tools, languages, and runtime environments. If you create a codespace from a template, you might start with some initial configuration on top of the default image. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers)."
 
 You can personalize aspects of your codespace environment by using a public [dotfiles](https://dotfiles.github.io/tutorials/) repository. You can use dotfiles to set shell aliases and preferences, or to install your personal preference of the tools you like to use. If you use {% data variables.product.prodname_github_codespaces %} in the browser, or in {% data variables.product.prodname_vscode %}, you can use [Settings Sync](https://code.visualstudio.com/docs/editor/settings-sync) to give your codespace editor the same settings, keyboard shortcuts, snippets, and extensions that you have set up in your local installation of {% data variables.product.prodname_vscode %}.
 
-For more information, see "[AUTOTITLE](/codespaces/customizing-your-codespace)."
+See "[AUTOTITLE](/codespaces/customizing-your-codespace)."
 
 ## Billing for {% data variables.product.prodname_codespaces %}
 
-For information on pricing, storage, and usage for {% data variables.product.prodname_github_codespaces %}, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+For information on pricing, storage, and usage for {% data variables.product.prodname_github_codespaces %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 {% data reusables.codespaces.codespaces-spending-limit-requirement %}
 
-{% data reusables.codespaces.codespaces-monthly-billing %} For information on how organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_github_codespaces %} for an organization, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
+{% data reusables.codespaces.codespaces-monthly-billing %} For information on how organizations owners and billing managers can manage the spending limit for {% data variables.product.prodname_github_codespaces %} for an organization, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
diff --git a/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md b/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
index 7fdf561975..a01c83e5a6 100644
--- a/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds.md
@@ -28,7 +28,7 @@ When you create a codespace from a template on the "Your codespaces" page, {% da
 
 {% note %}
 
-**Note**: Each prebuild that's created consumes storage space that will either incur a billable charge or, for repositories owned by your personal {% data variables.product.prodname_dotcom %} account, will use some of your monthly included storage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
+**Note**: Each prebuild that's created consumes storage space that will either incur a billable charge or, for repositories owned by your personal {% data variables.product.prodname_dotcom %} account, will use some of your monthly included storage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
 
 {% endnote %}
 
@@ -38,7 +38,7 @@ To create a prebuild, you set up a prebuild configuration. When you save the con
 
 When a prebuild configuration workflow runs, {% data variables.product.prodname_dotcom %} creates a temporary codespace, performing setup operations up to and including any `onCreateCommand` and `updateContentCommand` commands in the `devcontainer.json` file. No `postCreateCommand` commands are run during the creation of a prebuild. For more information about these commands, see the [`devcontainer.json` reference](https://code.visualstudio.com/docs/remote/devcontainerjson-reference#_devcontainerjson-properties) in the {% data variables.product.prodname_vscode_shortname %} documentation. A snapshot of the generated container is then taken and stored.
 
-As with other {% data variables.product.prodname_actions %} workflows, running a prebuild configuration workflow will either consume some of the {% data variables.product.prodname_actions %} minutes included with your account, if you have any, or it will incur charges for {% data variables.product.prodname_actions %} minutes. Storage of codespace prebuilds is billed in the same way as storage of active or stopped codespaces. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
+As with other {% data variables.product.prodname_actions %} workflows, running a prebuild configuration workflow will either consume some of the {% data variables.product.prodname_actions %} minutes included with your account, if you have any, or it will incur charges for {% data variables.product.prodname_actions %} minutes. Storage of codespace prebuilds is billed in the same way as storage of active or stopped codespaces. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
 
 When you create a codespace from a prebuild, {% data variables.product.prodname_dotcom %} downloads the existing container snapshot from storage and deploys it on a fresh virtual machine, completing the remaining commands specified in the dev container configuration. Since many operations have already been performed, such as cloning the repository, creating a codespace from a prebuild can be substantially quicker than creating one without a prebuild. This is true where the repository is large and/or `onCreateCommand` commands take a long time to run.
 
diff --git a/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md b/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
index 7021ed06a0..00efa46bfc 100644
--- a/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/configuring-prebuilds.md
@@ -15,23 +15,23 @@ product: '{% data reusables.gated-features.codespaces-repo %}'
 
 You can set up a prebuild configuration for the combination of a specific branch of your repository with a specific dev container configuration file.
 
-Any branches created from a prebuild-enabled parent branch will typically also get prebuilds for the same dev container configuration. This is because prebuilds for child branches that use the same dev container configuration as the parent branch are, for the most part, identical, so developers can benefit from faster codespace creation times on those branches also. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers)."
+Any branches created from a prebuild-enabled parent branch will typically also get prebuilds for the same dev container configuration. This is because prebuilds for child branches that use the same dev container configuration as the parent branch are, for the most part, identical, so developers can benefit from faster codespace creation times on those branches also. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers)."
 
 Typically, when you configure prebuilds for a branch, prebuilds will be available for multiple machine types. However, if your repository is greater than 32 GB, prebuilds won't be available for 2-core and 4-core machine types, since the storage these provide is limited to 32 GB.
 
 ## Prerequisites
 
-Prebuilds are created using {% data variables.product.prodname_actions %}. As a result, {% data variables.product.prodname_actions %} must be enabled for the repository for which you are configuring prebuilds. For more information, see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository)."
+Prebuilds are created using {% data variables.product.prodname_actions %}. As a result, {% data variables.product.prodname_actions %} must be enabled for the repository for which you are configuring prebuilds. See "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-github-actions-settings-for-a-repository)."
 
 You can set up prebuilds in any repository owned by a personal account. The prebuild will consume storage space that will either incur a billable charge or, for repositories owned by your personal account, will use some of your monthly included storage.
 
 {% note %}
 
-**Note**: {% data reusables.codespaces.prebuilds-billing-for-forks %} For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#how-billing-is-handled-for-forked-repositories)."
+**Note**: {% data reusables.codespaces.prebuilds-billing-for-forks %} See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#how-billing-is-handled-for-forked-repositories)."
 
 {% endnote %}
 
-For repositories owned by an organization, you can set up prebuilds if the organization is on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan. Additionally, you must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %} on the organization account or its parent enterprise. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
+For repositories owned by an organization, you can set up prebuilds if the organization is on a {% data variables.product.prodname_team %} or {% data variables.product.prodname_enterprise %} plan. Additionally, you must have added a payment method and set a spending limit for {% data variables.product.prodname_github_codespaces %} on the organization account or its parent enterprise. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces#managing-the-github-codespaces-spending-limit-for-your-organization-account)" and "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)."
 
 ## Configuring prebuilds
 
@@ -50,7 +50,7 @@ For repositories owned by an organization, you can set up prebuilds if the organ
 
    {% endnote %}
 
-1. Optionally, in the **Configuration file** dropdown menu that's displayed, choose the `devcontainer.json` configuration file that you want to use for your prebuilds. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#devcontainerjson)."
+1. Optionally, in the **Configuration file** dropdown menu that's displayed, choose the `devcontainer.json` configuration file that you want to use for your prebuilds. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#devcontainerjson)."
 
    ![Screenshot of the configuration file dropdown menu. Four configuration files are listed, with ".devcontainer/devcontainer.json" currently selected.](/assets/images/help/codespaces/prebuilds-choose-configfile.png)
 
@@ -84,8 +84,8 @@ For repositories owned by an organization, you can set up prebuilds if the organ
    {% note %}
 
    **Notes**:
-   * The prebuild in each region incurs individual storage charges. You should, therefore, only enable prebuilds for regions in which you know they'll be used. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
-   * Developers can set their default region for {% data variables.product.prodname_github_codespaces %}, which can allow you to enable prebuilds for fewer regions. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-default-region-for-github-codespaces)."
+   * The prebuild in each region incurs individual storage charges. You should, therefore, only enable prebuilds for regions in which you know they'll be used. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
+   * Developers can set their default region for {% data variables.product.prodname_github_codespaces %}, which can allow you to enable prebuilds for fewer regions. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-default-region-for-github-codespaces)."
 
    {% endnote %}
 
@@ -97,7 +97,7 @@ For repositories owned by an organization, you can set up prebuilds if the organ
 
    If you set the number of prebuild versions to save to 1, {% data variables.product.prodname_github_codespaces %} will only save the latest version of the prebuild and will delete the older version each time the template is updated. This means you will not get a prebuilt codespace if you go back to an older dev container configuration.
 
-   There is a storage cost associated with each prebuild version that's retained. For example, if you are generating prebuilds in 4 regions and retaining 2 versions, you will be charged for storage of up to 8 prebuilds. For more information on billing, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
+   There is a storage cost associated with each prebuild version that's retained. For example, if you are generating prebuilds in 4 regions and retaining 2 versions, you will be charged for storage of up to 8 prebuilds. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
 
 1. Optionally, add users or teams to notify when the prebuild workflow run fails for this configuration. You can begin typing a username, team name, or full name, then click the name once it appears to add them to the list. The users or teams you add will receive an email when prebuild failures occur, containing a link to the workflow run logs to help with further investigation.
 
@@ -105,7 +105,7 @@ For repositories owned by an organization, you can set up prebuilds if the organ
 
    {% note %}
 
-   **Note**: People will only receive notifications of failed prebuilds if they have enabled notifications for failed Actions workflows in their personal settings. For more information, see "[AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#github-actions-notification-options)."
+   **Note**: People will only receive notifications of failed prebuilds if they have enabled notifications for failed Actions workflows in their personal settings. See "[AUTOTITLE](/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#github-actions-notification-options)."
 
    {% endnote %}
 
@@ -113,7 +113,7 @@ For repositories owned by an organization, you can set up prebuilds if the organ
 
    ![Screenshot of the bottom of the prebuilds configuration page. The link "Show advanced options" is highlighted with a dark orange outline.](/assets/images/help/codespaces/show-advanced-options.png)
 
-   In the "Advanced options" section, if you select **Disable prebuild optimization**, codespaces will be created without a prebuild if the latest prebuild workflow has failed or is currently running. For more information, see "[AUTOTITLE](/codespaces/troubleshooting/troubleshooting-prebuilds#preventing-out-of-date-prebuilds-being-used)."
+   In the "Advanced options" section, if you select **Disable prebuild optimization**, codespaces will be created without a prebuild if the latest prebuild workflow has failed or is currently running. See "[AUTOTITLE](/codespaces/troubleshooting/troubleshooting-prebuilds#preventing-out-of-date-prebuilds-being-used)."
 
 1. Click **Create**.
 
@@ -127,13 +127,13 @@ For information about editing and deleting prebuild configurations, see "[AUTOTI
 
 ## Configuring environment variables
 
-To allow the prebuild process to access environment variables required to create your development environment, you can set these either as {% data variables.product.prodname_codespaces %} repository secrets or as {% data variables.product.prodname_codespaces %} organization secrets. Secrets that you create in this way will be accessible by anyone who creates a codespace from this repository. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/managing-development-environment-secrets-for-your-repository-or-organization#adding-secrets-for-a-repository)."
+To allow the prebuild process to access environment variables required to create your development environment, you can set these either as {% data variables.product.prodname_codespaces %} repository secrets or as {% data variables.product.prodname_codespaces %} organization secrets. Secrets that you create in this way will be accessible by anyone who creates a codespace from this repository. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/managing-development-environment-secrets-for-your-repository-or-organization#adding-secrets-for-a-repository)."
 
 Prebuilds cannot use any user-level secrets while building your environment, because these are not available until after the codespace has been created.
 
 ## Configuring time-consuming tasks to be included in the prebuild
 
-You can use the `onCreateCommand` and `updateContentCommand` commands in your `devcontainer.json` to include time-consuming processes as part of the prebuild creation. For more information, see the {% data variables.product.prodname_vscode %} documentation, "[devcontainer.json reference](https://code.visualstudio.com/docs/remote/devcontainerjson-reference#_lifecycle-scripts)."
+You can use the `onCreateCommand` and `updateContentCommand` commands in your `devcontainer.json` to include time-consuming processes as part of the prebuild creation. See the {% data variables.product.prodname_vscode %} documentation, "[devcontainer.json reference](https://code.visualstudio.com/docs/remote/devcontainerjson-reference#_lifecycle-scripts)."
 
 `onCreateCommand` is run only once, when the prebuild is created, whereas `updateContentCommand` is run at creation of the prebuild and at subsequent updates to it. Incremental builds should be included in `updateContentCommand` since they represent the source of your project and need to be included for every prebuild update.
 
diff --git a/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md b/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md
index bc20baea74..3f351084e6 100644
--- a/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md
+++ b/content/codespaces/prebuilding-your-codespaces/managing-prebuilds.md
@@ -23,11 +23,11 @@ Depending on the settings in a prebuild configuration, the workflow to update th
 * A schedule that you've defined in the prebuild configuration
 * Manually triggering the workflow
 
-The settings in the prebuild configuration determine which events automatically trigger an update of the prebuild. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
+The settings in the prebuild configuration determine which events automatically trigger an update of the prebuild. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
 
 People with admin access to a repository can check the progress of prebuilds, edit, and delete prebuild configurations.
 
-To locate all repositories that are hosting a prebuild configuration, you must obtain a copy of your usage report by following the steps for "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+To locate all repositories that are hosting a prebuild configuration, you must obtain a copy of your usage report by following the steps for "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 ## Viewing the progress of prebuilds
 
@@ -77,7 +77,7 @@ Disabling the workflow runs for a prebuild configuration is useful if you need t
 
 {% note %}
 
-**Note**: You can find a list of the repositories that contain a prebuild by obtaining a copy of your “[usage report](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage).”
+**Note**: You can find a list of the repositories that contain a prebuild by obtaining a copy of your “[usage report](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage).”
 
 {% endnote %}
 
diff --git a/content/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers.md b/content/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers.md
index a2e1d4ec8c..a5969c6104 100644
--- a/content/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers.md
+++ b/content/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers.md
@@ -23,21 +23,21 @@ topics:
 
 Development containers, or dev containers, are Docker containers that are specifically configured to provide a fully featured development environment. Whenever you work in a codespace, you are using a dev container on a virtual machine.
 
-You can configure the dev container for a repository so that codespaces created for that repository give you a tailored development environment, complete with all the tools and runtimes you need to work on a specific project. If you don't define a configuration in the repository then {% data variables.product.prodname_github_codespaces %} uses a default configuration, which contains many of the common tools that your team might need for development with your project. For more information, see "[Using the default dev container configuration](#using-the-default-dev-container-configuration)."
+You can configure the dev container for a repository so that codespaces created for that repository give you a tailored development environment, complete with all the tools and runtimes you need to work on a specific project. If you don't define a configuration in the repository then {% data variables.product.prodname_github_codespaces %} uses a default configuration, which contains many of the common tools that your team might need for development with your project. See "[Using the default dev container configuration](#using-the-default-dev-container-configuration)."
 
-The configuration files for a dev container are contained in a `.devcontainer` directory in your repository. You can use {% data variables.product.prodname_vscode %} to add configuration files for you. You can choose from a selection of predefined configurations for various project types. You can use these without further configuration, or you can edit the configurations to refine the development environment they produce. For more information, see "[Using a predefined dev container configuration](#using-a-predefined-dev-container-configuration)."
+The configuration files for a dev container are contained in a `.devcontainer` directory in your repository. You can use {% data variables.product.prodname_vscode %} to add configuration files for you. You can choose from a selection of predefined configurations for various project types. You can use these without further configuration, or you can edit the configurations to refine the development environment they produce. See "[Using a predefined dev container configuration](#using-a-predefined-dev-container-configuration)."
 
-Alternatively, you can add your own custom configuration files. For more information, see "[Creating a custom dev container configuration](#creating-a-custom-dev-container-configuration)."
+Alternatively, you can add your own custom configuration files. See "[Creating a custom dev container configuration](#creating-a-custom-dev-container-configuration)."
 
 You can define a single dev container configuration for a repository, different configurations for different branches, or multiple configurations. When multiple configurations are available, users can choose their preferred configuration when they create a codespace. This is particularly useful for large repositories that contain source code in different programming languages or for different projects. You can create a choice of configurations that allow different teams to work in a codespace that's set up appropriately for the work they are doing.
 
-When you create a codespace from a template, you might start with one or more dev container configuration files in your workspace. To configure your environment further, you can add or remove settings from these files and rebuild the container to apply the changes to the codespace you're working in. If you publish your codespace to a repository on {% data variables.product.product_name %}, then any codespaces created from that repository will share the configuration you've defined. For more information, see "[Applying configuration changes to a codespace](#applying-configuration-changes-to-a-codespace)" and "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-from-a-template#publishing-to-a-remote-repository)."
+When you create a codespace from a template, you might start with one or more dev container configuration files in your workspace. To configure your environment further, you can add or remove settings from these files and rebuild the container to apply the changes to the codespace you're working in. If you publish your codespace to a repository on {% data variables.product.product_name %}, then any codespaces created from that repository will share the configuration you've defined. See "[Applying configuration changes to a codespace](#applying-configuration-changes-to-a-codespace)" and "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-from-a-template#publishing-to-a-remote-repository)."
 
 ### devcontainer.json
 
 The primary file in a dev container configuration is the `devcontainer.json` file. You can use this file to determine the environment of codespaces created for your repository. The contents of this file define a dev container that can include frameworks, tools, extensions, and port forwarding. The `devcontainer.json` file usually contains a reference to a Dockerfile, which is typically located alongside the `devcontainer.json` file.
 
-If you create a codespace from a repository without a `devcontainer.json` file, or if you start from {% data variables.product.company_short %}'s blank template, the default dev container configuration is used. For more information, see "[Using the default dev container configuration](#using-the-default-dev-container-configuration)."
+If you create a codespace from a repository without a `devcontainer.json` file, or if you start from {% data variables.product.company_short %}'s blank template, the default dev container configuration is used. See "[Using the default dev container configuration](#using-the-default-dev-container-configuration)."
 
 The `devcontainer.json` file is usually located in the `.devcontainer` directory of your repository. Alternatively, you can locate it directly in the root of the repository, in which case the file name must begin with a period: `.devcontainer.json`.
 
@@ -55,7 +55,7 @@ For information about how to choose your preferred dev container configuration w
 
 It's useful to think of the `devcontainer.json` file as providing "customization" rather than "personalization." You should only include things that everyone working on your codebase needs as standard elements of the development environment, not things that are personal preferences. Things like linters are good to standardize on, and to require everyone to have installed, so they're good to include in your `devcontainer.json` file. Things like user interface decorators or themes are personal choices that should not be put in the `devcontainer.json` file.
 
-You can personalize your codespaces by using dotfiles and Settings Sync. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/personalizing-github-codespaces-for-your-account)."
+You can personalize your codespaces by using dotfiles and Settings Sync. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/personalizing-github-codespaces-for-your-account)."
 
 ### Dockerfile
 
@@ -67,7 +67,7 @@ The Dockerfile for a dev container is typically located in the `.devcontainer` f
 
 {% note %}
 
-**Note**: As an alternative to using a Dockerfile you can use the `image` property in the `devcontainer.json` file to refer directly to an existing image you want to use. The image you specify here must be allowed by any organization image policy that has been set. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-base-image-for-codespaces)." If neither a Dockerfile nor an image is found then the default container image is used. For more information, see "[Using the default dev container configuration](#using-the-default-dev-container-configuration)."
+**Note**: As an alternative to using a Dockerfile you can use the `image` property in the `devcontainer.json` file to refer directly to an existing image you want to use. The image you specify here must be allowed by any organization image policy that has been set. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-base-image-for-codespaces)." If neither a Dockerfile nor an image is found then the default container image is used. See "[Using the default dev container configuration](#using-the-default-dev-container-configuration)."
 
 {% endnote %}
 
@@ -77,7 +77,7 @@ The following example uses four instructions:
 
 `ARG` defines a build-time variable.
 
-`FROM` specifies the parent image on which the generated Docker image will be based. If a base image policy has been configured, allowing only certain images to be used, the specified image must match one of the image references in the policy. If it does not, codespaces for this repository will be created in recovery mode. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-base-image-for-codespaces)."
+`FROM` specifies the parent image on which the generated Docker image will be based. If a base image policy has been configured, allowing only certain images to be used, the specified image must match one of the image references in the policy. If it does not, codespaces for this repository will be created in recovery mode. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-base-image-for-codespaces)."
 
 `COPY` copies a file from the repository and adds it to the filesystem of the codespace.
 
@@ -120,7 +120,7 @@ To use a Dockerfile as part of a dev container configuration, reference it in yo
 }
 ```
 
-Various options are available to you if you want to use existing container orchestration in your dev container. For more information, see the "Orchestration options" section of the [Specification](https://containers.dev/implementors/spec/#orchestration-options) on the Development Containers website.
+Various options are available to you if you want to use existing container orchestration in your dev container. See the "Orchestration options" section of the [Specification](https://containers.dev/implementors/spec/#orchestration-options) on the Development Containers website.
 
 ## Using the default dev container configuration
 
@@ -132,7 +132,7 @@ The default configuration is a good option if you're working on a small project
 
 {% note %}
 
-**Note**: {% data variables.product.prodname_dotcom %} does not charge for storage of containers built from the default dev container image. For more information about billing for codespace storage, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)." {% data reusables.codespaces.check-for-default-image %}
+**Note**: {% data variables.product.prodname_dotcom %} does not charge for storage of containers built from the default dev container image. For more information about billing for codespace storage, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)." {% data reusables.codespaces.check-for-default-image %}
 
 {% endnote %}
 
@@ -165,7 +165,7 @@ You can add a predefined dev container configuration either while working in a c
 
 ### Adding additional features to your `devcontainer.json` file
 
-{% data reusables.codespaces.about-features %} For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/configuring-dev-containers/adding-features-to-a-devcontainer-file?tool=vscode)."
+{% data reusables.codespaces.about-features %} See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/configuring-dev-containers/adding-features-to-a-devcontainer-file?tool=vscode)."
 
 ## Creating a custom dev container configuration
 
@@ -178,11 +178,11 @@ If none of the predefined configurations meets your needs, you can create a cust
 
    **Notes**:
   * You can't locate your `devcontainer.json` files in directories more than one level below `.devcontainer`. For example, a file at `.devcontainer/teamA/devcontainer.json` will work, but `.devcontainer/teamA/testing/devcontainer.json` will not.
-  * {% data reusables.codespaces.configuration-choice-templates %} For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/setting-up-a-template-repository-for-github-codespaces)."
+  * {% data reusables.codespaces.configuration-choice-templates %} See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/setting-up-a-template-repository-for-github-codespaces)."
 
    {% endnote %}
 
-   If multiple `devcontainer.json` files are found in the repository, they are listed in the **Dev container configuration** dropdown on the codespace creation options page. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)."
+   If multiple `devcontainer.json` files are found in the repository, they are listed in the **Dev container configuration** dropdown on the codespace creation options page. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)."
 
    ![Screenshot of the codespace creation options page, showing a dropdown listing a choice of configuration files.](/assets/images/help/codespaces/configuration-file-choice.png)
 
@@ -194,7 +194,7 @@ If you don't already have a `devcontainer.json` file in your repository, you can
 
    ![Screenshot of the "Code" dropdown, and, within it, another dropdown with the "Configure dev container" option highlighted.](/assets/images/help/codespaces/configure-dev-container.png)
 
-A new `.devcontainer/devcontainer.json` file will open in the editor. The file will contain some initial properties, including a `features` object to which you can add new tools, libraries, or runtimes. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/configuring-dev-containers/adding-features-to-a-devcontainer-file?tool=webui)."
+A new `.devcontainer/devcontainer.json` file will open in the editor. The file will contain some initial properties, including a `features` object to which you can add new tools, libraries, or runtimes. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/configuring-dev-containers/adding-features-to-a-devcontainer-file?tool=webui)."
 
 If your repository already contains one or more `devcontainer.json` files, then clicking **Configure dev container** will open the existing `devcontainer.json` file with the highest precedence according to the [specification](https://containers.dev/implementors/spec/#devcontainerjson) on the Development Containers website.
 
@@ -210,7 +210,7 @@ In the following screenshot, the repository does not contain `.devcontainer/devc
 
 You can add and edit the supported configuration keys in the `devcontainer.json` file to specify aspects of the codespace's environment, like which {% data variables.product.prodname_vscode_shortname %} extensions will be installed. {% data reusables.codespaces.more-info-devcontainer %}
 
-The `devcontainer.json` file is written using the JSONC (JSON with comments) format. This allows you to include comments within the configuration file. For more information, see "[Editing JSON with {% data variables.product.prodname_vscode_shortname %}](https://code.visualstudio.com/docs/languages/json#_json-with-comments)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
+The `devcontainer.json` file is written using the JSONC (JSON with comments) format. This allows you to include comments within the configuration file. See "[Editing JSON with {% data variables.product.prodname_vscode_shortname %}](https://code.visualstudio.com/docs/languages/json#_json-with-comments)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
 
 {% note %}
 
diff --git a/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/setting-up-a-template-repository-for-github-codespaces.md b/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/setting-up-a-template-repository-for-github-codespaces.md
index 0eb35a299f..17125b0f8f 100644
--- a/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/setting-up-a-template-repository-for-github-codespaces.md
+++ b/content/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/setting-up-a-template-repository-for-github-codespaces.md
@@ -23,7 +23,7 @@ To help users find your template and get started quickly, you can share a link t
 
 When someone creates a codespace from your template, the contents of your template repository will be cloned into their codespace. When the user is ready, they will be able to publish their work to a new repository on {% data variables.product.product_name %} belonging to their personal account. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-from-a-template)."
 
-Organizations can pay for members of the organization and outside collaborators to use {% data variables.product.prodname_github_codespaces %} at the organization's expense. This includes codespaces created from template repositories owned by the organization. However, if a user publishes a codespace created from a template to their personal account, ownership and billing of the codespace transfers to the user who created the codespace. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#how-billing-is-handled-for-github-codespaces-templates)."
+Organizations can pay for members of the organization and outside collaborators to use {% data variables.product.prodname_github_codespaces %} at the organization's expense. This includes codespaces created from template repositories owned by the organization. However, if a user publishes a codespace created from a template to their personal account, ownership and billing of the codespace transfers to the user who created the codespace. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#how-billing-is-handled-for-github-codespaces-templates)."
 
 ## Describe your template
 
diff --git a/content/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces.md b/content/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces.md
index e430e78173..8d81ff8053 100644
--- a/content/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces.md
+++ b/content/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces.md
@@ -14,17 +14,17 @@ type: how_to
 
 By default, {% data variables.product.prodname_github_codespaces %} are automatically deleted after they have been stopped and have remained inactive for 30 days.
 
-However, because {% data variables.product.prodname_github_codespaces %} incurs storage charges, you may prefer to reduce the retention period by changing your default period in your personal settings for {% data variables.product.prodname_github_codespaces %}. For more information about storage charges, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
+However, because {% data variables.product.prodname_github_codespaces %} incurs storage charges, you may prefer to reduce the retention period by changing your default period in your personal settings for {% data variables.product.prodname_github_codespaces %}. For more information about storage charges, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
 
 {% note %}
 
-**Note**: Whether or not you have set a personal codespace retention period, it's a good idea to get into the habit of deleting codespaces that you no longer need. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/deleting-a-codespace)."
+**Note**: Whether or not you have set a personal codespace retention period, it's a good idea to get into the habit of deleting codespaces that you no longer need. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/deleting-a-codespace)."
 
 {% endnote %}
 
 Automatic deletion happens irrespective of whether a codespace contains unpushed changes. To prevent automatic deletion of a codespace, just open the codespace again. The retention period is reset every time you connect to a codespace, and the retention countdown restarts when the codespace is stopped.
 
-If a repository belongs to an organization, the organization owner may have set a retention period for the whole organization. If this period is less than the default retention period in your personal settings then the organization retention period will apply to codespaces you create for this repository. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)."
+If a repository belongs to an organization, the organization owner may have set a retention period for the whole organization. If this period is less than the default retention period in your personal settings then the organization retention period will apply to codespaces you create for this repository. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-the-retention-period-for-codespaces)."
 
 Each codespace has its own retention period. You may, therefore, have codespaces with different retention periods. For example, if:
 * You created a codespace, changed your default retention period, then created another codespace.
@@ -51,7 +51,7 @@ Each codespace has its own retention period. You may, therefore, have codespaces
 
    {% warning %}
 
-   **Warning**: Setting the period to `0` will result in your codespaces being immediately deleted when you stop them, or when they timeout due to inactivity. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces)."
+   **Warning**: Setting the period to `0` will result in your codespaces being immediately deleted when you stop them, or when they timeout due to inactivity. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces)."
 
    {% endwarning %}
 
@@ -79,7 +79,7 @@ You may have a codespace that you want to keep for longer than the retention per
 
 {% endnote %}
 
-Codespaces incur storage costs, or consume your included storage allowance if the codespace is owned by your personal {% data variables.product.prodname_dotcom %} account. You should therefore be aware of the cost implications of storing codespaces indefinitely. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)."
+Codespaces incur storage costs, or consume your included storage allowance if the codespace is owned by your personal {% data variables.product.prodname_dotcom %} account. You should therefore be aware of the cost implications of storing codespaces indefinitely. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)."
 
 {% data reusables.codespaces.your-codespaces-procedure-step %}
 1. To the right of the codespace you want to exempt from automatic deletion, click {% octicon "kebab-horizontal" aria-label="Codespace configuration" %}, then click **{% octicon "bookmark" aria-hidden="true" %} Keep codespace**.
diff --git a/content/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces.md b/content/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces.md
index ff37daa226..256ec78152 100644
--- a/content/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces.md
+++ b/content/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces.md
@@ -19,7 +19,7 @@ A codespace will stop running after a period of inactivity. By default this peri
 
 {% warning %}
 
-**Warning**: Codespaces compute usage is billed for the duration for which a codespace is active. If you're not using a codespace but it remains running, and hasn't yet timed out, you are billed for the total time that the codespace was active, irrespective of whether you were using it. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
+**Warning**: Codespaces compute usage is billed for the duration for which a codespace is active. If you're not using a codespace but it remains running, and hasn't yet timed out, you are billed for the total time that the codespace was active, irrespective of whether you were using it. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#codespaces-pricing)."
 
 {% endwarning %}
 
diff --git a/content/codespaces/the-githubdev-web-based-editor.md b/content/codespaces/the-githubdev-web-based-editor.md
index 8b2859df77..580d9fea07 100644
--- a/content/codespaces/the-githubdev-web-based-editor.md
+++ b/content/codespaces/the-githubdev-web-based-editor.md
@@ -25,7 +25,7 @@ The {% data variables.codespaces.serverless %} editor introduces a lightweight e
 
 The {% data variables.codespaces.serverless %} editor is available to everyone for free on {% data variables.product.prodname_dotcom_the_website %}.
 
-The {% data variables.codespaces.serverless %} editor provides many of the benefits of {% data variables.product.prodname_vscode %}, such as search, syntax highlighting, and a source control view. You can also use Settings Sync to share your own {% data variables.product.prodname_vscode_shortname %} settings with the editor. For more information, see "[Settings Sync](https://code.visualstudio.com/docs/editor/settings-sync)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
+The {% data variables.codespaces.serverless %} editor provides many of the benefits of {% data variables.product.prodname_vscode %}, such as search, syntax highlighting, and a source control view. You can also use Settings Sync to share your own {% data variables.product.prodname_vscode_shortname %} settings with the editor. See "[Settings Sync](https://code.visualstudio.com/docs/editor/settings-sync)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
 
 The {% data variables.codespaces.serverless %} editor runs entirely in your browser’s sandbox. The editor doesn’t clone the repository, but instead uses the [GitHub Repositories extension](https://code.visualstudio.com/docs/editor/github#_github-repositories-extension) to carry out most of the functionality that you will use. Your work is saved in the browser’s local storage until you commit it. You should commit your changes regularly to ensure that they're always accessible.
 
@@ -52,12 +52,12 @@ Both {% data variables.codespaces.serverless %} and {% data variables.product.pr
 
 || {% data variables.codespaces.serverless %} | {% data variables.product.prodname_github_codespaces %}|
 |-|----------------|---------|
-| **Cost** | Free.      | Free monthly quota of usage for personal accounts. For information on pricing, see "[AUTOTITLE](/free-pro-team@latest/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-github-codespaces-pricing)."|
+| **Cost** | Free.      | Free monthly quota of usage for personal accounts. For information on pricing, see "[AUTOTITLE](/free-pro-team@latest/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-github-codespaces-pricing)."|
 | **Availability** | Available to everyone on GitHub.com. | Available to everyone on GitHub.com. |
-| **Start up** | {% data variables.codespaces.serverless %} opens instantly with a key-press and you can start using it right away, without having to wait for additional configuration or installation. | When you create or resume a codespace, the codespace is assigned a VM and the container is configured based on the contents of a `devcontainer.json` file. This set up may take a few minutes to create the environment. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository)." |
+| **Start up** | {% data variables.codespaces.serverless %} opens instantly with a key-press and you can start using it right away, without having to wait for additional configuration or installation. | When you create or resume a codespace, the codespace is assigned a VM and the container is configured based on the contents of a `devcontainer.json` file. This set up may take a few minutes to create the environment. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/creating-a-codespace-for-a-repository)." |
 | **Compute**  | There is no associated compute, so you won’t be able to build and run your code or use the integrated terminal. | With  {%  data variables.product.prodname_github_codespaces %}, you get the power of a dedicated VM on which you can run and debug your application.|
 | **Terminal access** | None. | {% data variables.product.prodname_github_codespaces %} provides a common set of tools by default, meaning that you can use the Terminal exactly as you would in your local environment.|
-| **Extensions**  | Only a subset of extensions that can run in the web will appear in the Extensions View and can be installed. For more information, see "[Using extensions](#using-extensions)."| With {% data variables.product.prodname_github_codespaces %}, you can use most extensions from the {% data variables.product.prodname_vscode_marketplace %}.|
+| **Extensions**  | Only a subset of extensions that can run in the web will appear in the Extensions View and can be installed. See "[Using extensions](#using-extensions)."| With {% data variables.product.prodname_github_codespaces %}, you can use most extensions from the {% data variables.product.prodname_vscode_marketplace %}.|
 
 {% endrowheaders %}
 
@@ -73,7 +73,7 @@ To continue your work in a codespace, click **Continue Working on…** and selec
 
 When you use {% data variables.codespaces.serverless %}, all actions are managed through the "Source Control" view, which is located in the Activity Bar on the left hand side. For more information on the "Source Control" view, see "[Version Control](https://code.visualstudio.com/docs/editor/versioncontrol)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
 
-Because {% data variables.codespaces.serverless %} uses the GitHub Repositories extension to power its functionality, you can switch branches without needing to stash changes. For more information, see "[GitHub Repositories](https://code.visualstudio.com/docs/editor/github#_github-repositories-extension)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
+Because {% data variables.codespaces.serverless %} uses the GitHub Repositories extension to power its functionality, you can switch branches without needing to stash changes. See "[GitHub Repositories](https://code.visualstudio.com/docs/editor/github#_github-repositories-extension)" in the {% data variables.product.prodname_vscode_shortname %} documentation.
 
 ### Create a new branch
 
diff --git a/content/codespaces/troubleshooting/exporting-changes-to-a-branch.md b/content/codespaces/troubleshooting/exporting-changes-to-a-branch.md
index ef57de8e95..e2edd4595c 100644
--- a/content/codespaces/troubleshooting/exporting-changes-to-a-branch.md
+++ b/content/codespaces/troubleshooting/exporting-changes-to-a-branch.md
@@ -12,7 +12,7 @@ shortTitle: Exporting changes
 
 ## About exporting changes
 
-While using {% data variables.product.prodname_github_codespaces %}, you may want to export your changes to a branch without launching your codespace. This can be useful when you have hit a [spending limit](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces) or have a general issue accessing your codespace.
+While using {% data variables.product.prodname_github_codespaces %}, you may want to export your changes to a branch without launching your codespace. This can be useful when you have hit a [spending limit](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces) or have a general issue accessing your codespace.
 
 You can export your changes in one of several ways, depending on how you created the codespace. In every case, only the Git branch that is currently checked out in the codespace is exported. Work contained in other branches is not exported.
 
diff --git a/content/codespaces/troubleshooting/troubleshooting-creation-and-deletion-of-codespaces.md b/content/codespaces/troubleshooting/troubleshooting-creation-and-deletion-of-codespaces.md
index 037bddd9d3..e4d5df750a 100644
--- a/content/codespaces/troubleshooting/troubleshooting-creation-and-deletion-of-codespaces.md
+++ b/content/codespaces/troubleshooting/troubleshooting-creation-and-deletion-of-codespaces.md
@@ -27,7 +27,7 @@ If you can't create a codespace for a repository, this may be due to one of the
 
 For information about other organization and enterprise settings that can affect whether you can create a codespace, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/enabling-or-disabling-github-codespaces-for-your-organization#prerequisites-for-enabling-github-codespaces)."
 
-For more information about included usage for personal accounts, and setting a spending limit, see "[AUTOTITLE](/free-pro-team@latest/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)" and "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
+For more information about included usage for personal accounts, and setting a spending limit, see "[AUTOTITLE](/free-pro-team@latest/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/managing-the-spending-limit-for-github-codespaces)."
 
 ### Codespace does not open when created
 
diff --git a/content/codespaces/troubleshooting/troubleshooting-included-usage.md b/content/codespaces/troubleshooting/troubleshooting-included-usage.md
index cd676c7172..6ffce5e2ca 100644
--- a/content/codespaces/troubleshooting/troubleshooting-included-usage.md
+++ b/content/codespaces/troubleshooting/troubleshooting-included-usage.md
@@ -27,7 +27,7 @@ The amount of free usage provided on your personal account every month is design
 
 {% data variables.product.prodname_codespaces %} compute is counted in core hours, which is the sum of the time a codespace is active, multiplied by the multiplier for the codespace's machine type: for example, a multiplier of 2 for a 2-core machine, or a multiplier of 8 for an 8-core machine. A codespace becomes active when you create it or start it. A codespace stops being active when you stop it or delete it, or when it is stopped or deleted automatically.
 
-The default idle timeout, which stops a codespace after a period of inactivity, is 30 minutes. You can reduce this if required. For more information, see the "About billing for compute usage" section of "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-compute-usage)."
+The default idle timeout, which stops a codespace after a period of inactivity, is 30 minutes. You can reduce this if required. See the "About billing for compute usage" section of "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-compute-usage)."
 
 ## About {% data variables.product.prodname_codespaces %} storage
 
@@ -37,27 +37,27 @@ You can see the storage usage for each of your codespaces on the "Your codespace
 
 {% note %}
 
-**Note**: If the dev container for a codespace was built from the default image, the size of the codespace shown on this page does not include the size of the base dev container. Storage for the base dev container is provided free of charge. For more information, see "[Storage usage for your base dev container](#storage-usage-for-your-base-dev-container)".
+**Note**: If the dev container for a codespace was built from the default image, the size of the codespace shown on this page does not include the size of the base dev container. Storage for the base dev container is provided free of charge. See "[Storage usage for your base dev container](#storage-usage-for-your-base-dev-container)".
 
 {% endnote %}
 
-For billing purposes, {% data variables.product.prodname_codespaces %} storage is counted in GB-months. This is a cumulative measure of the total storage each codespace consumes from creation to deletion, plus the storage for prebuilds. For more information, see the "Billing for storage usage" section of "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)."
+For billing purposes, {% data variables.product.prodname_codespaces %} storage is counted in GB-months. This is a cumulative measure of the total storage each codespace consumes from creation to deletion, plus the storage for prebuilds. See the "Billing for storage usage" section of "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-storage-usage)."
 
 ### Where did my monthly storage go?
 
 Deleting codespaces you're not using will avoid using up the free storage included in your personal account unnecessarily. However, if you have set up prebuild configurations, your included storage may continue to diminish during your monthly billing cycle.
 
-Although prebuilds are not listed on the "Your codespaces" page, prebuilds created for a repository consume storage even if you do not currently have any codespaces for that repository. To avoid this, you can delete the prebuilds configurations you set up. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)" and "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/managing-prebuilds#deleting-a-prebuild-configuration)."
+Although prebuilds are not listed on the "Your codespaces" page, prebuilds created for a repository consume storage even if you do not currently have any codespaces for that repository. To avoid this, you can delete the prebuilds configurations you set up. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)" and "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/managing-prebuilds#deleting-a-prebuild-configuration)."
 
 ## Understanding your {% data variables.product.prodname_codespaces %} usage
 
-You can check the cumulative {% data variables.product.prodname_github_codespaces %} usage for your current monthly billing cycle in your {% data variables.product.prodname_dotcom %} settings. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+You can check the cumulative {% data variables.product.prodname_github_codespaces %} usage for your current monthly billing cycle in your {% data variables.product.prodname_dotcom %} settings. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 ![Screenshot of the "{% data variables.product.prodname_codespaces %}" section of the billing page showing figures for "Usage hours" and "Storage."](/assets/images/help/codespaces/view-personal-usage-collapsed.png)
 
 You can expand the "Usage hours" and "Storage" section for more information - for example, to see how much of the consumed storage was used by prebuilds.
 
-For more specific information - for example, if you want to know which repositories have prebuilds that are consuming storage - you can generate a usage report. The usage report is a CSV file that's emailed to you. For more information on how to generate a usage report, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+For more specific information - for example, if you want to know which repositories have prebuilds that are consuming storage - you can generate a usage report. The usage report is a CSV file that's emailed to you. For more information on how to generate a usage report, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 To see your {% data variables.product.prodname_codespaces %} usage, filter the report to show only rows that mention "Codespaces" in the `Product` column.
 
@@ -82,15 +82,15 @@ If the dev container for the current codespace was built from the default image,
 
 ## Tips for making your allowed usage go further
 
-* Your codespaces consume compute usage while they are running. If you're not using a codespace, stopping the codespace prevents unnecessary compute usage. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/stopping-and-starting-a-codespace)."
-* You can reduce the idle timeout for {% data variables.product.prodname_codespaces %} in your personal settings to less than the default 30 minutes. This will shorten the period of inactivity before your codespaces are automatically stopped. This can save on compute usage. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces)."
-* Your codespaces consume storage while they exist. You should delete a codespace you have finished using and know that you will not use again. For more information, see "[AUTOTITLE](/codespaces/developing-in-a-codespace/deleting-a-codespace)."
+* Your codespaces consume compute usage while they are running. If you're not using a codespace, stopping the codespace prevents unnecessary compute usage. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/stopping-and-starting-a-codespace)."
+* You can reduce the idle timeout for {% data variables.product.prodname_codespaces %} in your personal settings to less than the default 30 minutes. This will shorten the period of inactivity before your codespaces are automatically stopped. This can save on compute usage. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/setting-your-timeout-period-for-github-codespaces)."
+* Your codespaces consume storage while they exist. You should delete a codespace you have finished using and know that you will not use again. See "[AUTOTITLE](/codespaces/developing-in-a-codespace/deleting-a-codespace)."
   {% note %}
 
   **Note**: Deleting a codespace will not reduce your used storage amount for the billing current month as this is a cumulative figure.
 
   {% endnote %}
-* Configure your retention period to ensure codespaces you forget to delete are deleted automatically. The default retention period is 30 days. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces)."
+* Configure your retention period to ensure codespaces you forget to delete are deleted automatically. The default retention period is 30 days. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces)."
 * {% data variables.product.prodname_vscode %} extensions consume storage. Make sure you are only installing extensions that you need. You can find out how much space is being used by extensions by running this command in your codespace.
 
   ```shell copy
@@ -103,15 +103,15 @@ If the dev container for the current codespace was built from the default image,
   **Note**: Storage is calculated hourly and added to your existing storage usage. Consumed storage is therefore cumulative for the duration of your month-long billing cycle. This means that, during the billing period, the value you see on your billing page will only increase or remain the same. Usage will be reset to zero when a new billing cycle starts. Deleting a codespace, or a prebuild, will not reduce the usage figure for the current month, but it will reduce the rate at which storage usage accumulates.
 
   {% endnote %}
-* Ensure that you are using prebuilds for only as many versions and as many regions as you need. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)" and "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
+* Ensure that you are using prebuilds for only as many versions and as many regions as you need. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/about-github-codespaces-prebuilds)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#about-billing-for-codespaces-prebuilds)."
   {% note %}
 
   **Note**: If your included storage usage is exhausted, new prebuilds are disabled until you set up a spending limit or your included usage quota renews.
 
   {% endnote %}
-* If you have configured prebuilds in a repository's settings, but you're not using {% data variables.product.prodname_github_codespaces %} for that repository, consider deleting the prebuild configuration to avoid prebuilds for that repository consuming your included storage allowance unnecessarily. When you delete a prebuild configuration all the associated prebuilds are deleted, reducing your storage consumption from that point onward. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/managing-prebuilds#deleting-a-prebuild-configuration)."
+* If you have configured prebuilds in a repository's settings, but you're not using {% data variables.product.prodname_github_codespaces %} for that repository, consider deleting the prebuild configuration to avoid prebuilds for that repository consuming your included storage allowance unnecessarily. When you delete a prebuild configuration all the associated prebuilds are deleted, reducing your storage consumption from that point onward. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/managing-prebuilds#deleting-a-prebuild-configuration)."
 
-  You can check for prebuild configurations in the "{% data variables.product.prodname_codespaces %}" page of a repository's settings. For more information, see "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
+  You can check for prebuild configurations in the "{% data variables.product.prodname_codespaces %}" page of a repository's settings. See "[AUTOTITLE](/codespaces/prebuilding-your-codespaces/configuring-prebuilds#configuring-prebuilds)."
 
-  Alternatively, you can check which repositories have prebuilds by reviewing a usage report. For more information, see "[Understanding your {% data variables.product.prodname_codespaces %} usage](#understanding-your-codespaces-usage)" above.
-* Storage of containers built from the default dev container image for codespaces is free of charge and does not reduce your included storage. You can therefore avoid your storage allowance being consumed by your dev container by using the default image in your dev container configuration, rather than specifying a more specialized image. For more information, see "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#using-the-default-dev-container-configuration)" and "[Storage usage for your base dev container](#storage-usage-for-your-base-dev-container)" above.
+  Alternatively, you can check which repositories have prebuilds by reviewing a usage report. See "[Understanding your {% data variables.product.prodname_codespaces %} usage](#understanding-your-codespaces-usage)" above.
+* Storage of containers built from the default dev container image for codespaces is free of charge and does not reduce your included storage. You can therefore avoid your storage allowance being consumed by your dev container by using the default image in your dev container configuration, rather than specifying a more specialized image. See "[AUTOTITLE](/codespaces/setting-up-your-project-for-codespaces/adding-a-dev-container-configuration/introduction-to-dev-containers#using-the-default-dev-container-configuration)" and "[Storage usage for your base dev container](#storage-usage-for-your-base-dev-container)" above.
diff --git a/content/codespaces/troubleshooting/troubleshooting-prebuilds.md b/content/codespaces/troubleshooting/troubleshooting-prebuilds.md
index 4fbd330877..f53e7f7c5e 100644
--- a/content/codespaces/troubleshooting/troubleshooting-prebuilds.md
+++ b/content/codespaces/troubleshooting/troubleshooting-prebuilds.md
@@ -42,7 +42,7 @@ cat /workspaces/.codespaces/shared/environment-variables.json | jq '.ACTION_NAME
 
 You can check whether a repository is using prebuilds in the "{% data variables.product.prodname_codespaces %}" page of the repository's settings.
 
-You can check how much storage space has been consumed by prebuilds in your current billing cycle by reviewing the billing data for your personal or organization account. You can also generate a usage report to see which repositories have been using prebuilds. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
+You can check how much storage space has been consumed by prebuilds in your current billing cycle by reviewing the billing data for your personal or organization account. You can also generate a usage report to see which repositories have been using prebuilds. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/viewing-your-github-codespaces-usage)."
 
 ## The "Prebuild Ready" label is sometimes missing
 
diff --git a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
index 0c3d723e60..cad6fcdad5 100644
--- a/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
+++ b/content/education/manage-coursework-with-github-classroom/integrate-github-classroom-with-an-ide/using-github-codespaces-with-github-classroom.md
@@ -9,7 +9,7 @@ permissions: 'Organization owners who are admins for a classroom can enable {% d
 ---
 ## About {% data variables.product.prodname_github_codespaces %}
 
-{% data variables.product.prodname_github_codespaces %} is an instant, cloud-based development environment that uses a container to provide you with common languages, tools, and utilities for development. {% data variables.product.prodname_github_codespaces %} is also configurable, allowing you to create a customized development environment that is the same for all users of your project. For more information, see "[AUTOTITLE](/codespaces/overview)."
+{% data variables.product.prodname_github_codespaces %} is an instant, cloud-based development environment that uses a container to provide you with common languages, tools, and utilities for development. {% data variables.product.prodname_github_codespaces %} is also configurable, allowing you to create a customized development environment that is the same for all users of your project. See "[AUTOTITLE](/codespaces/overview)."
 
 Once {% data variables.product.prodname_github_codespaces %} is enabled in an organization or enterprise, users can create a codespace from any branch or commit in an organization or enterprise repository and begin developing using cloud-based compute resources. You can connect to a codespace from the browser or locally using {% data variables.product.prodname_vscode %}.
 
@@ -21,7 +21,7 @@ For assignments with complex setup environments, teachers can customize the dev
 
 {% note %}
 
-**Note**: Individual codespaces are automatically deleted if they are stopped and left unused for a prolonged period. For more information, see "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces)."
+**Note**: Individual codespaces are automatically deleted if they are stopped and left unused for a prolonged period. See "[AUTOTITLE](/codespaces/setting-your-user-preferences/configuring-automatic-deletion-of-your-codespaces)."
 
 {% endnote %}
 
@@ -39,13 +39,13 @@ The {% data variables.product.prodname_codespaces %} Education benefit gives ver
 
 {% data reusables.classroom.free-limited-codespaces-for-verified-teachers-beta-note %}
 
-To become a verified teacher, you need to be approved for an educator or teacher benefit. For more information, see "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
+To become a verified teacher, you need to be approved for an educator or teacher benefit. See "[AUTOTITLE](/education/explore-the-benefits-of-teaching-and-learning-with-github-education/github-global-campus-for-teachers/apply-to-github-global-campus-as-a-teacher)."
 
-After you have confirmation that you are a verified teacher, visit [{% data variables.product.prodname_global_campus %} for Teachers](https://education.github.com/globalcampus/teacher) to upgrade the organization to GitHub Team. For more information, see [GitHub's products](/get-started/learning-about-github/githubs-plans#github-team).
+After you have confirmation that you are a verified teacher, visit [{% data variables.product.prodname_global_campus %} for Teachers](https://education.github.com/globalcampus/teacher) to upgrade the organization to GitHub Team. See [GitHub's products](/get-started/learning-about-github/githubs-plans#github-team).
 
-If you are eligible for the {% data variables.product.prodname_codespaces %} Education benefit, when you enable {% data variables.product.prodname_github_codespaces %} in {% data variables.product.prodname_classroom %} for your organization, GitHub automatically adds a Codespace policy to restrict machine types for all codespaces in the organization to 2 core machines. This helps you make the most of the free {% data variables.product.prodname_github_codespaces %} usage. However, you can change or remove these policies in your organization settings. For more information, see "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
+If you are eligible for the {% data variables.product.prodname_codespaces %} Education benefit, when you enable {% data variables.product.prodname_github_codespaces %} in {% data variables.product.prodname_classroom %} for your organization, GitHub automatically adds a Codespace policy to restrict machine types for all codespaces in the organization to 2 core machines. This helps you make the most of the free {% data variables.product.prodname_github_codespaces %} usage. However, you can change or remove these policies in your organization settings. See "[AUTOTITLE](/codespaces/managing-codespaces-for-your-organization/restricting-access-to-machine-types)."
 
-When the {% data variables.product.prodname_codespaces %} Education benefit moves out of {% data variables.release-phases.public_preview %}, if your organization exceeds their free allowance for {% data variables.product.prodname_github_codespaces %} usage, your organization will be billed for additional usage. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+When the {% data variables.product.prodname_codespaces %} Education benefit moves out of {% data variables.release-phases.public_preview %}, if your organization exceeds their free allowance for {% data variables.product.prodname_github_codespaces %} usage, your organization will be billed for additional usage. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 ## Enabling {% data variables.product.prodname_codespaces %} for your organization
 
@@ -55,7 +55,7 @@ When the {% data variables.product.prodname_codespaces %} Education benefit move
 
 {% data reusables.classroom.sign-into-github-classroom %}
 1. On the right side of the page, click **New classroom**.
-1. In the list of organizations, click the organization you'd like to use for your classroom. Organizations that are eligible for {% data variables.product.prodname_github_codespaces %} will have a note showing that they are eligible. Optionally, you can create a new organization. For more information, see "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)."
+1. In the list of organizations, click the organization you'd like to use for your classroom. Organizations that are eligible for {% data variables.product.prodname_github_codespaces %} will have a note showing that they are eligible. Optionally, you can create a new organization. See "[AUTOTITLE](/organizations/collaborating-with-groups-in-organizations/creating-a-new-organization-from-scratch)."
 1. In the "Name your classroom" page, under "{% data variables.product.prodname_codespaces %} in your Classroom", click **Enable**. Note that this will enable {% data variables.product.prodname_github_codespaces %} for all repositories and users in the organization.
 1. When you are ready to create the new classroom, click **Create classroom**.
 
@@ -78,7 +78,7 @@ If you use a template repository for an assignment, you can define a dev contain
 
 When a student opens an assignment, the repository's README file includes their teacher's recommendation of the IDE they should use for the work.
 
-Students can launch a new or existing codespace by clicking the **Open in GitHub Codespace** button in the README, or by clicking the **{% octicon "code" aria-hidden="true" %} Code** button on the main page of the assignment repository, then selecting the **Codespaces** tab. From the **Codespaces** tab you can select an existing codespace or create a new one. For more information, see "[AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)."
+Students can launch a new or existing codespace by clicking the **Open in GitHub Codespace** button in the README, or by clicking the **{% octicon "code" aria-hidden="true" %} Code** button on the main page of the assignment repository, then selecting the **Codespaces** tab. From the **Codespaces** tab you can select an existing codespace or create a new one. See "[AUTOTITLE](/codespaces/developing-in-codespaces/creating-a-codespace-for-a-repository#creating-a-codespace-for-a-repository)."
 
 ![Screenshot of the assignment repository. The "Code" dropdown menu to launch a new codespace is expanded.](/assets/images/help/classroom/student-launch-new-codespace.png)
 
diff --git a/content/get-started/learning-about-github/about-github-advanced-security.md b/content/get-started/learning-about-github/about-github-advanced-security.md
index 46c0bcb17b..a73fc6c724 100644
--- a/content/get-started/learning-about-github/about-github-advanced-security.md
+++ b/content/get-started/learning-about-github/about-github-advanced-security.md
@@ -20,7 +20,7 @@ shortTitle: GitHub Advanced Security
 
 {% data reusables.advanced-security.ghas-trial %}
 
-{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
+{% ifversion ghes %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% elsif ghec %}For information about buying a license for {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)."{% elsif fpt %}To purchase a {% data variables.product.prodname_GH_advanced_security %} license, you must be using {% data variables.product.prodname_enterprise %}. For information about upgrading to {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/githubs-plans)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
 
 {% note %}
 
@@ -32,11 +32,11 @@ shortTitle: GitHub Advanced Security
 
 A {% data variables.product.prodname_GH_advanced_security %} license provides the following additional features{% ifversion fpt %} for private repositories:{% else %}:{% endif %}
 
-* **{% data variables.product.prodname_code_scanning_caps %}** - Search for potential security vulnerabilities and coding errors in your code using {% data variables.product.prodname_codeql %} or a third-party tool. For more information, see "[AUTOTITLE](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning)" and "[AUTOTITLE](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning-with-codeql)."
+* **{% data variables.product.prodname_code_scanning_caps %}** - Search for potential security vulnerabilities and coding errors in your code using {% data variables.product.prodname_codeql %} or a third-party tool. See "[AUTOTITLE](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning)" and "[AUTOTITLE](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning-with-codeql)."
 
-* **{% data variables.product.prodname_codeql_cli %}** - Run {% data variables.product.prodname_codeql %} processes locally on software projects or to generate {% data variables.product.prodname_code_scanning %} results for upload to {% data variables.product.product_name %}. For more information, see "[AUTOTITLE](/code-security/codeql-cli/getting-started-with-the-codeql-cli/about-the-codeql-cli)."
+* **{% data variables.product.prodname_codeql_cli %}** - Run {% data variables.product.prodname_codeql %} processes locally on software projects or to generate {% data variables.product.prodname_code_scanning %} results for upload to {% data variables.product.product_name %}. See "[AUTOTITLE](/code-security/codeql-cli/getting-started-with-the-codeql-cli/about-the-codeql-cli)."
 
-* **{% data variables.product.prodname_secret_scanning_caps %}** - Detect secrets, for example keys and tokens, that have been checked into {% ifversion fpt %}private repositories{% else %} the repository{% endif %}. If push protection is enabled, {% data variables.product.prodname_dotcom %} also detects secrets when they are pushed to your repository. {% ifversion secret-scanning-enable-by-default-for-public-repos %}{% data variables.secret-scanning.user_alerts_caps %} and push protection are available and free of charge for all {% ifversion ghec %}user-owned {% endif %}public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} For more information, see "[AUTOTITLE](/code-security/secret-scanning/introduction/about-secret-scanning)" and "[AUTOTITLE](/code-security/secret-scanning/introduction/about-push-protection)."
+* **{% data variables.product.prodname_secret_scanning_caps %}** - Detect secrets, for example keys and tokens, that have been checked into {% ifversion fpt %}private repositories{% else %} the repository{% endif %}. If push protection is enabled, {% data variables.product.prodname_dotcom %} also detects secrets when they are pushed to your repository. {% ifversion secret-scanning-enable-by-default-for-public-repos %}{% data variables.secret-scanning.user_alerts_caps %} and push protection are available and free of charge for all {% ifversion ghec %}user-owned {% endif %}public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %} See "[AUTOTITLE](/code-security/secret-scanning/introduction/about-secret-scanning)" and "[AUTOTITLE](/code-security/secret-scanning/introduction/about-push-protection)."
 
 {% ifversion dependabot-auto-triage-rules %}
 
@@ -44,11 +44,11 @@ A {% data variables.product.prodname_GH_advanced_security %} license provides th
 
 {% endif %}
 
-* **Dependency review** - Show the full impact of changes to dependencies and see details of any vulnerable versions before you merge a pull request. For more information, see "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)."
+* **Dependency review** - Show the full impact of changes to dependencies and see details of any vulnerable versions before you merge a pull request. See "[AUTOTITLE](/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review)."
 
 {% ifversion copilot-chat-ghas-alerts %}
 
-With a {% data variables.product.prodname_copilot_enterprise %} license, you can also ask {% data variables.product.prodname_copilot_chat %} for help to better understand security alerts in repositories in your organization ({% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_secret_scanning %}, and {% data variables.product.prodname_dependabot_alerts %}. For more information, see "[AUTOTITLE](/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom#asking-questions-about-alerts-from-github-advanced-security-features)."
+With a {% data variables.product.prodname_copilot_enterprise %} license, you can also ask {% data variables.product.prodname_copilot_chat %} for help to better understand security alerts in repositories in your organization ({% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_secret_scanning %}, and {% data variables.product.prodname_dependabot_alerts %}. See "[AUTOTITLE](/copilot/using-github-copilot/asking-github-copilot-questions-in-githubcom#asking-questions-about-alerts-from-github-advanced-security-features)."
 
 {% endif %}
 
@@ -74,7 +74,7 @@ The table below summarizes the availability of {% data variables.product.prodnam
 For information about {% data variables.product.prodname_advanced_security %} features that are in development, see "[{% data variables.product.prodname_dotcom %} public roadmap](https://github.com/github/roadmap)." For an overview of all security features, see "[AUTOTITLE](/code-security/getting-started/github-security-features)."
 
 {% ifversion fpt or ghec %}
-{% data variables.product.prodname_GH_advanced_security %} features are enabled for all public repositories on {% data variables.product.prodname_dotcom_the_website %}. Organizations that use {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_advanced_security %} can additionally enable these features for private and internal repositories. {% ifversion fpt %}For more information, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/get-started/learning-about-github/about-github-advanced-security#enabling-advanced-security-features).
+{% data variables.product.prodname_GH_advanced_security %} features are enabled for all public repositories on {% data variables.product.prodname_dotcom_the_website %}. Organizations that use {% data variables.product.prodname_ghe_cloud %} with {% data variables.product.prodname_advanced_security %} can additionally enable these features for private and internal repositories. {% ifversion fpt %}See the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/get-started/learning-about-github/about-github-advanced-security#enabling-advanced-security-features).
 {% endif %}
 
 {% ifversion ghes or ghec %}
@@ -94,7 +94,7 @@ To learn about what you need to know to plan your {% data variables.product.prod
 
 {% endif %}
 {%- ifversion ghes %}
-The site administrator must enable {% data variables.product.prodname_advanced_security %} for {% data variables.location.product_location %} before you can use these features. For more information, see "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise)."
+The site administrator must enable {% data variables.product.prodname_advanced_security %} for {% data variables.location.product_location %} before you can use these features. See "[AUTOTITLE](/admin/code-security/managing-github-advanced-security-for-your-enterprise)."
 
 Once your system is set up, you can enable and disable these features at the organization or repository level.
 
@@ -104,10 +104,10 @@ For public repositories these features are permanently on and can only be disabl
 For other repositories, once you have a license for your enterprise account, you can enable and disable these features at the organization or repository level.
 
 {%- endif %}
-For more information, see "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization)" and "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository)."
+See "[AUTOTITLE](/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-security-and-analysis-settings-for-your-organization)" and "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/managing-security-and-analysis-settings-for-your-repository)."
 
 {% ifversion ghec or ghes %}
-If you have an enterprise account, license use for the entire enterprise is shown on your enterprise license page. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
+If you have an enterprise account, license use for the entire enterprise is shown on your enterprise license page. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
 {% endif %}
 
 {% endif %}
@@ -116,7 +116,7 @@ If you have an enterprise account, license use for the entire enterprise is show
 
 ## About {% data variables.product.prodname_GH_advanced_security %} Certification
 
-You can highlight your code security knowledge by earning a {% data variables.product.prodname_GH_advanced_security %} certificate with {% data variables.product.prodname_certifications %}. The certification validates your expertise in vulnerability identification, workflow security, and robust security implementation. For more information, see "[AUTOTITLE](/get-started/showcase-your-expertise-with-github-certifications/about-github-certifications)."
+You can highlight your code security knowledge by earning a {% data variables.product.prodname_GH_advanced_security %} certificate with {% data variables.product.prodname_certifications %}. The certification validates your expertise in vulnerability identification, workflow security, and robust security implementation. See "[AUTOTITLE](/get-started/showcase-your-expertise-with-github-certifications/about-github-certifications)."
 
 {% endif %}
 
diff --git a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
index d0f42800b8..ed365d7085 100644
--- a/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
+++ b/content/repositories/creating-and-managing-repositories/transferring-a-repository.md
@@ -23,7 +23,7 @@ topics:
 ---
 ## About repository transfers
 
-When you transfer a repository to a new owner, they can immediately administer the repository's contents, issues, pull requests, releases, {% data variables.product.prodname_projects_v1 %}, and settings. {% ifversion rename-and-transfer-repository %}You can also change the repository name while transferring a repository. For more information, see "[AUTOTITLE](/repositories/creating-and-managing-repositories/renaming-a-repository)."{% endif %}
+When you transfer a repository to a new owner, they can immediately administer the repository's contents, issues, pull requests, releases, {% data variables.product.prodname_projects_v1 %}, and settings. {% ifversion rename-and-transfer-repository %}You can also change the repository name while transferring a repository. See "[AUTOTITLE](/repositories/creating-and-managing-repositories/renaming-a-repository)."{% endif %}
 
 Prerequisites for repository transfers:
 * When you transfer a repository that you own to another personal account, the new owner will receive a confirmation email.{% ifversion fpt or ghec %} The confirmation email includes instructions for accepting the transfer. If the new owner doesn't accept the transfer within one day, the invitation will expire.{% endif %}
@@ -54,7 +54,7 @@ When you transfer a repository, its issues, pull requests, wiki, stars, and watc
 
 * If the transferred repository is a fork, then it remains associated with the upstream repository.
 * If the transferred repository has any forks, then those forks will remain associated with the repository after the transfer is complete.
-* If the transferred repository uses {% data variables.large_files.product_name_long %}, all {% data variables.large_files.product_name_short %} objects are automatically moved. This transfer occurs in the background, so if you have a large number of {% data variables.large_files.product_name_short %} objects or if the {% data variables.large_files.product_name_short %} objects themselves are large, it may take some time for the transfer to occur.{% ifversion fpt or ghec %} Before you transfer a repository that uses {% data variables.large_files.product_name_short %}, make sure the receiving account has enough data packs to store the {% data variables.large_files.product_name_short %} objects you'll be moving over. For more information on adding storage for personal accounts, see "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage)."{% endif %}
+* If the transferred repository uses {% data variables.large_files.product_name_long %}, all {% data variables.large_files.product_name_short %} objects are automatically moved. This transfer occurs in the background, so if you have a large number of {% data variables.large_files.product_name_short %} objects or if the {% data variables.large_files.product_name_short %} objects themselves are large, it may take some time for the transfer to occur.{% ifversion fpt or ghec %} Before you transfer a repository that uses {% data variables.large_files.product_name_short %}, make sure the receiving account has enough data packs to store the {% data variables.large_files.product_name_short %} objects you'll be moving over. For more information on adding storage for personal accounts, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/upgrading-git-large-file-storage)."{% endif %}
 * When a repository is transferred between two personal accounts, issue assignments are left intact. When you transfer a repository from a personal account to an organization, issues assigned to members in the organization remain intact, and all other issue assignees are cleared. Only owners in the organization are allowed to create new issue assignments. When you transfer a repository from an organization to a personal account, only issues assigned to the repository's owner are kept, and all other issue assignees are removed.
 * If the transferred repository contains a {% data variables.product.prodname_pages %} site, then links to the Git repository on the Web and through Git activity are redirected. However, we don't redirect {% data variables.product.prodname_pages %} associated with the repository.
 * All links to the previous repository location are automatically redirected to the new location. When you use `git clone`, `git fetch`, or `git push` on a transferred repository, these commands will redirect to the new repository location or URL. However, to avoid confusion, we strongly recommend updating any existing local clones to point to the new repository URL. You can do this by using `git remote` on the command line:
@@ -69,10 +69,10 @@ When you transfer a repository, its issues, pull requests, wiki, stars, and watc
 
   {% endwarning %}
 * When you transfer a repository from an organization to a personal account, the repository's read-only collaborators will not be transferred. This is because collaborators can't have read-only access to repositories owned by a personal account. For more information about repository permission levels, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/permission-levels-for-a-personal-account-repository)" and "[AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization)."{% ifversion fpt or ghec %}
-* Sponsors who have access to the repository through a sponsorship tier may be affected. For more information, see "[AUTOTITLE](/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers#adding-a-repository-to-a-sponsorship-tier)".{% endif %}
-* Packages associated with the repository {% ifversion packages-registries-v2 %}may be transferred, or may lose their link to the repository, depending on the registry they belong to{% else %}are transferred as part of the transfer process{% endif %}. For more information, see "[AUTOTITLE](/packages/learn-github-packages/about-permissions-for-github-packages#about-repository-transfers)."
+* Sponsors who have access to the repository through a sponsorship tier may be affected. See "[AUTOTITLE](/sponsors/receiving-sponsorships-through-github-sponsors/managing-your-sponsorship-tiers#adding-a-repository-to-a-sponsorship-tier)".{% endif %}
+* Packages associated with the repository {% ifversion packages-registries-v2 %}may be transferred, or may lose their link to the repository, depending on the registry they belong to{% else %}are transferred as part of the transfer process{% endif %}. See "[AUTOTITLE](/packages/learn-github-packages/about-permissions-for-github-packages#about-repository-transfers)."
 
-For more information, see "[AUTOTITLE](/get-started/getting-started-with-git/managing-remote-repositories)."
+See "[AUTOTITLE](/get-started/getting-started-with-git/managing-remote-repositories)."
 
 ### Repository transfers and organizations
 
@@ -84,7 +84,7 @@ Once a repository is transferred to an organization, the organization's default
 
 You can transfer your repository to any personal account that accepts your repository transfer. When a repository is transferred between two personal accounts, the original repository owner and collaborators are automatically added as collaborators to the new repository.
 
-{% ifversion fpt or ghec %}If you published a {% data variables.product.prodname_pages %} site in a private repository and added a custom domain, before transferring the repository, you may want to remove or update your DNS records to avoid the risk of a domain takeover. For more information, see "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}
+{% ifversion fpt or ghec %}If you published a {% data variables.product.prodname_pages %} site in a private repository and added a custom domain, before transferring the repository, you may want to remove or update your DNS records to avoid the risk of a domain takeover. See "[AUTOTITLE](/pages/configuring-a-custom-domain-for-your-github-pages-site/managing-a-custom-domain-for-your-github-pages-site)."{% endif %}
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
@@ -92,7 +92,7 @@ You can transfer your repository to any personal account that accepts your repos
 
 ## Transferring a repository owned by your organization
 
-If you have owner permissions in an organization or admin permissions to one of its repositories, you can transfer a repository owned by your organization to your personal account or to another organization. {% ifversion ghec or ghes %}Internal repositories cannot be transferred to a personal account, only to another organization. To transfer an internal repository, change the repository's visibility to "private" or "public". For more information, see [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility){% endif %}
+If you have owner permissions in an organization or admin permissions to one of its repositories, you can transfer a repository owned by your organization to your personal account or to another organization. {% ifversion ghec or ghes %}Internal repositories cannot be transferred to a personal account, only to another organization. To transfer an internal repository, change the repository's visibility to "private" or "public". See [AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/setting-repository-visibility){% endif %}
 
 1. Sign into your personal account that has admin or owner permissions in the organization that owns the repository.
 {% data reusables.repositories.navigate-to-repo %}
diff --git a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-git-lfs-objects-in-archives-of-your-repository.md b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-git-lfs-objects-in-archives-of-your-repository.md
index c3266d2d7d..62acb46bf2 100644
--- a/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-git-lfs-objects-in-archives-of-your-repository.md
+++ b/content/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/managing-git-lfs-objects-in-archives-of-your-repository.md
@@ -16,7 +16,7 @@ redirect_from:
 
 {% data variables.product.product_name %} creates [source code archives](/repositories/working-with-files/using-files/downloading-source-code-archives) of your repository in the form of ZIP files and tarballs. People can download these archives on the main page of your repository or as release assets. By default, {% data variables.large_files.product_name_short %} objects are not included in these archives, only the pointer files to these objects. To improve the usability of archives for your repository, you can choose to include the {% data variables.large_files.product_name_short %} objects instead. To be included, the {% data variables.large_files.product_name_short %} objects must be covered by tracking rules in a _.gitattributes_ file that has been committed to the repository.
 
-If you choose to include {% data variables.large_files.product_name_short %} objects in archives of your repository, every download of those archives will count towards bandwidth usage for your account. Each account receives {% data variables.large_files.initial_bandwidth_quota %} per month of bandwidth for free, and you can pay for additional usage. For more information, see "[AUTOTITLE](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage)" and "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage)."
+If you choose to include {% data variables.large_files.product_name_short %} objects in archives of your repository, every download of those archives will count towards bandwidth usage for your account. Each account receives {% data variables.large_files.initial_bandwidth_quota %} per month of bandwidth for free, and you can pay for additional usage. For more information, see "[AUTOTITLE](/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage)."
 
 If you use an external LFS server (configured in your _.lfsconfig_), those LFS files will not be included in archives of the repository. The archive will only contain files that have been committed to {% data variables.product.product_name %}.
 
diff --git a/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md b/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md
index 79fffcd7e9..9ed3c3d966 100644
--- a/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md
+++ b/content/repositories/working-with-files/managing-large-files/about-storage-and-bandwidth-usage.md
@@ -45,5 +45,5 @@ If you use more than {% data variables.large_files.initial_bandwidth_quota %} of
 
 ## Further reading
 
-* "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage)"
-* "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/viewing-your-git-large-file-storage-usage)"
+* "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage)"
diff --git a/content/rest/repos/lfs.md b/content/rest/repos/lfs.md
index 3ef285a95f..0eb302ef1d 100644
--- a/content/rest/repos/lfs.md
+++ b/content/rest/repos/lfs.md
@@ -21,7 +21,7 @@ People with admin access to a repository can use these endpoints.
 
 {% ifversion fpt or ghec %}
 
-Usage of {% data variables.large_files.product_name_short %} is subject to billing. For more information, see "[AUTOTITLE](/billing/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)."
+Usage of {% data variables.large_files.product_name_short %} is subject to billing. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-git-large-file-storage/about-billing-for-git-large-file-storage)."
 
 If you want to use these endpoints for a repository that belongs to an organization, you must have admin access to the repository (which can be inherited as an organization owner), and your role must also provide you with access to the organization's billing.
 
diff --git a/data/learning-tracks/actions.yml b/data/learning-tracks/actions.yml
index 55f5c22925..4a4d73f209 100644
--- a/data/learning-tracks/actions.yml
+++ b/data/learning-tracks/actions.yml
@@ -31,7 +31,7 @@ adopting_github_actions_for_your_enterprise_ghec:
     - >-
       /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions
     - >-
-      /billing/managing-billing-for-github-actions/about-billing-for-github-actions
+      /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions
 adopting_github_actions_for_your_enterprise_ghes:
   title: Adopt GitHub Actions for your enterprise
   description: >-
@@ -56,7 +56,7 @@ adopting_github_actions_for_your_enterprise_ghes:
     - >-
       /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions
     - >-
-      /billing/managing-billing-for-github-actions/about-billing-for-github-actions
+      /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions
 hosting_your_own_runners:
   title: Host your own runners
   description: >-
diff --git a/data/learning-tracks/admin.yml b/data/learning-tracks/admin.yml
index c9033f243d..7a83cc504a 100644
--- a/data/learning-tracks/admin.yml
+++ b/data/learning-tracks/admin.yml
@@ -51,9 +51,10 @@ adopting_github_actions_for_your_enterprise_ghec:
       /admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/migrating-your-enterprise-to-github-actions
     - >-
       /admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-cloud
-    - /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions
     - >-
-      /billing/managing-billing-for-github-actions/about-billing-for-github-actions
+      /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions
+    - >-
+      /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions
 adopting_github_actions_for_your_enterprise_ghes:
   title: Adopt GitHub Actions for your enterprise
   description: >-
@@ -75,9 +76,10 @@ adopting_github_actions_for_your_enterprise_ghes:
       /admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-github-actions-for-github-enterprise-server
     - >-
       /admin/managing-github-actions-for-your-enterprise/getting-started-with-github-actions-for-your-enterprise/getting-started-with-self-hosted-runners-for-your-enterprise
-    - /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions
     - >-
-      /billing/managing-billing-for-github-actions/about-billing-for-github-actions
+      /actions/security-for-github-actions/security-guides/security-hardening-for-github-actions
+    - >-
+      /billing/managing-billing-for-your-products/managing-billing-for-github-actions/about-billing-for-github-actions
 increase_fault_tolerance:
   title: Increase the fault tolerance of your instance
   description: >-
@@ -154,7 +156,7 @@ configure_github_advanced_security:
     ghes: '*'
   guides:
     - >-
-      /billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security
+      /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security
     - >-
       /admin/managing-code-security/managing-github-advanced-security-for-your-enterprise/enabling-github-advanced-security-for-your-enterprise
     - >-
@@ -175,8 +177,7 @@ get_started_with_your_enterprise_account:
     ghec: '*'
   guides:
     - /admin/managing-your-enterprise-account/about-enterprise-accounts
-    - >-
-      /billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
+    - /billing/using-the-billing-platform/about-billing-for-your-enterprise
     - >-
       /admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise
     - >-
diff --git a/data/release-notes/enterprise-server/3-12/0-rc1.yml b/data/release-notes/enterprise-server/3-12/0-rc1.yml
index c8fa66d0e5..e6eb3bcba6 100644
--- a/data/release-notes/enterprise-server/3-12/0-rc1.yml
+++ b/data/release-notes/enterprise-server/3-12/0-rc1.yml
@@ -38,7 +38,7 @@ sections:
       notes:
         # https://github.com/github/releases/issues/3597
         - |
-          The GitHub Advanced Security billing REST API and CSV download includes the email addresses for active committers. This provides information for insights into Advanced Security license usage across your business. For more information, see "[AUTOTITLE](/rest/enterprise-admin/billing)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage#downloading-github-advanced-security-license-usage-information)".
+          The GitHub Advanced Security billing REST API and CSV download includes the email addresses for active committers. This provides information for insights into Advanced Security license usage across your business. For more information, see "[AUTOTITLE](/rest/enterprise-admin/billing)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage#downloading-github-advanced-security-license-usage-information)".
         # https://github.com/github/releases/issues/3285
         - |
           To make it easier for users to secure repositories, default setup for code scanning automatically attempts to analyze all languages supported by CodeQL. Users no longer need to manually include analysis of C, C++, C#, Java, or Kotlin when enabling default setup, and organization owners and security managers can enable analysis of these languages for multiple repositories in an organization. For more information about the languages and versions supported by CodeQL and code scanning, see "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning)" and "[Supported languages and frameworks](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/)" in the CodeQL documentation.
@@ -53,7 +53,7 @@ sections:
           Code scanning with CodeQL has improved support for detecting vulnerabilities in C and C++ code, with queries available for detecting common memory-corruption vulnerabilities. These queries are in beta and subject to change. For more information, see [ICYMI: improved C++ vulnerability coverage and CodeQL support for Lombok](https://github.blog/2023-10-19-icymi-improved-c-vulnerability-coverage-and-codeql-support-for-lombok/#improved-c-vulnerability-coverage) on the GitHub Blog.
         # https://github.com/github/releases/issues/3512
         - |
-          For repositories migrated to GitHub Enterprise Server from other platforms, to calculate active committers for GitHub Advanced Security license usage, GitHub only considers commits made after the migration date. Previously, historic commits were included in the calculation, and users needed to intervene manually to avoid consuming licenses unnecessarily. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+          For repositories migrated to GitHub Enterprise Server from other platforms, to calculate active committers for GitHub Advanced Security license usage, GitHub only considers commits made after the migration date. Previously, historic commits were included in the calculation, and users needed to intervene manually to avoid consuming licenses unnecessarily. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
         # https://github.com/github/releases/issues/3310
         - |
           To make the language overview on the tool status page more informative, users can directly specify `Kotlin`, `C`, and `TypeScript` as languages to be analyzed using the `language` property of a `codeql.yml` file. For example: `language: [ 'kotlin' ]`. These languages were already supported by CodeQL, but were previously treated as being part of the `Java`, `CPP`, and `JavaScript` languages respectively.
diff --git a/data/release-notes/enterprise-server/3-12/0.yml b/data/release-notes/enterprise-server/3-12/0.yml
index ea7d665bdd..e8b5ef3c36 100644
--- a/data/release-notes/enterprise-server/3-12/0.yml
+++ b/data/release-notes/enterprise-server/3-12/0.yml
@@ -41,7 +41,7 @@ sections:
       notes:
         # https://github.com/github/releases/issues/3597
         - |
-          The GitHub Advanced Security billing REST API and CSV download includes the email addresses for active committers. This provides information for insights into Advanced Security license usage across your business. For more information, see "[AUTOTITLE](/rest/enterprise-admin/billing)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage#downloading-github-advanced-security-license-usage-information)".
+          The GitHub Advanced Security billing REST API and CSV download includes the email addresses for active committers. This provides information for insights into Advanced Security license usage across your business. For more information, see "[AUTOTITLE](/rest/enterprise-admin/billing)" and "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage#downloading-github-advanced-security-license-usage-information)".
         # https://github.com/github/releases/issues/3285
         - |
           To make it easier for users to secure repositories, default setup for code scanning automatically attempts to analyze all languages supported by CodeQL. Users no longer need to manually include analysis of C, C++, C#, Java, or Kotlin when enabling default setup, and organization owners and security managers can enable analysis of these languages for multiple repositories in an organization. For more information about the languages and versions supported by CodeQL and code scanning, see "[AUTOTITLE](/code-security/code-scanning/enabling-code-scanning/configuring-default-setup-for-code-scanning)" and "[Supported languages and frameworks](https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/)" in the CodeQL documentation.
@@ -56,7 +56,7 @@ sections:
           Code scanning with CodeQL has improved support for detecting vulnerabilities in C and C++ code, with queries available for detecting common memory-corruption vulnerabilities. These queries are in beta and subject to change. For more information, see [ICYMI: improved C++ vulnerability coverage and CodeQL support for Lombok](https://github.blog/2023-10-19-icymi-improved-c-vulnerability-coverage-and-codeql-support-for-lombok/#improved-c-vulnerability-coverage) on the GitHub Blog.
         # https://github.com/github/releases/issues/3512
         - |
-          For repositories migrated to GitHub Enterprise Server from other platforms, to calculate active committers for GitHub Advanced Security license usage, GitHub only considers commits made after the migration date. Previously, historic commits were included in the calculation, and users needed to intervene manually to avoid consuming licenses unnecessarily. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+          For repositories migrated to GitHub Enterprise Server from other platforms, to calculate active committers for GitHub Advanced Security license usage, GitHub only considers commits made after the migration date. Previously, historic commits were included in the calculation, and users needed to intervene manually to avoid consuming licenses unnecessarily. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
         # https://github.com/github/releases/issues/3310
         - |
           To make the language overview on the tool status page more informative, users can directly specify `Kotlin`, `C`, and `TypeScript` as languages to be analyzed using the `language` property of a `codeql.yml` file. For example: `language: [ 'kotlin' ]`. These languages were already supported by CodeQL, but were previously treated as being part of the `Java`, `CPP`, and `JavaScript` languages respectively.
diff --git a/data/reusables/advanced-security/about-ghas-organization-policy.md b/data/reusables/advanced-security/about-ghas-organization-policy.md
index 8029840335..5b4ea8d90f 100644
--- a/data/reusables/advanced-security/about-ghas-organization-policy.md
+++ b/data/reusables/advanced-security/about-ghas-organization-policy.md
@@ -1,4 +1,4 @@
-{% data variables.product.company_short %} bills for {% data variables.product.prodname_advanced_security %} on a per-committer basis. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security)."
+{% data variables.product.company_short %} bills for {% data variables.product.prodname_advanced_security %} on a per-committer basis. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security)."
 
 You can enforce a policy that controls whether repository administrators are allowed to enable features for {% data variables.product.prodname_advanced_security %} in an organization's repositories. You can configure a policy for all organizations owned by your enterprise account, or for individual organizations that you choose.
 
diff --git a/data/reusables/advanced-security/ghas-trial.md b/data/reusables/advanced-security/ghas-trial.md
index 402bdc58c4..9bb719ac8b 100644
--- a/data/reusables/advanced-security/ghas-trial.md
+++ b/data/reusables/advanced-security/ghas-trial.md
@@ -1,2 +1,2 @@
-{% ifversion ghec %}For information about how you can try {% data variables.product.prodname_GH_advanced_security %} for free, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)."
-{% elsif fpt %}For information about how you can try {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %} for free, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud)" and "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security#setting-up-your-trial-of-github-advanced-security)" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
+{% ifversion ghec %}For information about how you can try {% data variables.product.prodname_GH_advanced_security %} for free, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)."
+{% elsif fpt %}For information about how you can try {% data variables.product.prodname_enterprise %} with {% data variables.product.prodname_GH_advanced_security %} for free, see "[AUTOTITLE](/enterprise-cloud@latest/admin/overview/setting-up-a-trial-of-github-enterprise-cloud)" and "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security#setting-up-your-trial-of-github-advanced-security)" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% endif %}
diff --git a/data/reusables/advanced-security/note-org-enable-uses-seats.md b/data/reusables/advanced-security/note-org-enable-uses-seats.md
index 277514313a..a326e24fc0 100644
--- a/data/reusables/advanced-security/note-org-enable-uses-seats.md
+++ b/data/reusables/advanced-security/note-org-enable-uses-seats.md
@@ -1,6 +1,6 @@
 {% ifversion ghes or ghec %}
 {% note %}
 
-**Note:** If you enable {% data variables.product.prodname_GH_advanced_security %}, active committers to these repositories will use {% data variables.product.prodname_GH_advanced_security %} {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %}. This option is deactivated if you have exceeded your license capacity. {% ifversion fpt or ghec %}For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
+**Note:** If you enable {% data variables.product.prodname_GH_advanced_security %}, active committers to these repositories will use {% data variables.product.prodname_GH_advanced_security %} {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %}. This option is deactivated if you have exceeded your license capacity. {% ifversion fpt or ghec %}See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."{% endif %}
 {% endnote %}
 {% endif %}
diff --git a/data/reusables/advanced-security/purchase-ghas.md b/data/reusables/advanced-security/purchase-ghas.md
index 74a42eb5d8..61560a0c2b 100644
--- a/data/reusables/advanced-security/purchase-ghas.md
+++ b/data/reusables/advanced-security/purchase-ghas.md
@@ -1,4 +1,4 @@
-1. Under "How many committers do you want to include?", enter the number of committers you want to purchase licenses for. For more information about committer numbers, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
+1. Under "How many committers do you want to include?", enter the number of committers you want to purchase licenses for. For more information about committer numbers, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security)."
 
    You won't see this option if you're enrolled in usage-based billing for {% data variables.product.prodname_GH_advanced_security %} licenses.
 1. Confirm your billing information and payment method.
diff --git a/data/reusables/billing/enhanced-billing-platform-licenses.md b/data/reusables/billing/enhanced-billing-platform-licenses.md
index 27b09782dc..a2644ab302 100644
--- a/data/reusables/billing/enhanced-billing-platform-licenses.md
+++ b/data/reusables/billing/enhanced-billing-platform-licenses.md
@@ -1,3 +1,3 @@
 >[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the enhanced billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 >
-> The page to view license usage has moved in the enhanced billing platform. See "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises/gathering-insights-on-your-spending#viewing-license-usage)."
+> The page to view license usage has moved in the enhanced billing platform. See "[AUTOTITLE](/billing/using-the-new-billing-platform/gathering-insights-on-your-spending#viewing-license-usage)."
diff --git a/data/reusables/billing/enhanced-billing-platform.md b/data/reusables/billing/enhanced-billing-platform.md
index cdcbc743dd..830c5fb92a 100644
--- a/data/reusables/billing/enhanced-billing-platform.md
+++ b/data/reusables/billing/enhanced-billing-platform.md
@@ -1,3 +1,3 @@
 >[!NOTE] Enterprise accounts, and organizations owned by enterprise accounts, created after June 2, 2024, have access to the enhanced billing platform. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the enhanced billing platform.
 >
-> The enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls. See "[AUTOTITLE](/billing/using-the-enhanced-billing-platform-for-enterprises)."
+> The enhanced billing platform offers better spending control and detailed visibility to help you understand your usage with more granular controls. See "[AUTOTITLE](/billing/using-the-new-billing-platform)."
diff --git a/data/reusables/billing/ghas-metered-billing-note-with-link.md b/data/reusables/billing/ghas-metered-billing-note-with-link.md
index 10503e6449..c0ee5a520e 100644
--- a/data/reusables/billing/ghas-metered-billing-note-with-link.md
+++ b/data/reusables/billing/ghas-metered-billing-note-with-link.md
@@ -1 +1 @@
-If you started a free trial of {% data variables.product.prodname_GH_advanced_security %} during your {% data variables.product.prodname_ghe_cloud %} trial on or after August 1, 2024, your billing for {% data variables.product.prodname_GH_advanced_security %} will be usage-based. See, "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#metered-based-billing-for-github-advanced-security)."
+If you started a free trial of {% data variables.product.prodname_GH_advanced_security %} during your {% data variables.product.prodname_ghe_cloud %} trial on or after August 1, 2024, your billing for {% data variables.product.prodname_GH_advanced_security %} will be usage-based. See, "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security#metered-billing-for-github-advanced-security)."
diff --git a/data/reusables/billing/new-billing-platform-permissions.md b/data/reusables/billing/new-billing-platform-permissions.md
new file mode 100644
index 0000000000..fb1cf79c26
--- /dev/null
+++ b/data/reusables/billing/new-billing-platform-permissions.md
@@ -0,0 +1,3 @@
+The new billing platform is available to all enterprise accounts, and their organizations, created after June 2, 2024. Enterprises that participated in the {% data variables.release-phases.public_preview %} program also have access to the new billing platform.
+
+Beginning in September 2024, {% data variables.product.company_short %} will migrate remaining enterprises to the new billing platform. Enterprises will receive a notice 30 days before their migration. See the [GitHub blog](https://github.blog/changelog/2024-09-24-enhanced-billing-platform-for-enterprises/).
diff --git a/data/reusables/code-scanning/about-multiple-configurations-link.md b/data/reusables/code-scanning/about-multiple-configurations-link.md
index df0c786530..62637bbad9 100644
--- a/data/reusables/code-scanning/about-multiple-configurations-link.md
+++ b/data/reusables/code-scanning/about-multiple-configurations-link.md
@@ -1 +1 @@
-If you run code scanning using multiple configurations, the same alert will sometimes be generated by more than one configuration. If an alert comes from multiple configurations, you can view the status of the alert for each configuration on the alert page. For more information, see "[AUTOTITLE](/code-security/code-scanning/managing-code-scanning-alerts/about-code-scanning-alerts#about-alerts-from-multiple-configurations)."
+If you run code scanning using multiple configurations, an alert will sometimes have multiple analysis origins. If an alert has multiple analysis origins, you can view the status of the alert for each analysis origin on the alert page. For more information, see "[AUTOTITLE](/code-security/code-scanning/managing-code-scanning-alerts/about-code-scanning-alerts#about-analysis-origins)."
diff --git a/data/reusables/codespaces/about-publishing-templates.md b/data/reusables/codespaces/about-publishing-templates.md
index db7aa25357..c1e7474a4e 100644
--- a/data/reusables/codespaces/about-publishing-templates.md
+++ b/data/reusables/codespaces/about-publishing-templates.md
@@ -6,6 +6,6 @@ However, if you delete an unpublished codespace, or if it's automatically delete
 
 {% note %}
 
-**Note:** If an unpublished codespace is currently billed to an organization, publishing the codespace transfers ownership and billing of the codespace to your personal account. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#how-billing-is-handled-for-github-codespaces-templates)."
+**Note:** If an unpublished codespace is currently billed to an organization, publishing the codespace transfers ownership and billing of the codespace to your personal account. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces#how-billing-is-handled-for-github-codespaces-templates)."
 
 {% endnote %}
diff --git a/data/reusables/codespaces/codespaces-continue-by-paying.md b/data/reusables/codespaces/codespaces-continue-by-paying.md
index 66e84ff255..1814fa4094 100644
--- a/data/reusables/codespaces/codespaces-continue-by-paying.md
+++ b/data/reusables/codespaces/codespaces-continue-by-paying.md
@@ -1 +1 @@
-You can continue using {% data variables.product.prodname_github_codespaces %} beyond your monthly included storage and compute usage by providing payment details and setting a spending limit. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+You can continue using {% data variables.product.prodname_github_codespaces %} beyond your monthly included storage and compute usage by providing payment details and setting a spending limit. See "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
diff --git a/data/reusables/codespaces/codespaces-machine-types.md b/data/reusables/codespaces/codespaces-machine-types.md
index 67774fd973..b4a4288bec 100644
--- a/data/reusables/codespaces/codespaces-machine-types.md
+++ b/data/reusables/codespaces/codespaces-machine-types.md
@@ -1,3 +1,3 @@
-Typically, you can run your codespace on a choice of remote machine types. These machine types offer a choice of hardware specifications ranging from 2 cores to 32 cores, although the full range of machine types may not always be available. Each machine type has a different level of resources and a different billing tier. For information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+Typically, you can run your codespace on a choice of remote machine types. These machine types offer a choice of hardware specifications ranging from 2 cores to 32 cores, although the full range of machine types may not always be available. Each machine type has a different level of resources and a different billing tier. For information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
 
 By default the machine type with the lowest valid resources is used when you create a codespace.
diff --git a/data/reusables/education/student-codespaces-benefit.md b/data/reusables/education/student-codespaces-benefit.md
index 79fa5f069b..6da39f0277 100644
--- a/data/reusables/education/student-codespaces-benefit.md
+++ b/data/reusables/education/student-codespaces-benefit.md
@@ -1 +1 @@
-Verified students get free use of {% data variables.product.prodname_github_codespaces %}, up to 180 core hours per month, for their personal accounts. The monthly amount of storage and core hours of usage available to students is equivalent to the amount included with {% data variables.product.prodname_pro %} accounts. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
+Verified students get free use of {% data variables.product.prodname_github_codespaces %}, up to 180 core hours per month, for their personal accounts. The monthly amount of storage and core hours of usage available to students is equivalent to the amount included with {% data variables.product.prodname_pro %} accounts. For more information, see "[AUTOTITLE](/billing/managing-billing-for-your-products/managing-billing-for-github-codespaces/about-billing-for-github-codespaces)."
diff --git a/data/reusables/user-settings/context_switcher.md b/data/reusables/user-settings/context_switcher.md
index df3dd90a7c..cb722803a3 100644
--- a/data/reusables/user-settings/context_switcher.md
+++ b/data/reusables/user-settings/context_switcher.md
@@ -1 +1 @@
-You must manage billing settings and paid features for each of your accounts separately. You can switch between settings for your personal account, organization accounts, and enterprise accounts using the context switcher on each settings page. For more information, see "[AUTOTITLE](/billing/managing-your-github-billing-settings/about-billing-on-github#switching-between-settings-for-your-different-accounts)."
+You must manage billing settings and paid features for each of your accounts separately. You can switch between settings for your personal account, organization accounts, and enterprise accounts using the context switcher on each settings page. See "[AUTOTITLE](/billing/using-the-billing-platform/about-billing-on-github#switching-between-settings-for-your-different-accounts)."
diff --git a/src/fixtures/fixtures/versionless-redirects.txt b/src/fixtures/fixtures/versionless-redirects.txt
index 924ce1320c..82a0853b63 100644
--- a/src/fixtures/fixtures/versionless-redirects.txt
+++ b/src/fixtures/fixtures/versionless-redirects.txt
@@ -106,7 +106,7 @@
 - /graphql/guides/managing-enterprise-accounts
 - /v4/guides/managing-enterprise-accounts
 
-/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise
+/enterprise-cloud@latest/billing/using-the-billing-platform/about-billing-for-your-enterprise
 - /admin/overview/managing-billing-for-your-enterprise
 - /admin/overview/managing-billing-for-github-enterprise
 
@@ -223,7 +223,7 @@
 - /github/setting-up-and-managing-your-enterprise-account/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
 - /github/setting-up-and-managing-your-enterprise/enforcing-a-policy-on-dependency-insights-in-your-enterprise-account
 
-/enterprise-cloud@latest/billing/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise
+/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-licenses-for-visual-studio-subscriptions-with-github-enterprise/about-visual-studio-subscriptions-with-github-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-your-enterprise-account/managing-licenses-for-visual-studio-subscription-with-github-enterprise
 - /github/setting-up-and-managing-your-enterprise/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
 - /github/setting-up-and-managing-your-enterprise-account/managing-licenses-for-the-github-enterprise-and-visual-studio-bundle
@@ -433,9 +433,8 @@
 - /pages/getting-started-with-github-pages/changing-the-visibility-of-your-github-pages-site
 - /github/working-with-github-pages/changing-the-visibility-of-your-github-pages-site
 
-/enterprise-cloud@latest/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage
-- /billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage
-- /billing/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
+/enterprise-cloud@latest/billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage
+- /billing/managing-billing-for-your-products/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage
 - /admin/advanced-security/viewing-your-github-advanced-security-usage
 - /github/setting-up-and-managing-billing-and-payments-on-github/managing-licensing-for-github-advanced-security/viewing-your-github-advanced-security-usage
 - /github/setting-up-and-managing-your-enterprise/managing-use-of-advanced-security-for-organizations-in-your-enterprise-account
diff --git a/src/redirects/lib/static/redirect-exceptions.txt b/src/redirects/lib/static/redirect-exceptions.txt
index 6d4c6dbff1..5ad96a2d63 100644
--- a/src/redirects/lib/static/redirect-exceptions.txt
+++ b/src/redirects/lib/static/redirect-exceptions.txt
@@ -38,8 +38,8 @@
 /enterprise-cloud@latest/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning
 - /enterprise-cloud@latest/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning-for-a-repository
 
-/billing/managing-your-github-billing-settings/redeeming-a-coupon
-- /enterprise-cloud@latest/billing/managing-your-github-billing-settings/redeeming-a-coupon
+/billing/using-the-billing-platform/redeeming-a-coupon
+- /enterprise-cloud@latest/billing/using-the-billing-platform/redeeming-a-coupon
 
 # As seen in PR 48753 we are restructuring the copilot docs and removing the overview category
 /copilot/about-github-copilot
diff --git a/src/secret-scanning/data/public-docs.yml b/src/secret-scanning/data/public-docs.yml
index ab38c500b0..78146f9174 100644
--- a/src/secret-scanning/data/public-docs.yml
+++ b/src/secret-scanning/data/public-docs.yml
@@ -821,7 +821,7 @@
     ghes: '*'
   isPublic: true
   isPrivateWithGhas: false
-  hasPushProtection: false
+  hasPushProtection: true
   hasValidityCheck: false
   isduplicate: false
 - provider: Contentful
@@ -833,7 +833,7 @@
     ghes: '*'
   isPublic: false
   isPrivateWithGhas: true
-  hasPushProtection: true
+  hasPushProtection: false
   hasValidityCheck: false
   isduplicate: false
 - provider: Contributed Systems
@@ -2588,6 +2588,18 @@
   hasPushProtection: true
   hasValidityCheck: false
   isduplicate: false
+- provider: Postman
+  supportedSecret: Postman API Key
+  secretType: postman_api_key
+  versions:
+    fpt: '*'
+    ghec: '*'
+    ghes: '>=3.5'
+  isPublic: true
+  isPrivateWithGhas: true
+  hasPushProtection: true
+  hasValidityCheck: false
+  isduplicate: false
 - provider: Postman
   supportedSecret: Postman Collection Key
   secretType: postman_collection_key

From 5fb98cc0a51537ab5a5e909d1cf111df1f8f19aa Mon Sep 17 00:00:00 2001
From: docs-bot <77750099+docs-bot@users.noreply.github.com>
Date: Sat, 28 Sep 2024 12:34:33 -0400
Subject: [PATCH 8/8] Update audit log event data (#52472)

---
 src/audit-logs/lib/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/audit-logs/lib/config.json b/src/audit-logs/lib/config.json
index 02cacced6c..5d40cb6aa2 100644
--- a/src/audit-logs/lib/config.json
+++ b/src/audit-logs/lib/config.json
@@ -3,5 +3,5 @@
     "apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
     "apiRequestEvent": "This event is only available via audit log streaming."
   },
-  "sha": "09ad55c88b779f1bf2180e3865e17df1a2f115cb"
+  "sha": "3a21b2ac13997a590ad1a9b1a9f3f86109c3525e"
 }
\ No newline at end of file