diff --git a/.github/workflows/azure-preview-env-deploy.yml b/.github/workflows/azure-preview-env-deploy.yml
index d9b12b29cd43..6df9a6931f77 100644
--- a/.github/workflows/azure-preview-env-deploy.yml
+++ b/.github/workflows/azure-preview-env-deploy.yml
@@ -228,7 +228,7 @@ jobs:
       # Deploy ARM template is idempotent
       # Note: once the resources exist the image tag must change for a new deployment to occur (the image tag includes workflow run number, run attempt, as well as sha)
       - name: Run ARM deploy
-        uses: azure/arm-deploy@65ae74fb7aec7c680c88ef456811f353adae4d06
+        uses: azure/arm-deploy@a1361c2c2cd398621955b16ca32e01c65ea340f5
         with:
           resourceGroupName: ${{ secrets.PREVIEW_ENV_RESOURCE_GROUP }}
           subscriptionId: ${{ secrets.NONPROD_SUBSCRIPTION_ID }}
diff --git a/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md b/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
index 2a2a07e0527f..593bd78b5151 100644
--- a/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security.md
@@ -1,6 +1,6 @@
 ---
 title: About billing for GitHub Advanced Security
-intro: 'If you want to use {% data variables.product.prodname_GH_advanced_security %} features{% ifversion fpt or ghec %} in a private or internal repository{% endif %}, you need a license{% ifversion fpt %} for your enterprise{% endif %}.{% ifversion fpt or ghec %} These features are available free of charge for public repositories on {% data variables.product.prodname_dotcom_the_website %}.{% endif %}'
+intro: 'Learn how {% data variables.product.prodname_GH_advanced_security %} costs are calculated and how to get the most from your license.'
 product: '{% data reusables.gated-features.ghas %}'
 redirect_from:
   - /admin/advanced-security/about-licensing-for-github-advanced-security
@@ -19,11 +19,17 @@ topics:
 shortTitle: Advanced Security billing
 ---
 
-## About billing for {% data variables.product.prodname_GH_advanced_security %}
+## About licenses for {% data variables.product.prodname_GH_advanced_security %}
 
 {% ifversion fpt %}
 
-If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom_the_website %}, you will need a {% data variables.product.prodname_GH_advanced_security %} license, available with {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}.
+If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom_the_website %}, you will need a {% data variables.product.prodname_GH_advanced_security %} license, available with {% data variables.product.prodname_ghe_cloud %} or {% data variables.product.prodname_ghe_server %}. {% data reusables.advanced-security.ghas-trial %}
+
+{% note %}
+
+**Note:** If you change the visibility of a public repository to private then {% data variables.product.prodname_GH_advanced_security %} will be disabled for that repository.
+
+{% endnote %}
 
 For information about billing for {% data variables.product.prodname_GH_advanced_security %}, see the [{% data variables.product.prodname_ghe_cloud %} documentation](/enterprise-cloud@latest/billing/managing-billing-for-github-advanced-security/about-billing-for-github-advanced-security).
 
@@ -31,6 +37,12 @@ For information about billing for {% data variables.product.prodname_GH_advanced
 
 If you want to use {% data variables.product.prodname_GH_advanced_security %} features on any repository apart from a public repository on {% data variables.product.prodname_dotcom_the_website %}, you will need a {% data variables.product.prodname_GH_advanced_security %} license. For more information about {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
 
+{% 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-invoiced %}
+
+For other billing-related questions, contact {% data variables.contact.github_support %}.
+
 {% elsif ghes %}
 
 You can make extra features for code security available to users by buying and uploading a license for {% data variables.product.prodname_GH_advanced_security %}. For more information about {% data variables.product.prodname_GH_advanced_security %}, see "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
@@ -39,33 +51,25 @@ You can make extra features for code security available to users by buying and u
 
 {% ifversion ghes or ghec %}
 
-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.
-
-{% note %}
-
-**Note:** Active committers are calculated using both the commit author information and the timestamp for when the code was pushed to {% data variables.product.product_name %}.
+## License size
 
-- When a user pushes code to {% data variables.product.prodname_dotcom %}, every user who authored code in that push counts towards {% data variables.product.prodname_GH_advanced_security %} {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %}, even if the code is not new to {% data variables.product.prodname_dotcom %}.
-
-- Users should always create branches from a recent base, or rebase them before pushing. This will ensure that users who have not committed in the last 90 days do not take up {% data variables.product.prodname_GH_advanced_security %} {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %}.
+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.
 
-{% endnote %}
+When you remove a user from your enterprise account, the user's license is freed within 24 hours.
 
 {% ifversion ghes %}
 You can determine how many licenses you'll need for {% data variables.product.prodname_GH_advanced_security %} by generating a count of your instance's active committers in the site admin dashboard. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/site-admin-dashboard#advanced-security-committers)."
 {% endif %}
 
-{% ifversion ghec %}
-If you use {% data variables.product.prodname_ghe_cloud %} with an enterprise account and pay with a credit card, you can purchase a {% data variables.product.prodname_GH_advanced_security %} license or start a free trial from your enterprise account settings. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security)" and "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/setting-up-a-trial-of-github-advanced-security)."
+If you are over your license limit, {% data variables.product.prodname_GH_advanced_security %} continues to work on all repositories where it is already enabled. However, in organizations where {% data variables.product.prodname_GH_advanced_security %} is enabled for new repositories, repositories will be created with the feature deactivated. In addition, the option to enable {% data variables.product.prodname_GH_advanced_security %} for existing repositories will not be available.
 
-You cannot purchase {% data variables.product.prodname_GH_advanced_security %} or start a {% data variables.product.prodname_GH_advanced_security %} trial if you are currently on a {% data variables.product.prodname_ghe_cloud %} trial.
+As soon as you free up some {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %}, by deactivating {% data variables.product.prodname_GH_advanced_security %} for some repositories or by increasing your license size, the options for activating {% data variables.product.prodname_GH_advanced_security %} will work again as normal.
 
-If you pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss licensing {% data variables.product.prodname_GH_advanced_security %} for your enterprise.
+You can enforce policies to allow or disallow the use of {% data variables.product.prodname_advanced_security %} by organizations owned by your enterprise account. For more information, see "[AUTOTITLE](/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise)."
 
-For other billing-related questions, contact {% data variables.contact.github_support %}.
-{% endif %}
+For more information on viewing license usage, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
 
-## About committer numbers for {% data variables.product.prodname_GH_advanced_security %}
+## Active committers and unique committers
 
 We record and display two numbers of {% ifversion ghas-billing-UI-update %}active {% endif %}committers for {% data variables.product.prodname_GH_advanced_security %} on {% data variables.location.product_location %}:
 
@@ -74,34 +78,19 @@ We record and display two numbers of {% ifversion ghas-billing-UI-update %}activ
 
 If there are no unique {% ifversion ghas-billing-UI-update %}active {% endif %}committers, all active committers also contribute to other repositories or organizations that use {% data variables.product.prodname_GH_advanced_security %}. Deactivating the feature for that repository or organization would not free any {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %} for {% data variables.product.prodname_GH_advanced_security %}.
 
-When you remove a user from your enterprise account, the user's license is freed within 24 hours.
-
 {% note %}
 
 **Note:** Users can contribute to multiple repositories or organizations. Usage is measured across the whole enterprise account to ensure that each member uses one {% ifversion ghas-billing-UI-update %}license {% else %}seat {% endif %}regardless of how many repositories or organizations the user contributes to.
 
 {% endnote %}
 
-{% ifversion fpt or ghes or ghec %}
-
 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.
 
-If you are over your license limit, {% data variables.product.prodname_GH_advanced_security %} continues to work on all repositories where it is already enabled. However, in organizations where {% data variables.product.prodname_GH_advanced_security %} is enabled for new repositories, repositories will be created with the feature deactivated. In addition, the option to enable {% data variables.product.prodname_GH_advanced_security %} for existing repositories will not be available.{% ifversion fpt or ghec %} If you change the visibility of a public repository to private then {% data variables.product.prodname_GH_advanced_security %} will be disabled for that repository.{% endif %}
-
-As soon as you free up some {% ifversion ghas-billing-UI-update %}licenses{% else %}seats{% endif %}, by deactivating {% data variables.product.prodname_GH_advanced_security %} for some repositories or by increasing your license size, the options for activating {% data variables.product.prodname_GH_advanced_security %} will work again as normal.
-{% endif %}
-
-You can enforce policies to allow or disallow the use of {% data variables.product.prodname_advanced_security %} by organizations owned by your enterprise account. For more information, see "[Enforcing policies for {% data variables.product.prodname_advanced_security %} in your enterprise]({% ifversion fpt %}/enterprise-cloud@latest/{% endif %}/admin/policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-advanced-security-in-your-enterprise){% ifversion fpt %}" in the {% data variables.product.prodname_ghe_cloud %} documentation.{% else %}."{% endif %}
-
-{% ifversion fpt or ghes or ghec %}
-For more information on viewing license usage, see "[AUTOTITLE](/billing/managing-billing-for-github-advanced-security/viewing-your-github-advanced-security-usage)."
-{% endif %}
-
 {% 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)."
 {% endif %}
 
-## Understanding active committer usage
+## Understanding usage
 
 The following example timeline demonstrates how active committer count for {% data variables.product.prodname_GH_advanced_security %} could change over time in an enterprise. For each month, you will find events, along with the resulting committer count.
 
diff --git a/content/billing/managing-billing-for-github-advanced-security/index.md b/content/billing/managing-billing-for-github-advanced-security/index.md
index 51aba2fca898..3676531550be 100644
--- a/content/billing/managing-billing-for-github-advanced-security/index.md
+++ b/content/billing/managing-billing-for-github-advanced-security/index.md
@@ -1,7 +1,7 @@
 ---
 title: Managing billing for GitHub Advanced Security
 shortTitle: GitHub Advanced Security
-intro: 'You can view and manage your use of seats on a license for {% data variables.product.prodname_advanced_security %}.'
+intro: 'You can view and manage your use of seats on a license for {% data variables.product.prodname_GH_advanced_security %}.'
 product: '{% data reusables.gated-features.ghas %}'
 redirect_from:
   - /billing/managing-licensing-for-github-advanced-security
@@ -19,4 +19,3 @@ children:
   - /viewing-your-github-advanced-security-usage
 
 ---
-
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-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
index 7a552b76c0cf..63acefd42295 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-github-advanced-security/setting-up-a-trial-of-github-advanced-security.md
@@ -1,6 +1,6 @@
 ---
 title: Setting up a trial of GitHub Advanced Security
-intro: 'You can evaluate the extra security features that {% data variables.product.prodname_dotcom %} makes available to customers with a {% data variables.product.prodname_GH_advanced_security %} license by setting up a free trial of {% data variables.product.prodname_GH_advanced_security %}.'
+intro: 'You can try {% data variables.product.prodname_GH_advanced_security %} for free.'
 product: '{% data reusables.gated-features.ghas %}'
 versions:
   ghec: '*'
@@ -11,13 +11,17 @@ topics:
 shortTitle: Set up an Advanced Security trial
 ---
 
-## About trials of {% data variables.product.prodname_GH_advanced_security %}
+## About {% data variables.product.prodname_GH_advanced_security %}
 
 {% data variables.product.prodname_GH_advanced_security %} provides features that help you improve and maintain the security and quality of code, such as {% data variables.product.prodname_code_scanning %}, {% data variables.product.prodname_secret_scanning %}, and dependency review. For more information, see "[AUTOTITLE](/get-started/learning-about-github/about-github-advanced-security)."
 
-During a trial, you can add any number of committers and enable {% data variables.product.prodname_GH_advanced_security %} for any number of organizations. You can set up a trial if you pay for {% data variables.product.prodname_ghe_cloud %} by credit card or PayPal, or if you are already taking part in a free trial of {% data variables.product.prodname_ghe_cloud %}.
+## About trials of {% data variables.product.prodname_GH_advanced_security %}
+
+{% data reusables.advanced-security.ghas-trial-availability %}
+
+{% data reusables.advanced-security.ghas-trial-invoiced %}
 
-The standard length of the trial is 30 days. If you're taking part in a free trial of {% data variables.product.prodname_ghe_cloud %}, the trial of {% data variables.product.prodname_GH_advanced_security %} will last for the time you have remaining on your trial of {% data variables.product.prodname_ghe_cloud %}.
+During a trial, you can add any number of committers and enable {% data variables.product.prodname_GH_advanced_security %} for any number of organizations. The standard length of the trial is 30 days. If you're taking part in a free trial of {% data variables.product.prodname_ghe_cloud %}, the trial of {% data variables.product.prodname_GH_advanced_security %} will last for the time you have remaining on your trial of {% data variables.product.prodname_ghe_cloud %}.
 
 ## Prerequisites
 
@@ -33,7 +37,7 @@ To set up a trial of {% data variables.product.prodname_GH_advanced_security %},
 
 ## Finishing your trial
 
-You can finish your trial at any time by purchasing {% data variables.product.prodname_GH_advanced_security %}. If you haven't purchased {% data variables.product.prodname_GH_advanced_security %} by the end of the 14 days, your trial will expire.
+You can finish your trial at any time by purchasing {% data variables.product.prodname_GH_advanced_security %}. If you haven't purchased {% data variables.product.prodname_GH_advanced_security %} by the end of the 30 days, your trial will expire.
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.settings-tab %}
diff --git a/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md b/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
index 01b28d56303a..f62be5388eb7 100644
--- a/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
+++ b/content/billing/managing-billing-for-github-advanced-security/signing-up-for-github-advanced-security.md
@@ -18,8 +18,9 @@ shortTitle: Sign up for Advanced Security
 {% data reusables.enterprise-accounts.license-tab %}
 1. To the right of "GitHub Advanced Security", click **Buy Advanced Security**.
 
-   ![Screenshot of the {% data variables.product.prodname_GH_advanced_security %} section of the enterprise licensing screen. The "Buy Advanced Security" button is highlighted with an orange outline.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
-1. {% data reusables.advanced-security.purchase-ghas %}
+   ![Screenshot of the {% data variables.product.prodname_GH_advanced_security %} section of the enterprise licensing screen. The "Buy Advanced Security" button is outlined in orange.](/assets/images/help/enterprises/ghas-buy-advanced-security-button.png)
+
+{% data reusables.advanced-security.purchase-ghas %}
 
 ## Further reading
 
diff --git a/content/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning.md b/content/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning.md
index a255c9539dfa..09429cbae757 100644
--- a/content/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning.md
+++ b/content/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning.md
@@ -44,6 +44,8 @@ To get started with {% data variables.product.prodname_code_scanning %}, see "[A
 
 {% data variables.product.prodname_code_scanning_caps %} uses {% data variables.product.prodname_actions %}, and each run of a {% data variables.product.prodname_code_scanning %} workflow consumes minutes for {% data variables.product.prodname_actions %}. For more information, see "[AUTOTITLE](/billing/managing-billing-for-github-actions/about-billing-for-github-actions)."
 
+To use {% data variables.product.prodname_code_scanning %} on a private repository, you will also need a license for {% data variables.product.prodname_GH_advanced_security %}. {% data reusables.advanced-security.ghas-trial %}
+
 {% endif %}
 
 ## About tools for {% data variables.product.prodname_code_scanning %}
diff --git a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/about-the-codeql-cli.md b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/about-the-codeql-cli.md
index 65364b40005c..16bf22ec9f7e 100644
--- a/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/about-the-codeql-cli.md
+++ b/content/code-security/codeql-cli/getting-started-with-the-codeql-cli/about-the-codeql-cli.md
@@ -126,4 +126,6 @@ If you are working with an Open Source Codebase (that is, a codebase that is rel
 - To perform analysis of the Open Source Codebase.
 - If the Open Source Codebase is hosted and maintained on {% data variables.product.prodname_dotcom_the_website %}, to generate {% data variables.product.prodname_codeql %} databases for or during automated analysis, continuous integration, or continuous delivery.
 
-{% data variables.product.prodname_codeql %} can’t be used for automated analysis, continuous integration or continuous delivery, whether as part of normal software engineering processes or otherwise, except in the express cases set forth herein. For these uses, contact the [sales team](https://enterprise.github.com/contact).
+{% data variables.product.prodname_codeql %} can’t be used for automated analysis, continuous integration or continuous delivery, whether as part of normal software engineering processes or otherwise, except in the express cases set forth herein unless you have a license for {% data variables.product.prodname_GH_advanced_security %}.
+
+{% data reusables.advanced-security.ghas-trial %}
diff --git a/content/code-security/getting-started/github-security-features.md b/content/code-security/getting-started/github-security-features.md
index 08058e6347a8..176f50da2edb 100644
--- a/content/code-security/getting-started/github-security-features.md
+++ b/content/code-security/getting-started/github-security-features.md
@@ -91,13 +91,13 @@ The following {% data variables.product.prodname_GH_advanced_security %} feature
 {% elsif ghec %}
 Many {% data variables.product.prodname_GH_advanced_security %} features are available and free of charge for public repositories on {% data variables.product.prodname_dotcom_the_website %}. Organizations within an enterprise that have a {% data variables.product.prodname_GH_advanced_security %} license can use the following features on all their repositories. {% data reusables.advanced-security.more-info-ghas %}
 
-{% data reusables.advanced-security.ghas-trial %}
-
 {% elsif ghes %}
 {% data variables.product.prodname_GH_advanced_security %} features are available for enterprises with a license for {% data variables.product.prodname_GH_advanced_security %}. The features are restricted to repositories owned by an organization. {% data reusables.advanced-security.more-info-ghas %}
 
 {% endif %}
 
+{% data reusables.advanced-security.ghas-trial %}
+
 ### {% data variables.product.prodname_code_scanning_caps %}
 
 Automatically detect security vulnerabilities and coding errors in new or modified code. Potential problems are highlighted, with detailed information, allowing you to fix the code before it's merged into your default branch. For more information, see "[AUTOTITLE](/code-security/code-scanning/introduction-to-code-scanning/about-code-scanning)."
diff --git a/content/code-security/index.md b/content/code-security/index.md
index 9668d7d8d84f..557361decdac 100644
--- a/content/code-security/index.md
+++ b/content/code-security/index.md
@@ -6,6 +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 %}'
 featuredLinks:
   startHere:
     - /code-security/getting-started/securing-your-repository
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 20c0f71a9952..b8a67d2c749e 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
@@ -18,9 +18,9 @@ shortTitle: GitHub Advanced Security
 
 {% data variables.product.prodname_dotcom %} has many features that help you improve and maintain the quality of your code. Some of these are included in all plans, such as dependency graph and {% data variables.product.prodname_dependabot_alerts %}. Other security features require a {% data variables.product.prodname_GH_advanced_security %} (GHAS){% ifversion fpt or ghec %} license to run on repositories apart from public repositories on {% data variables.product.prodname_dotcom_the_website %}{% 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)."{% 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 %}
+{% data reusables.advanced-security.ghas-trial %}
 
-{% ifversion ghec %}{% data reusables.advanced-security.ghas-trial %}{% 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)."{% 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 ghas-for-azure-devops %}
 {% note %}
@@ -92,17 +92,6 @@ If you have an enterprise account, license use for the entire enterprise is show
 
 {% endif %}
 
-{% ifversion fpt or ghec %}
-
-## About starter workflows for {% data variables.product.prodname_advanced_security %}
-
-{% data reusables.advanced-security.starter-workflows-beta %}
-{% data reusables.advanced-security.starter-workflow-overview %}
-
-For more information on starter workflows, see "[AUTOTITLE](/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/configuring-advanced-setup-for-code-scanning#configuring-code-scanning-using-third-party-actions)" and "[AUTOTITLE](/actions/learn-github-actions/using-starter-workflows)."
-
-{% endif %}
-
 {% ifversion github-certification %}
 
 ## About {% data variables.product.prodname_GH_advanced_security %} Certification
diff --git a/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md
index a198b09e9016..ed649a824de4 100644
--- a/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md
+++ b/content/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization.md
@@ -73,12 +73,6 @@ To target all repositories in your organization, in the "Target repositories" se
 
 ### Targeting repositories by properties in your organization
 
-{% note %}
-
-**Note:** Repository properties are in public beta and subject to change.
-
-{% endnote %}
-
 You can target repositories in your organization by custom properties. For more information, see "[AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization)."
 
 1. To target a dynamic list of repositories in your organization by properties, in the "Target repositories" section, select {% octicon "goal" aria-hidden="true" %} **Target: REPOSITORIES**, then click **Dynamic list by property**.
diff --git a/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md b/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md
index 7952146e29b3..1c82ee9d824f 100644
--- a/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md
+++ b/content/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization.md
@@ -9,17 +9,13 @@ topics:
 shortTitle: Custom properties
 ---
 
-{% note %}
-
-**Note:** Repository properties are in public beta and subject to change.
-
-{% endnote %}
-
 ## About custom properties
 
 Custom properties allow you to decorate your repositories with information such as compliance frameworks, data sensitivity, or project details. Custom properties are private and can only be viewed by people with read permissions to the repository.
 
+{% ifversion ghec or ghes  %}
 You can use repository properties to determine which repositories to target with a ruleset. For more information, see "[AUTOTITLE](/organizations/managing-organization-settings/creating-rulesets-for-repositories-in-your-organization#targeting-repositories-by-properties-in-your-organization)."
+{% endif %}
 
 ## Allowed characters
 
@@ -32,6 +28,8 @@ Custom property names and values may only contain certain characters:
 
 You can add custom properties to your organization and set values for those properties for repositories in your organization.
 
+You can also use the REST API to create and manage custom properties for an organization. For more information, see "[AUTOTITLE](/rest/orgs/custom-properties)."
+
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}
 {% data reusables.organizations.access-custom-properties %}
@@ -62,6 +60,8 @@ You can set values for custom properties for repositories in your organization.
 
 People with read permissions to a repository can view the values of custom properties for that repository, but they can't edit those values.
 
+You can also use the REST API to list the custom properties assigned to a repository by your organization. For more information, see "[AUTOTITLE](/rest/repos/custom-properties)."
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 1. In the "Code and automation" section of the sidebar, click **{% octicon "tools" aria-hidden="true"%} Custom properties**.
diff --git a/content/rest/orgs/custom-properties.md b/content/rest/orgs/custom-properties.md
index 65f1fee0e3f3..48d15d52632d 100644
--- a/content/rest/orgs/custom-properties.md
+++ b/content/rest/orgs/custom-properties.md
@@ -17,10 +17,4 @@ redirect_from:
 
 You can use the REST API to create and manage custom properties for an organization. You can use custom properties to add metadata to repositories in your organization. For more information, see "[AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization)."
 
-{% note %}
-
-**Note:** The API endpoints for custom properties are in public beta and subject to change.
-
-{% endnote %}
-
 <!-- Content after this section is automatically generated -->
diff --git a/content/rest/repos/custom-properties.md b/content/rest/repos/custom-properties.md
index c6faf209e995..aa8b8c159e44 100644
--- a/content/rest/repos/custom-properties.md
+++ b/content/rest/repos/custom-properties.md
@@ -17,10 +17,4 @@ redirect_from:
 
 You can use the REST API to view the custom properties that were assigned to a repository by the organization that owns the repository. For more information, see "[AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization)." For more information about the REST API endpoints to manage custom properties, see "[AUTOTITLE](/rest/orgs/properties)."
 
-{% note %}
-
-**Note:** The API endpoints for custom properties are in public beta and subject to change.
-
-{% endnote %}
-
 <!-- Content after this section is automatically generated -->
diff --git a/content/search-github/searching-on-github/searching-for-repositories.md b/content/search-github/searching-on-github/searching-for-repositories.md
index f4d9a49018d5..fc0122ea3655 100644
--- a/content/search-github/searching-on-github/searching-for-repositories.md
+++ b/content/search-github/searching-on-github/searching-for-repositories.md
@@ -157,12 +157,6 @@ You can filter your search based on the visibility of the repositories. For more
 
 ## Search based on repository custom property
 
-{% note %}
-
-**Note:** Repository properties are in public beta and subject to change.
-
-{% endnote %}
-
 You can filter repositories based on custom properties using the `props.` prefixed qualifiers. For more information, see "[AUTOTITLE](/organizations/managing-organization-settings/managing-custom-properties-for-repositories-in-your-organization)."
 
 For these qualifiers to work, the search must be limited to a single organization. Otherwise, `props.` qualifiers are ignored.
diff --git a/data/features/repository-properties.yml b/data/features/repository-properties.yml
index e867607e09ca..51cc0febc659 100644
--- a/data/features/repository-properties.yml
+++ b/data/features/repository-properties.yml
@@ -1,4 +1,6 @@
 # Reference: Issue #10331 - Repository Properties
 
 versions:
+  fpt: '*'
   ghec: '*'
+  ghes: '>=3.13'
diff --git a/data/reusables/advanced-security/ghas-trial-availability.md b/data/reusables/advanced-security/ghas-trial-availability.md
new file mode 100644
index 000000000000..d4f52c1d9a6a
--- /dev/null
+++ b/data/reusables/advanced-security/ghas-trial-availability.md
@@ -0,0 +1 @@
+{% ifversion ghec %}You can set up a trial if you pay for {% data variables.product.prodname_ghe_cloud %} by credit card or PayPal, or if you are already taking part in a free trial of {% data variables.product.prodname_ghe_cloud %}.{% endif %}
diff --git a/data/reusables/advanced-security/ghas-trial-invoiced.md b/data/reusables/advanced-security/ghas-trial-invoiced.md
new file mode 100644
index 000000000000..45d454c2b2bb
--- /dev/null
+++ b/data/reusables/advanced-security/ghas-trial-invoiced.md
@@ -0,0 +1 @@
+{% ifversion ghec %}If you pay by invoice, contact {% data variables.contact.contact_enterprise_sales %} to discuss trialing {% data variables.product.prodname_GH_advanced_security %} for your enterprise.{% endif %}
diff --git a/data/reusables/advanced-security/ghas-trial.md b/data/reusables/advanced-security/ghas-trial.md
index 5da533f96566..402bdc58c4f4 100644
--- a/data/reusables/advanced-security/ghas-trial.md
+++ b/data/reusables/advanced-security/ghas-trial.md
@@ -1 +1,2 @@
-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)."
+{% 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 %}
diff --git a/data/reusables/code-scanning/about-code-scanning.md b/data/reusables/code-scanning/about-code-scanning.md
index 7e0aa32e3c7d..58b2bdb863f8 100644
--- a/data/reusables/code-scanning/about-code-scanning.md
+++ b/data/reusables/code-scanning/about-code-scanning.md
@@ -1 +1 @@
-{% data variables.product.prodname_code_scanning_caps %} is a feature that you use to analyze the code in a {% data variables.product.prodname_dotcom %} repository to find security vulnerabilities and coding errors. Any problems identified by the analysis are shown in {% data variables.product.product_name %}.
+{% data variables.product.prodname_code_scanning_caps %} is a feature that you use to analyze the code in a {% data variables.product.prodname_dotcom %} repository to find security vulnerabilities and coding errors. Any problems identified by the analysis are shown in your repository.
diff --git a/data/reusables/gated-features/secret-scanning.md b/data/reusables/gated-features/secret-scanning.md
index 1a344145c403..93de9f9720f7 100644
--- a/data/reusables/gated-features/secret-scanning.md
+++ b/data/reusables/gated-features/secret-scanning.md
@@ -8,4 +8,4 @@
 
 {%- endif %} {% data reusables.advanced-security.more-info-ghas-secret-scanning %}
 
-{% ifversion ghec %}{% data reusables.advanced-security.ghas-trial %}{% endif %}
+{% data reusables.advanced-security.ghas-trial %}
diff --git a/data/ui.yml b/data/ui.yml
index a04647209b44..fac8d11cd4f6 100644
--- a/data/ui.yml
+++ b/data/ui.yml
@@ -206,6 +206,7 @@ product_landing:
   reference: Reference
   overview: Overview
   try_ghec_for_free: Try Enterprise Cloud for free
+  try_ghas_for_free: Try GitHub Advanced Security for free
   plan_your_migration: Plan your migration
   releases: Releases
   guides: Guides
diff --git a/src/fixtures/fixtures/data/ui.yml b/src/fixtures/fixtures/data/ui.yml
index a04647209b44..fac8d11cd4f6 100644
--- a/src/fixtures/fixtures/data/ui.yml
+++ b/src/fixtures/fixtures/data/ui.yml
@@ -206,6 +206,7 @@ product_landing:
   reference: Reference
   overview: Overview
   try_ghec_for_free: Try Enterprise Cloud for free
+  try_ghas_for_free: Try GitHub Advanced Security for free
   plan_your_migration: Plan your migration
   releases: Releases
   guides: Guides