diff --git a/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md b/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md
index 1687a4de48..3a18237d18 100644
--- a/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md
+++ b/content/code-security/secret-scanning/defining-custom-patterns-for-secret-scanning.md
@@ -59,10 +59,9 @@ Before defining a custom pattern, you must ensure that {% data variables.product
 {% data reusables.repositories.navigate-to-code-security-and-analysis %}
 {% data reusables.repositories.navigate-to-ghas-settings %}
 {% data reusables.advanced-security.secret-scanning-new-custom-pattern %}
-{% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %}{% ifversion secret-scanning-custom-enterprise-35 or custom-pattern-dry-run-ga %}
+{% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %}{% ifversion custom-pattern-dry-run-ga %}
 1. When you're ready to test your new custom pattern, to identify matches in the repository without creating alerts, click **Save and dry run**.
 {% data reusables.advanced-security.secret-scanning-dry-run-results %}
-{%- ifversion secret-scanning-custom-enterprise-35 %}{% indented_data_reference reusables.secret-scanning.beta-dry-runs spaces=3 %}{% endif %}
 {% endif %}
 {% data reusables.advanced-security.secret-scanning-create-custom-pattern %}{% ifversion secret-scanning-push-protection-custom-patterns %}
 1. Optionally, to enable push protection for your custom pattern, click **Enable**.
@@ -125,11 +124,10 @@ Before defining a custom pattern, you must ensure that you enable {% data variab
 {% data reusables.repositories.navigate-to-ghas-settings %}
 {% data reusables.advanced-security.secret-scanning-new-custom-pattern %}
 {% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %}
-{%- ifversion secret-scanning-custom-enterprise-35 or custom-pattern-dry-run-ga %}
+{%- ifversion custom-pattern-dry-run-ga %}
 1. When you're ready to test your new custom pattern, to identify matches in select repositories without creating alerts, click **Save and dry run**.
 {% data reusables.advanced-security.secret-scanning-dry-run-select-repos %}
 {% data reusables.advanced-security.secret-scanning-dry-run-results %}
-{%- ifversion secret-scanning-custom-enterprise-35 %}{% indented_data_reference reusables.secret-scanning.beta-dry-runs spaces=3 %}{% endif %}
 {%- endif %}
 {% data reusables.advanced-security.secret-scanning-create-custom-pattern %}{% ifversion secret-scanning-push-protection-custom-patterns %}
 1. Optionally, to enable push protection for your custom pattern, click **Enable**. For more information, see "[AUTOTITLE](/code-security/secret-scanning/protecting-pushes-with-secret-scanning#enabling-secret-scanning-as-a-push-protection-in-an-organization-for-a-custom-pattern)."
@@ -148,7 +146,7 @@ Before defining a custom pattern, you must ensure that you enable secret scannin
 
 {% note %}
 
-{% ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %}
+{% ifversion custom-pattern-dry-run-ga %}
 **Notes:**
 - At the enterprise level, only the creator of a custom pattern can edit the pattern, and use it in a dry run.
 - {% data reusables.secret-scanning.dry-runs-enterprise-permissions %}
@@ -167,11 +165,10 @@ Before defining a custom pattern, you must ensure that you enable secret scannin
 {% data reusables.enterprise-accounts.advanced-security-security-features %}{% endif %}
 1. Under "Secret scanning custom patterns", click **New pattern**.
 {% data reusables.advanced-security.secret-scanning-add-custom-pattern-details %}
-{%- ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %}
+{%- ifversion custom-pattern-dry-run-ga %}
 1. When you're ready to test your new custom pattern, to identify matches in the enterprise without creating alerts, click **Save and dry run**.
 {% data reusables.advanced-security.secret-scanning-dry-run-select-enterprise-repos %}
 {% data reusables.advanced-security.secret-scanning-dry-run-results %}
-{%- ifversion secret-scanning-custom-enterprise-36 %}{% indented_data_reference reusables.secret-scanning.beta-dry-runs spaces=3 %}{% endif %}
 {%- endif %}
 {% data reusables.advanced-security.secret-scanning-create-custom-pattern %}{% ifversion secret-scanning-push-protection-custom-patterns %}
 1. Optionally, to enable push protection for your custom pattern, click **Enable**. For more information, see "[AUTOTITLE](/code-security/secret-scanning/protecting-pushes-with-secret-scanning)."
@@ -184,7 +181,7 @@ After your pattern is created, {% data variables.product.prodname_secret_scannin
 When you save a change to a custom pattern, this closes all the {% data variables.secret-scanning.alerts %} that were created using the previous version of the pattern.
 {% data reusables.secret-scanning.view-custom-pattern %}
 1. Under "{% data variables.product.prodname_secret_scanning_caps %}", to the right of the custom pattern you want to edit, click {% octicon "pencil" aria-label="Edit pattern" %}.
-{%- ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga  %}
+{%- ifversion custom-pattern-dry-run-ga  %}
 1. When you're ready to test your edited custom pattern, to identify matches without creating alerts, click **Save and dry run**.
 {%- endif %}
 1. When you have reviewed and tested your changes, click **Publish changes**.{% ifversion secret-scanning-push-protection-custom-patterns %}
diff --git a/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md b/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md
index 704272a847..5750eeb11a 100644
--- a/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md
+++ b/content/code-security/secret-scanning/push-protection-for-repositories-and-organizations.md
@@ -121,7 +121,7 @@ You can enable {% data variables.product.prodname_secret_scanning %} as a push p
 
 {% data reusables.secret-scanning.push-protection-enterprise-note %}
 
-Before enabling push protection for a custom pattern at enterprise level, you must also{% ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %} test your custom patterns using dry runs. {% data reusables.secret-scanning.dry-runs-enterprise-permissions %}{% else %} test your custom patterns in a repository before defining them for your entire enterprise, as there is no dry-run functionality. That way, you can avoid creating excess false-positive {% data variables.secret-scanning.alerts %}.{% endif %}
+Before enabling push protection for a custom pattern at enterprise level, you must also{% ifversion custom-pattern-dry-run-ga %} test your custom patterns using dry runs. {% data reusables.secret-scanning.dry-runs-enterprise-permissions %}{% else %} test your custom patterns in a repository before defining them for your entire enterprise, as there is no dry-run functionality. That way, you can avoid creating excess false-positive {% data variables.secret-scanning.alerts %}.{% endif %}
 
 {% data reusables.enterprise-accounts.access-enterprise %}
 {% data reusables.enterprise-accounts.policies-tab %}{% ifversion security-feature-enablement-policies %}
@@ -130,7 +130,7 @@ Before enabling push protection for a custom pattern at enterprise level, you mu
 {% data reusables.enterprise-accounts.advanced-security-policies %}
 {% data reusables.enterprise-accounts.advanced-security-security-features %}{% endif %}
 {% data reusables.advanced-security.secret-scanning-edit-custom-pattern %}
-{% ifversion secret-scanning-custom-enterprise-36 or custom-pattern-dry-run-ga %}
+{% ifversion custom-pattern-dry-run-ga %}
    {% note %}
 
    **Note**: At the enterprise level, you can only edit and enable push protection for custom patterns that you created.
diff --git a/data/features/limit-app-access-requests.yml b/data/features/limit-app-access-requests.yml
index 28248b9a18..01e1254c54 100644
--- a/data/features/limit-app-access-requests.yml
+++ b/data/features/limit-app-access-requests.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/data/features/limit-branches-tags-in-push.yml b/data/features/limit-branches-tags-in-push.yml
index 998ff001ca..5003edfa4a 100644
--- a/data/features/limit-branches-tags-in-push.yml
+++ b/data/features/limit-branches-tags-in-push.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>=3.7'
diff --git a/data/features/link-existing-branches-to-issue.yml b/data/features/link-existing-branches-to-issue.yml
index fc3fb4d7d1..15175443ec 100644
--- a/data/features/link-existing-branches-to-issue.yml
+++ b/data/features/link-existing-branches-to-issue.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/lock-branch.yml b/data/features/lock-branch.yml
index d2e92315f6..9e300a72b4 100644
--- a/data/features/lock-branch.yml
+++ b/data/features/lock-branch.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/math-backtick-syntax.yml b/data/features/math-backtick-syntax.yml
index 220d2e7709..b082abc0da 100644
--- a/data/features/math-backtick-syntax.yml
+++ b/data/features/math-backtick-syntax.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>3.9'
-  ghae: '>3.9'
diff --git a/data/features/math-fenced-blocks.yml b/data/features/math-fenced-blocks.yml
index 1561bf80aa..af1d710cd7 100644
--- a/data/features/math-fenced-blocks.yml
+++ b/data/features/math-fenced-blocks.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/math.yml b/data/features/math.yml
index 3b39b39aec..8b30869da5 100644
--- a/data/features/math.yml
+++ b/data/features/math.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/mermaid.yml b/data/features/mermaid.yml
index 2ecb5f087a..f197c42028 100644
--- a/data/features/mermaid.yml
+++ b/data/features/mermaid.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/motion-management.yml b/data/features/motion-management.yml
index 1ca0cc5f2c..e27221d20e 100644
--- a/data/features/motion-management.yml
+++ b/data/features/motion-management.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/nested-reusable-workflow.yml b/data/features/nested-reusable-workflow.yml
index 11d6587fb0..8af1aa71a4 100644
--- a/data/features/nested-reusable-workflow.yml
+++ b/data/features/nested-reusable-workflow.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/only-notify-requested-members.yml b/data/features/only-notify-requested-members.yml
index 2b9ca93c2e..e109b98fa1 100644
--- a/data/features/only-notify-requested-members.yml
+++ b/data/features/only-notify-requested-members.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.4'
-  ghae: '>= 3.4'
diff --git a/data/features/org-enable-code-scanning.yml b/data/features/org-enable-code-scanning.yml
index 016897aaa3..43d0b27c70 100644
--- a/data/features/org-enable-code-scanning.yml
+++ b/data/features/org-enable-code-scanning.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>3.8'
-  ghae: '>3.8'
diff --git a/data/features/org-owners-limit-forks-creation.yml b/data/features/org-owners-limit-forks-creation.yml
index 7705caa038..53314e30a0 100644
--- a/data/features/org-owners-limit-forks-creation.yml
+++ b/data/features/org-owners-limit-forks-creation.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/data/features/org-profile-pin-private.yml b/data/features/org-profile-pin-private.yml
index b2119590ad..b7efaaf002 100644
--- a/data/features/org-profile-pin-private.yml
+++ b/data/features/org-profile-pin-private.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/partial-reruns-with-reusable.yml b/data/features/partial-reruns-with-reusable.yml
index c0854e2f80..202b63d4d7 100644
--- a/data/features/partial-reruns-with-reusable.yml
+++ b/data/features/partial-reruns-with-reusable.yml
@@ -3,4 +3,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.5'
-  ghae: '>= 3.5'
diff --git a/data/features/pat-v2-enterprise.yml b/data/features/pat-v2-enterprise.yml
index fcaf66a795..126b6b907b 100644
--- a/data/features/pat-v2-enterprise.yml
+++ b/data/features/pat-v2-enterprise.yml
@@ -4,4 +4,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.10'
-  ghae: '>=3.10'
diff --git a/data/features/pat-v2-org-admin-api.yml b/data/features/pat-v2-org-admin-api.yml
index f02d958d55..5f92ddc6c7 100644
--- a/data/features/pat-v2-org-admin-api.yml
+++ b/data/features/pat-v2-org-admin-api.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.10'
-  ghae: '>=3.10'
diff --git a/data/features/pat-v2.yml b/data/features/pat-v2.yml
index 123608badb..9cdd5f6d19 100644
--- a/data/features/pat-v2.yml
+++ b/data/features/pat-v2.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.10'
-  ghae: '>=3.10'
diff --git a/data/features/placeholder.yml b/data/features/placeholder.yml
index 17ea1d6574..b00dd0d29f 100644
--- a/data/features/placeholder.yml
+++ b/data/features/placeholder.yml
@@ -2,4 +2,3 @@
 versions:
   ghes: '>3.0'
   ghec: '*'
-  ghae: '*'
diff --git a/data/features/pr-tree-view.yml b/data/features/pr-tree-view.yml
index 46d7f368c7..3fe48f5144 100644
--- a/data/features/pr-tree-view.yml
+++ b/data/features/pr-tree-view.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/prevent-org-admin-add-outside-collaborator.yml b/data/features/prevent-org-admin-add-outside-collaborator.yml
index 69d5ccc481..6f04314a50 100644
--- a/data/features/prevent-org-admin-add-outside-collaborator.yml
+++ b/data/features/prevent-org-admin-add-outside-collaborator.yml
@@ -1,4 +1,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/previous-release-tag.yml b/data/features/previous-release-tag.yml
index 5da1093072..9a60f5a14d 100644
--- a/data/features/previous-release-tag.yml
+++ b/data/features/previous-release-tag.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/private-actions.yml b/data/features/private-actions.yml
index efcdf7398b..886af11aee 100644
--- a/data/features/private-actions.yml
+++ b/data/features/private-actions.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/data/features/profile-name-enterprise-setting.yml b/data/features/profile-name-enterprise-setting.yml
index c2bcd46198..fd6c1531e5 100644
--- a/data/features/profile-name-enterprise-setting.yml
+++ b/data/features/profile-name-enterprise-setting.yml
@@ -1,4 +1,3 @@
 # Reference: Issue #6996 ability to show users' first/last name instead of username in issue/PR comment titles for public and internal repos
 versions:
   ghes: '>=3.6'
-  ghae: '>=3.6'
diff --git a/data/features/profile-time-zone.yml b/data/features/profile-time-zone.yml
index 069f139458..e57535a55a 100644
--- a/data/features/profile-time-zone.yml
+++ b/data/features/profile-time-zone.yml
@@ -2,4 +2,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>3.7'
-  ghae: '>3.7'
diff --git a/data/features/projects-in-issue-forms.yml b/data/features/projects-in-issue-forms.yml
index 27bac8a180..e37d245bf8 100644
--- a/data/features/projects-in-issue-forms.yml
+++ b/data/features/projects-in-issue-forms.yml
@@ -3,4 +3,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.11'
-  ghae: '>=3.11'
diff --git a/data/features/projects-v1-create-repo-project.yml b/data/features/projects-v1-create-repo-project.yml
index 272cbe1da0..d095bd44f4 100644
--- a/data/features/projects-v1-create-repo-project.yml
+++ b/data/features/projects-v1-create-repo-project.yml
@@ -1,4 +1,3 @@
 # Ability to create new repository level classic projects
 versions:
   ghes: '*'
-  ghae: '*'
diff --git a/data/features/projects-v1.yml b/data/features/projects-v1.yml
index c217fc003d..b39cb4732c 100644
--- a/data/features/projects-v1.yml
+++ b/data/features/projects-v1.yml
@@ -5,4 +5,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '*'
-  ghae: '*'
diff --git a/data/features/projects-v2-column-limits.yml b/data/features/projects-v2-column-limits.yml
index e9f4269638..0c6c4db47e 100644
--- a/data/features/projects-v2-column-limits.yml
+++ b/data/features/projects-v2-column-limits.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.10'
-  ghae: '>=3.10'
diff --git a/data/features/projects-v2-org-templates-improvements.yml b/data/features/projects-v2-org-templates-improvements.yml
index 958fc4960c..3f12f4706f 100644
--- a/data/features/projects-v2-org-templates-improvements.yml
+++ b/data/features/projects-v2-org-templates-improvements.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.11'
-  ghae: '>=3.11'
diff --git a/data/features/projects-v2-org-templates.yml b/data/features/projects-v2-org-templates.yml
index 991763ff55..73b43c3dc9 100644
--- a/data/features/projects-v2-org-templates.yml
+++ b/data/features/projects-v2-org-templates.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.10'
-  ghae: '>=3.10'
diff --git a/data/features/pull-request-comment-on-file.yml b/data/features/pull-request-comment-on-file.yml
index 918a24f610..7a401346df 100644
--- a/data/features/pull-request-comment-on-file.yml
+++ b/data/features/pull-request-comment-on-file.yml
@@ -3,4 +3,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.9'
-  ghae: '>= 3.9'
diff --git a/data/features/push-protection-custom-link-orgs-beta.yml b/data/features/push-protection-custom-link-orgs-beta.yml
index 6e7e793c90..5f8dc4ec17 100644
--- a/data/features/push-protection-custom-link-orgs-beta.yml
+++ b/data/features/push-protection-custom-link-orgs-beta.yml
@@ -5,4 +5,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/push-protection-custom-link-orgs.yml b/data/features/push-protection-custom-link-orgs.yml
index 79fffc5cff..82b9ce2f42 100644
--- a/data/features/push-protection-custom-link-orgs.yml
+++ b/data/features/push-protection-custom-link-orgs.yml
@@ -5,4 +5,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/query-pack-compatibility.yml b/data/features/query-pack-compatibility.yml
index 776f7ddb22..14213cf01b 100644
--- a/data/features/query-pack-compatibility.yml
+++ b/data/features/query-pack-compatibility.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.9'
-  ghae: '>=3.9'
diff --git a/data/features/re-run-jobs.yml b/data/features/re-run-jobs.yml
index 99072497b5..30aa1ffcf6 100644
--- a/data/features/re-run-jobs.yml
+++ b/data/features/re-run-jobs.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.5'
-  ghae: '>= 3.5'
diff --git a/data/features/read-audit-scope.yml b/data/features/read-audit-scope.yml
index fc50915e91..b9716e6692 100644
--- a/data/features/read-audit-scope.yml
+++ b/data/features/read-audit-scope.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/releases-set-latest-release.yml b/data/features/releases-set-latest-release.yml
index 352447f4f5..7a2741afae 100644
--- a/data/features/releases-set-latest-release.yml
+++ b/data/features/releases-set-latest-release.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/remove-code-scanning-configurations.yml b/data/features/remove-code-scanning-configurations.yml
index 6e07097998..e15a509550 100644
--- a/data/features/remove-code-scanning-configurations.yml
+++ b/data/features/remove-code-scanning-configurations.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>3.8'
-  ghae: '>3.8'
diff --git a/data/features/rename-and-transfer-repository.yml b/data/features/rename-and-transfer-repository.yml
index 9a84d971c0..f8f97160d5 100644
--- a/data/features/rename-and-transfer-repository.yml
+++ b/data/features/rename-and-transfer-repository.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.9'
-  ghae: '>=3.9'
diff --git a/data/features/reopen-dependabot-alerts.yml b/data/features/reopen-dependabot-alerts.yml
index 39093360fb..65b41ef097 100644
--- a/data/features/reopen-dependabot-alerts.yml
+++ b/data/features/reopen-dependabot-alerts.yml
@@ -3,4 +3,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>3.4'
-  ghae: '>= 3.5'
diff --git a/data/features/repositories-forks-page-improvement.yml b/data/features/repositories-forks-page-improvement.yml
index 4db1e199fc..a4d740d5c6 100644
--- a/data/features/repositories-forks-page-improvement.yml
+++ b/data/features/repositories-forks-page-improvement.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>= 3.9'
-  ghae: '>= 3.9'
diff --git a/data/features/repository-activity-view.yml b/data/features/repository-activity-view.yml
index 38dd0a9cdc..90a936416f 100644
--- a/data/features/repository-activity-view.yml
+++ b/data/features/repository-activity-view.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>= 3.11'
-  ghae: '> 3.9'
diff --git a/data/features/required-deployments.yml b/data/features/required-deployments.yml
index f6cbe5be0c..358dca6ccd 100644
--- a/data/features/required-deployments.yml
+++ b/data/features/required-deployments.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.5'
-  ghae: '>= 3.6'
diff --git a/data/features/rest-permissions-header.yml b/data/features/rest-permissions-header.yml
index fadf54092e..f175c008da 100644
--- a/data/features/rest-permissions-header.yml
+++ b/data/features/rest-permissions-header.yml
@@ -3,4 +3,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.11'
-  ghae: '>=3.11'
diff --git a/data/features/restrict-groups-to-workflows.yml b/data/features/restrict-groups-to-workflows.yml
index e2a626caf8..fb6251221d 100644
--- a/data/features/restrict-groups-to-workflows.yml
+++ b/data/features/restrict-groups-to-workflows.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.5'
-  ghae: '>= 3.5'
diff --git a/data/features/restrict-pushes-create-branch.yml b/data/features/restrict-pushes-create-branch.yml
index ee53e39023..bfdc7e9cfb 100644
--- a/data/features/restrict-pushes-create-branch.yml
+++ b/data/features/restrict-pushes-create-branch.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>=3.7'
diff --git a/data/features/secret-scanning-alert-audit-log.yml b/data/features/secret-scanning-alert-audit-log.yml
index 8d08d08af1..207f3bab91 100644
--- a/data/features/secret-scanning-alert-audit-log.yml
+++ b/data/features/secret-scanning-alert-audit-log.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/secret-scanning-audit-log-custom-patterns.yml b/data/features/secret-scanning-audit-log-custom-patterns.yml
index d370262d19..03cbe54335 100644
--- a/data/features/secret-scanning-audit-log-custom-patterns.yml
+++ b/data/features/secret-scanning-audit-log-custom-patterns.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.5'
-  ghae: '>= 3.5'
diff --git a/data/features/secret-scanning-backfill-email.yml b/data/features/secret-scanning-backfill-email.yml
index b81090cb70..d4d1ba216e 100644
--- a/data/features/secret-scanning-backfill-email.yml
+++ b/data/features/secret-scanning-backfill-email.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.10'
-  ghae: '>=3.10'
diff --git a/data/features/secret-scanning-backfills.yml b/data/features/secret-scanning-backfills.yml
index f48e487c8e..899222fcef 100644
--- a/data/features/secret-scanning-backfills.yml
+++ b/data/features/secret-scanning-backfills.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/secret-scanning-custom-enterprise-35.yml b/data/features/secret-scanning-custom-enterprise-35.yml
deleted file mode 100644
index 401673791c..0000000000
--- a/data/features/secret-scanning-custom-enterprise-35.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Issues: changes to custom patterns for secret scanning
-#   #6367: updates for the "organization level dry runs (Public Beta)"
-#   #5499: updates for the "repository level dry runs (Public Beta)"
-versions:
-  ghes: '>3.4 <3.7'
-  ghae: '>= 3.5'
diff --git a/data/features/secret-scanning-custom-enterprise-36.yml b/data/features/secret-scanning-custom-enterprise-36.yml
deleted file mode 100644
index aac8ede192..0000000000
--- a/data/features/secret-scanning-custom-enterprise-36.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Issues: changes to custom patterns for secret scanning
-#    #6904: updates for "enterprise account level dry runs (Public Beta)"
-#    #7297: updates for dry runs on editing patterns (Public Beta)
-versions:
-  ghes: '>3.5 <3.7'
-  ghae: '>= 3.6'
diff --git a/data/features/secret-scanning-custom-link-on-block.yml b/data/features/secret-scanning-custom-link-on-block.yml
index b72b50676f..7f0a595d72 100644
--- a/data/features/secret-scanning-custom-link-on-block.yml
+++ b/data/features/secret-scanning-custom-link-on-block.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/data/features/secret-scanning-custom-pattern-push-protection-audit.yml b/data/features/secret-scanning-custom-pattern-push-protection-audit.yml
index c32a9314d7..7aac4cc463 100644
--- a/data/features/secret-scanning-custom-pattern-push-protection-audit.yml
+++ b/data/features/secret-scanning-custom-pattern-push-protection-audit.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '> 3.8'
-  ghae: '> 3.8'
diff --git a/data/features/secret-scanning-dismissal-comment.yml b/data/features/secret-scanning-dismissal-comment.yml
index d19884102a..8dce53006c 100644
--- a/data/features/secret-scanning-dismissal-comment.yml
+++ b/data/features/secret-scanning-dismissal-comment.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/data/features/secret-scanning-enterprise-level-api.yml b/data/features/secret-scanning-enterprise-level-api.yml
index 1b32a42a10..6bb159d563 100644
--- a/data/features/secret-scanning-enterprise-level-api.yml
+++ b/data/features/secret-scanning-enterprise-level-api.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/data/features/secret-scanning-enterprise-level.yml b/data/features/secret-scanning-enterprise-level.yml
index e95d04f55c..d5ed296913 100644
--- a/data/features/secret-scanning-enterprise-level.yml
+++ b/data/features/secret-scanning-enterprise-level.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>=3.7'
diff --git a/data/features/secret-scanning-notification-settings.yml b/data/features/secret-scanning-notification-settings.yml
index 3ee3af06b7..67f94852e4 100644
--- a/data/features/secret-scanning-notification-settings.yml
+++ b/data/features/secret-scanning-notification-settings.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>= 3.9'
-  ghae: '>= 3.9'
diff --git a/data/features/secret-scanning-partner-documentation-link-UI.yml b/data/features/secret-scanning-partner-documentation-link-UI.yml
index 938bab399b..4cc5866bb2 100644
--- a/data/features/secret-scanning-partner-documentation-link-UI.yml
+++ b/data/features/secret-scanning-partner-documentation-link-UI.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>= 3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/secret-scanning-push-protection-bypasses.yml b/data/features/secret-scanning-push-protection-bypasses.yml
index 9330b1da78..983e37865c 100644
--- a/data/features/secret-scanning-push-protection-bypasses.yml
+++ b/data/features/secret-scanning-push-protection-bypasses.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/secret-scanning-push-protection-custom-patterns.yml b/data/features/secret-scanning-push-protection-custom-patterns.yml
index 04fbcf5673..c195ce0102 100644
--- a/data/features/secret-scanning-push-protection-custom-patterns.yml
+++ b/data/features/secret-scanning-push-protection-custom-patterns.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.9'
-  ghae: '>=3.9'
diff --git a/data/features/secret-scanning-push-protection-email.yml b/data/features/secret-scanning-push-protection-email.yml
index d97fb0fd88..0642bccdfa 100644
--- a/data/features/secret-scanning-push-protection-email.yml
+++ b/data/features/secret-scanning-push-protection-email.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/secret-scanning-push-protection-web-ui.yml b/data/features/secret-scanning-push-protection-web-ui.yml
index ebc3a7305a..e3f96a9aa4 100644
--- a/data/features/secret-scanning-push-protection-web-ui.yml
+++ b/data/features/secret-scanning-push-protection-web-ui.yml
@@ -3,5 +3,4 @@
 versions:
   fpt: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
   ghec: '*'
diff --git a/data/features/secret-scanning-push-protection.yml b/data/features/secret-scanning-push-protection.yml
index 2c2a94845e..64104cda05 100644
--- a/data/features/secret-scanning-push-protection.yml
+++ b/data/features/secret-scanning-push-protection.yml
@@ -3,5 +3,4 @@
 versions:
   fpt: '*'
   ghes: '>=3.5'
-  ghae: '>= 3.5'
   ghec: '*'
diff --git a/data/features/secret-scanning-validity-check.yml b/data/features/secret-scanning-validity-check.yml
index 521a507c74..b4352e2840 100644
--- a/data/features/secret-scanning-validity-check.yml
+++ b/data/features/secret-scanning-validity-check.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.9'
-  ghae: '>=3.9'
diff --git a/data/features/security-advisories-ghes-ghae.yml b/data/features/security-advisories-ghes-ghae.yml
index 00e84b7e74..5e11cfbcd4 100644
--- a/data/features/security-advisories-ghes-ghae.yml
+++ b/data/features/security-advisories-ghes-ghae.yml
@@ -1,4 +1,3 @@
 # Reference: Issue #6982 Community Contributions to Security Advisories - Enterprise 3.6
 versions:
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/security-advisories-reason-for-change.yml b/data/features/security-advisories-reason-for-change.yml
index b5a28f9147..af1bb4d8d3 100644
--- a/data/features/security-advisories-reason-for-change.yml
+++ b/data/features/security-advisories-reason-for-change.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/security-feature-enablement-policies-dependabot.yml b/data/features/security-feature-enablement-policies-dependabot.yml
index 7b22f65167..8695549ceb 100644
--- a/data/features/security-feature-enablement-policies-dependabot.yml
+++ b/data/features/security-feature-enablement-policies-dependabot.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.9'
-  ghae: '>=3.9'
diff --git a/data/features/security-feature-enablement-policies.yml b/data/features/security-feature-enablement-policies.yml
index 665a1585c4..3cb9e54585 100644
--- a/data/features/security-feature-enablement-policies.yml
+++ b/data/features/security-feature-enablement-policies.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/data/features/security-managers.yml b/data/features/security-managers.yml
index 689f14c090..75d194541d 100644
--- a/data/features/security-managers.yml
+++ b/data/features/security-managers.yml
@@ -3,5 +3,4 @@
 versions:
   fpt: '*'
   ghes: '>=3.3'
-  ghae: '*'
   ghec: '*'
diff --git a/data/features/security-overview-acv-filters.yml b/data/features/security-overview-acv-filters.yml
index f0bdd7eaeb..a6eaadf774 100644
--- a/data/features/security-overview-acv-filters.yml
+++ b/data/features/security-overview-acv-filters.yml
@@ -2,5 +2,4 @@
 # Documentation for the addition of repo topic and team filters to the alert-centric views (Dependabot, code scanning, and secret scanning) of the security overview
 versions:
   ghes: '>3.8'
-  ghae: '>3.8'
   ghec: '*'
diff --git a/data/features/security-overview-alert-views.yml b/data/features/security-overview-alert-views.yml
index 0152f69fb2..c4033bc808 100644
--- a/data/features/security-overview-alert-views.yml
+++ b/data/features/security-overview-alert-views.yml
@@ -2,5 +2,4 @@
 # Documentation for security overview individual views for each type of security alert
 versions:
   ghes: '> 3.4'
-  ghae: '>= 3.5'
   ghec: '*'
diff --git a/data/features/security-overview-dependabot-acv.yml b/data/features/security-overview-dependabot-acv.yml
index e0ad3c14cd..dd8d9798a2 100644
--- a/data/features/security-overview-dependabot-acv.yml
+++ b/data/features/security-overview-dependabot-acv.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '> 3.3'
-  ghae: '> 3.3'
diff --git a/data/features/security-overview-displayed-alerts.yml b/data/features/security-overview-displayed-alerts.yml
index 9e11931fff..4d5f791fff 100644
--- a/data/features/security-overview-displayed-alerts.yml
+++ b/data/features/security-overview-displayed-alerts.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/security-overview-feature-specific-alert-page.yml b/data/features/security-overview-feature-specific-alert-page.yml
index 5e57e7ec5a..68f589e9ef 100644
--- a/data/features/security-overview-feature-specific-alert-page.yml
+++ b/data/features/security-overview-feature-specific-alert-page.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>= 3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/security-overview-org-risk-coverage.yml b/data/features/security-overview-org-risk-coverage.yml
index 544b685f11..9d2bd936cf 100644
--- a/data/features/security-overview-org-risk-coverage.yml
+++ b/data/features/security-overview-org-risk-coverage.yml
@@ -3,5 +3,4 @@
 # and the initial single-repo enablement panel for security overview coverage view.
 versions:
   ghes: '> 3.7'
-  ghae: '> 3.7'
   ghec: '*'
diff --git a/data/features/security-overview-team-write-access.yml b/data/features/security-overview-team-write-access.yml
index 6563e7012a..01b8299bcc 100644
--- a/data/features/security-overview-team-write-access.yml
+++ b/data/features/security-overview-team-write-access.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '> 3.8'
-  ghae: '> 3.8'
diff --git a/data/features/ssh-cert-policy-allow-u2s-tokens.yml b/data/features/ssh-cert-policy-allow-u2s-tokens.yml
index f4561078b0..351970633f 100644
--- a/data/features/ssh-cert-policy-allow-u2s-tokens.yml
+++ b/data/features/ssh-cert-policy-allow-u2s-tokens.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>= 3.9'
-  ghae: '>= 3.9'
diff --git a/data/features/ssh-commit-verification.yml b/data/features/ssh-commit-verification.yml
index 8f6b3ca724..904828c815 100644
--- a/data/features/ssh-commit-verification.yml
+++ b/data/features/ssh-commit-verification.yml
@@ -5,4 +5,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>= 3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/streaming-datadog.yml b/data/features/streaming-datadog.yml
index f977faf40e..b984956e6f 100644
--- a/data/features/streaming-datadog.yml
+++ b/data/features/streaming-datadog.yml
@@ -3,4 +3,3 @@
 versions:
   ghec: '*'
   ghes: '>= 3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/syncing-fork-web-ui.yml b/data/features/syncing-fork-web-ui.yml
index 56f8f303fd..f28f9c284d 100644
--- a/data/features/syncing-fork-web-ui.yml
+++ b/data/features/syncing-fork-web-ui.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>= 3.7'
diff --git a/data/features/target-runner-groups.yml b/data/features/target-runner-groups.yml
index 1605cf958b..3b9eaeeb7d 100644
--- a/data/features/target-runner-groups.yml
+++ b/data/features/target-runner-groups.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>= 3.8'
-  ghae: '>= 3.8'
diff --git a/data/features/task-lists-v1.yml b/data/features/task-lists-v1.yml
index bf5b2fc85b..b3a5c2584e 100644
--- a/data/features/task-lists-v1.yml
+++ b/data/features/task-lists-v1.yml
@@ -3,4 +3,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.9'
-  ghae: '>=3.9'
diff --git a/data/features/team-discussions.yml b/data/features/team-discussions.yml
index de8350064b..e806eec456 100644
--- a/data/features/team-discussions.yml
+++ b/data/features/team-discussions.yml
@@ -2,4 +2,3 @@
 # Versions for which team discussions is still supported (deprecated for all other versions)
 versions:
   ghes: '<3.12'
-  ghae: '*'
diff --git a/data/features/token-audit-log.yml b/data/features/token-audit-log.yml
index 70c216ad00..55c463eb17 100644
--- a/data/features/token-audit-log.yml
+++ b/data/features/token-audit-log.yml
@@ -1,4 +1,3 @@
 versions:
   ghec: '*'
   ghes: '>3.7'
-  ghae: '>3.7'
diff --git a/data/features/upload-expired-or-revoked-gpg-key.yml b/data/features/upload-expired-or-revoked-gpg-key.yml
index 018b9b22fe..7cb1dedfc8 100644
--- a/data/features/upload-expired-or-revoked-gpg-key.yml
+++ b/data/features/upload-expired-or-revoked-gpg-key.yml
@@ -5,4 +5,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.6'
-  ghae: '>= 3.6'
diff --git a/data/features/viewscreen-and-notebooks.yml b/data/features/viewscreen-and-notebooks.yml
index 40a4b5adc3..4fe043a447 100644
--- a/data/features/viewscreen-and-notebooks.yml
+++ b/data/features/viewscreen-and-notebooks.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.7'
-  ghae: '>=3.7'
diff --git a/data/features/workflow-nav-2022.yml b/data/features/workflow-nav-2022.yml
index 820fc58ea5..ac8284efca 100644
--- a/data/features/workflow-nav-2022.yml
+++ b/data/features/workflow-nav-2022.yml
@@ -4,4 +4,3 @@ versions:
   fpt: '*'
   ghec: '*'
   ghes: '>=3.8'
-  ghae: '>=3.8'
diff --git a/src/content-render/tests/liquid.js b/src/content-render/tests/liquid.js
index e1a7e964b3..a25383ecc5 100644
--- a/src/content-render/tests/liquid.js
+++ b/src/content-render/tests/liquid.js
@@ -198,17 +198,5 @@ describe('liquid template parser', () => {
       const outputFpt = await liquid.parseAndRender(featureVersionsTemplate, req.context)
       expect(outputFpt.includes('placeholder content')).toBe(true)
     })
-
-    test('renders in GHAE because feature is available in GHAE', async () => {
-      req.context = {
-        currentVersion: 'github-ae@latest',
-        page: {},
-        allVersions,
-        enterpriseServerReleases,
-      }
-      await featureVersionsMiddleware(req, null, () => {})
-      const outputFpt = await liquid.parseAndRender(featureVersionsTemplate, req.context)
-      expect(outputFpt.includes('placeholder content')).toBe(true)
-    })
   })
 })
diff --git a/src/frame/tests/page.js b/src/frame/tests/page.js
index d0c49911c6..744adf7216 100644
--- a/src/frame/tests/page.js
+++ b/src/frame/tests/page.js
@@ -376,7 +376,6 @@ describe('Page class', () => {
       // the frontmatter GHES `*` is not being overwritten by the placeholder's GHES `<3.0`.
       expect(page.applicableVersions.includes('free-pro-team@latest')).toBe(true)
       expect(page.applicableVersions.includes(`enterprise-server@${latest}`)).toBe(true)
-      expect(page.applicableVersions.includes('github-ae@latest')).toBe(true)
       expect(page.applicableVersions.includes('feature')).toBe(false)
       expect(page.applicableVersions.includes('placeholder')).toBe(false)
     })