One product variable to rule them all (#19115)

Co-authored-by: jmarlena <>

content/actions/reference/workflow-syntax-for-github-actions.md

@@ -695,11 +695,11 @@ jobs:
 ```
 
 {% if currentVersion == "free-pro-team@latest" %}
-##### Example using the {% data variables.product.prodname_registry %} {% data variables.product.prodname_capitalized_container_registry %}
+##### Example using the {% data variables.product.prodname_registry %} {% data variables.product.prodname_container_registry %}
 
 `docker://{host}/{image}:{tag}`
 
-A Docker image in the {% data variables.product.prodname_registry %} {% data variables.product.prodname_capitalized_container_registry %}.
+A Docker image in the {% data variables.product.prodname_registry %} {% data variables.product.prodname_container_registry %}.
 
 ```yaml
 jobs:

content/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages.md

@@ -16,7 +16,7 @@ topics:
 
 {% note %}
 
-**Billing update for container image storage:** During the beta phase of the {% data variables.product.prodname_capitalized_container_registry %}, Docker image storage and bandwidth are free for both the previous `docker.pkg.github.com` and current `ghcr.io` hosting services. For more information, see "[Introduction to {% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages)."
+**Billing update for container image storage:** During the beta phase of the {% data variables.product.prodname_container_registry %}, Docker image storage and bandwidth are free for both the previous `docker.pkg.github.com` and current `ghcr.io` hosting services. For more information, see "[Introduction to {% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages)."
 
 {% endnote %}
 

content/packages/learn-github-packages/about-permissions-for-github-packages.md

@@ -29,7 +29,7 @@ The {% data variables.product.prodname_registry %} registries below use reposito
 
 Packages with granular permissions are scoped to a personal user or organization account. You can change the access control and visibility of the package separately from a repository that is connected (or linked) to a package.
 
-Currently, only the {% data variables.product.prodname_capitalized_container_registry %} offers granular permissions for your container image packages.
+Currently, only the {% data variables.product.prodname_container_registry %} offers granular permissions for your container image packages.
 
 ### Visibility and access permissions for container images
 

content/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility.md

@@ -13,7 +13,7 @@ versions:
 
 Packages with granular permissions are scoped to a personal user or organization account. You can change the access control and visibility of a package separately from the repository that it is connected (or linked) to.
 
-Currently, only the {% data variables.product.prodname_capitalized_container_registry %} offers granular permissions for your container image packages.
+Currently, only the {% data variables.product.prodname_container_registry %} offers granular permissions for your container image packages.
 
 For more information about permissions for repository-scoped packages, packages-related scopes for PATs, or managing permissions for your actions workflows, see "[About permissions for GitHub Packages](/packages/learn-github-packages/about-permissions-for-github-packages)."
 

content/packages/learn-github-packages/connecting-a-repository-to-a-package.md

@@ -59,14 +59,14 @@ By connecting a repository to a package, the package landing page will show info
   $ docker tag 38f737a91f39 ghcr.io/monalisa/hello_docker:latest
   ```
 
-5. If you haven't already, authenticate to the {% data variables.product.prodname_capitalized_container_registry %}. For more information, see "[Authenticating to the {% data variables.product.prodname_capitalized_container_registry %}](/packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images#authenticating-to-the-container-registry)."
+5. If you haven't already, authenticate to the {% data variables.product.prodname_container_registry %}. For more information, see "[Authenticating to the {% data variables.product.prodname_container_registry %}](/packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images#authenticating-to-the-container-registry)."
     {% raw %}
     ```shell
     $ echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin
     > Login Succeeded
     ```
     {% endraw %}
-6. Push your container image to the {% data variables.product.prodname_capitalized_container_registry %}.
+6. Push your container image to the {% data variables.product.prodname_container_registry %}.
   ```shell
   $ docker push ghcr.io/OWNER/IMAGE-NAME:TAG
   ```

content/packages/learn-github-packages/introduction-to-github-packages.md

@@ -25,7 +25,7 @@ versions:
 
 You can integrate {% data variables.product.prodname_registry %} with {% data variables.product.product_name %} APIs, {% data variables.product.prodname_actions %}, and webhooks to create an end-to-end DevOps workflow that includes your code, CI, and deployment solutions.
 
-{% data variables.product.prodname_registry %} offers different package registries for commonly used package managers, such as npm, RubyGems, Apache Maven, Gradle, Docker, and NuGet. {% if currentVersion == "free-pro-team@latest" %}The {% data variables.product.prodname_capitalized_container_registry %} is optimized for containers and supports Docker and OCI images.{% endif %} For more information on the different package registries that {% data variables.product.prodname_registry %} supports, see "[Working with a {% data variables.product.prodname_registry %} registry](/packages/working-with-a-github-packages-registry)."
+{% data variables.product.prodname_registry %} offers different package registries for commonly used package managers, such as npm, RubyGems, Apache Maven, Gradle, Docker, and NuGet. {% if currentVersion == "free-pro-team@latest" %}The {% data variables.product.prodname_container_registry %} is optimized for containers and supports Docker and OCI images.{% endif %} For more information on the different package registries that {% data variables.product.prodname_registry %} supports, see "[Working with a {% data variables.product.prodname_registry %} registry](/packages/working-with-a-github-packages-registry)."
 
 {% if currentVersion == "free-pro-team@latest" %}
 
@@ -43,7 +43,7 @@ You can view a package's README, as well as metadata such as licensing, download
 
 |                    |        |
 |--------------------|--------------------|
-| Permissions        | {% if currentVersion == "free-pro-team@latest" %}The permissions for a package are either inherited from the repository where the package is hosted or, for packages in the {% data variables.product.prodname_capitalized_container_registry %}, they can be defined for specific user or organization accounts. For more information, see "[Configuring a package’s access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility)." {% else %}Each package inherits the permissions of the repository where the package is hosted. <br> <br> For example, anyone with read permissions for a repository can install a package as a dependency in a project, and anyone with write permissions can publish a new package version.{% endif %} |
+| Permissions        | {% if currentVersion == "free-pro-team@latest" %}The permissions for a package are either inherited from the repository where the package is hosted or, for packages in the {% data variables.product.prodname_container_registry %}, they can be defined for specific user or organization accounts. For more information, see "[Configuring a package’s access control and visibility](/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility)." {% else %}Each package inherits the permissions of the repository where the package is hosted. <br> <br> For example, anyone with read permissions for a repository can install a package as a dependency in a project, and anyone with write permissions can publish a new package version.{% endif %} |
 | Visibility         | {% data reusables.package_registry.public-or-private-packages %} |
 
 For more information, see "[About permissions for {% data variables.product.prodname_registry %}](/packages/learn-github-packages/about-permissions-for-github-packages)."
@@ -83,7 +83,7 @@ For more information about subdomain isolation, see "[Enabling subdomain isolati
 For more information about configuring your package client for use with {% data variables.product.prodname_registry %}, see "[Working with a {% data variables.product.prodname_registry %} registry](/packages/working-with-a-github-packages-registry)."
 
 {% if currentVersion == "free-pro-team@latest" %}
-For more information about Docker and the {% data variables.product.prodname_capitalized_container_registry %}, see "[Working with the Container registry](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)" and "[Working with the Docker registry](/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)."
+For more information about Docker and the {% data variables.product.prodname_container_registry %}, see "[Working with the Container registry](/packages/working-with-a-github-packages-registry/working-with-the-container-registry)" and "[Working with the Docker registry](/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)."
 {% endif %}
 ### Authenticating to {% data variables.product.prodname_registry %}
 

content/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions.md

@@ -24,7 +24,7 @@ versions:
 You can extend the CI and CD capabilities of your repository by publishing or installing packages as part of your workflow.
 
 {% if currentVersion == "free-pro-team@latest" %}
-#### Authenticating to the {% data variables.product.prodname_capitalized_container_registry %}
+#### Authenticating to the {% data variables.product.prodname_container_registry %}
 
 {% data reusables.package_registry.container-registry-beta %}
 

content/packages/working-with-a-github-packages-registry/enabling-improved-container-support-with-the-container-registry.md

@@ -1,6 +1,6 @@
 ---
 title: Enabling improved container support with the Container registry
-intro: 'To use the {% data variables.product.prodname_capitalized_container_registry %}, you must enable it for your user or organization account.'
+intro: 'To use the {% data variables.product.prodname_container_registry %}, you must enable it for your user or organization account.'
 product: '{% data reusables.gated-features.packages %}'
 redirect_from:
   - /packages/getting-started-with-github-container-registry/enabling-improved-container-support
@@ -12,25 +12,25 @@ versions:
 
 {% note %}
 
-**Note:** The {% data variables.product.prodname_capitalized_container_registry %} is currently in public beta and subject to change. During the beta, storage and bandwidth are free. For more information, see "[Introduction to {% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages)."
+**Note:** The {% data variables.product.prodname_container_registry %} is currently in public beta and subject to change. During the beta, storage and bandwidth are free. For more information, see "[Introduction to {% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages)."
 
 {% endnote %}
 
 {% data reusables.package_registry.docker-vs-container-registry %}
 
-### Enabling the {% data variables.product.prodname_capitalized_container_registry %} for your personal account
+### Enabling the {% data variables.product.prodname_container_registry %} for your personal account
 
 Once the {% data variables.product.prodname_container_registry %} is enabled for your personal user account, you can publish containers to the {% data variables.product.prodname_container_registry %} owned by your user account.
 
-To use the {% data variables.product.prodname_capitalized_container_registry %} within an organization, the organization owner must enable the feature for organization members.
+To use the {% data variables.product.prodname_container_registry %} within an organization, the organization owner must enable the feature for organization members.
 
 {% data reusables.feature-preview.feature-preview-setting  %}
 2. On the left, select "Improved container support", then click **Enable**.
     ![Improved container support](/assets/images/help/settings/improved-container-support.png)
 
-### Enabling the {% data variables.product.prodname_capitalized_container_registry %} for your organization account
+### Enabling the {% data variables.product.prodname_container_registry %} for your organization account
 
-Before organization owners or members can publish container images to the {% data variables.product.prodname_capitalized_container_registry %}, an organization owner must enable the feature preview for the organization.
+Before organization owners or members can publish container images to the {% data variables.product.prodname_container_registry %}, an organization owner must enable the feature preview for the organization.
 
 {% data reusables.profile.access_org %}
 {% data reusables.profile.org_settings %}

content/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry.md

@@ -10,18 +10,18 @@ versions:
   free-pro-team: '*'
 ---
 
-### Key differences between the {% data variables.product.prodname_capitalized_container_registry %} and the Docker registry
+### Key differences between the {% data variables.product.prodname_container_registry %} and the Docker registry
 
 {% data reusables.package_registry.container-registry-beta %}
 
-The {% data variables.product.prodname_capitalized_container_registry %} supersedes the existing {% data variables.product.prodname_registry %} Docker registry and is optimized to support some of the unique needs of containers.
+The {% data variables.product.prodname_container_registry %} supersedes the existing {% data variables.product.prodname_registry %} Docker registry and is optimized to support some of the unique needs of containers.
 
-With the {% data variables.product.prodname_capitalized_container_registry %} you can:
+With the {% data variables.product.prodname_container_registry %} you can:
 - Store container images within your organization and user account, rather than a repository.
 - Set granular permissions and visibility independently of repository permissions and visibility.
 - Access public container images anonymously.
 
-|                   | Docker registry| {% data variables.product.prodname_capitalized_container_registry %} |
+|                   | Docker registry| {% data variables.product.prodname_container_registry %} |
 |-------------------|--------------------|----|
 | Hosting locations | You can host multiple Docker images in one repository. | You can host multiple container images in one organization or user account. |
 | Permissions       | Each image inherits the permissions of the repository where the image is hosted. <br> <br> For example, anyone with read permissions for a repository can install a package as a dependency in a project, and anyone with write permissions can publish a new package version. | For each container image, you can choose the access level that others have. The permissions for container image access are separate from your organization and repository permissions.
@@ -31,9 +31,9 @@ Foreign layer support | Doesn't support foreign layers, such as Windows images.
 
 ### Billing changes
 
-During the {% data variables.product.prodname_capitalized_container_registry %} beta, both the new {% data variables.product.prodname_container_registry %} and the existing {% data variables.product.prodname_registry %} Docker registry are free of charge. For more information about the {% data variables.product.prodname_registry %} Docker registry, see "[Working with the Docker registry](/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)."
+During the {% data variables.product.prodname_container_registry %} beta, both the new {% data variables.product.prodname_container_registry %} and the existing {% data variables.product.prodname_registry %} Docker registry are free of charge. For more information about the {% data variables.product.prodname_registry %} Docker registry, see "[Working with the Docker registry](/packages/working-with-a-github-packages-registry/working-with-the-docker-registry)."
 
-After the beta, the same billing and storage rates that other {% data variables.product.prodname_registry %} registries use will apply to the {% data variables.product.prodname_capitalized_container_registry %}. For more information, see "[About  billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)."
+After the beta, the same billing and storage rates that other {% data variables.product.prodname_registry %} registries use will apply to the {% data variables.product.prodname_container_registry %}. For more information, see "[About  billing for {% data variables.product.prodname_registry %}](/github/setting-up-and-managing-billing-and-payments-on-github/about-billing-for-github-packages)."
 
 ### Domain changes
 
@@ -42,9 +42,9 @@ The domain for the {% data variables.product.prodname_container_registry %} is `
 | Registry  | Example URL |
 |-----------------|-------------|
 | {% data variables.product.prodname_registry %} Docker registry |  `docker.pkg.github.com/OWNER/REPOSITORY/IMAGE_NAME`
-| {% data variables.product.prodname_capitalized_container_registry %} | `ghcr.io/OWNER/IMAGE_NAME`
+| {% data variables.product.prodname_container_registry %} | `ghcr.io/OWNER/IMAGE_NAME`
 
-### Authenticating to the {% data variables.product.prodname_capitalized_container_registry %}
+### Authenticating to the {% data variables.product.prodname_container_registry %}
 
 {% data reusables.package_registry.feature-preview-for-container-registry %}
 
@@ -95,7 +95,7 @@ If you have a {% data variables.product.prodname_actions %} workflow that uses a
 
 2. In your {% data variables.product.prodname_actions %} workflow file, update the package url from `https://docker.pkg.github.com` to `ghcr.io`.
 
-3. Add your new {% data variables.product.prodname_container_registry %} authentication personal access token (PAT) as a GitHub Actions secret. The {% data variables.product.prodname_capitalized_container_registry %} does not support using `GITHUB_TOKEN` for your PAT so you must use a different custom variable, such as `CR_PAT`. For more information, see "[Creating and storing encrypted secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)."
+3. Add your new {% data variables.product.prodname_container_registry %} authentication personal access token (PAT) as a GitHub Actions secret. The {% data variables.product.prodname_container_registry %} does not support using `GITHUB_TOKEN` for your PAT so you must use a different custom variable, such as `CR_PAT`. For more information, see "[Creating and storing encrypted secrets](/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets)."
 
 4. In your {% data variables.product.prodname_actions %} workflow file, update the authentication PAT by replacing your Docker registry PAT ({% raw %}`${{ secrets.GITHUB_TOKEN }}`{% endraw %}) with a new variable for your {% data variables.product.prodname_container_registry %} PAT, such as {% raw %}`${{ secrets.CR_PAT }}`{% endraw %}.
 

content/packages/working-with-a-github-packages-registry/working-with-the-container-registry.md

@@ -1,6 +1,6 @@
 ---
 title: Working with the Container registry
-intro: 'You can store and manage Docker and OCI images in the {% data variables.product.prodname_capitalized_container_registry %}, which uses the package namespace `https://ghcr.io`.'
+intro: 'You can store and manage Docker and OCI images in the {% data variables.product.prodname_container_registry %}, which uses the package namespace `https://ghcr.io`.'
 product: '{% data reusables.gated-features.packages %}'
 redirect_from:
   - /packages/managing-container-images-with-github-container-registry/pushing-and-pulling-docker-images
@@ -18,16 +18,16 @@ versions:
 
 ### About {% data variables.product.prodname_container_registry %} support
 
-To push and pull container images, an organization admin or the owner of a personal account must enable the {% data variables.product.prodname_capitalized_container_registry %}. For more information, see "[Enabling improved container support with the {% data variables.product.prodname_capitalized_container_registry %}](/packages/working-with-a-github-packages-registry/enabling-improved-container-support-with-the-container-registry)."
+To push and pull container images, an organization admin or the owner of a personal account must enable the {% data variables.product.prodname_container_registry %}. For more information, see "[Enabling improved container support with the {% data variables.product.prodname_container_registry %}](/packages/working-with-a-github-packages-registry/enabling-improved-container-support-with-the-container-registry)."
 
 When installing or publishing a Docker image, the Container registry supports foreign layers, such as Windows images.
 
-The {% data variables.product.prodname_capitalized_container_registry %} currently supports the following container image formats:
+The {% data variables.product.prodname_container_registry %} currently supports the following container image formats:
 
 * [Docker Image Manifest V2, Schema 2](https://docs.docker.com/registry/spec/manifest-v2-2/)
 * [Open Container Initiative (OCI) Specifications](https://github.com/opencontainers/image-spec)
 
-### Authenticating to the {% data variables.product.prodname_capitalized_container_registry %}
+### Authenticating to the {% data variables.product.prodname_container_registry %}
 
 {% data reusables.package_registry.authenticate_with_pat_for_container_registry %}
 

data/reusables/gated-features/packages.md

@@ -1,4 +1,4 @@
 {% data variables.product.prodname_registry %} is available with {% data variables.product.prodname_free_user %}, {% data variables.product.prodname_pro %}, {% data variables.product.prodname_free_team %} for organizations, {% data variables.product.prodname_team %}, {% data variables.product.prodname_ghe_cloud %}, {% data variables.product.prodname_ghe_server %}, and {% data variables.product.prodname_ghe_managed %}.
 {% if currentVersion == "free-pro-team@latest" %} 
-<br>{% data variables.product.prodname_registry %} is not available for private repositories owned by accounts using legacy per-repository plans. Also, accounts using legacy per-repository plans cannot access the {% data variables.product.prodname_capitalized_container_registry %} since these accounts are billed by repository. {% data reusables.gated-features.more-info %}
+<br>{% data variables.product.prodname_registry %} is not available for private repositories owned by accounts using legacy per-repository plans. Also, accounts using legacy per-repository plans cannot access the {% data variables.product.prodname_container_registry %} since these accounts are billed by repository. {% data reusables.gated-features.more-info %}
 {% endif %}

data/reusables/package_registry/authenticate-to-container-registry-steps.md

@@ -15,7 +15,7 @@
   ```shell
   $ export CR_PAT=YOUR_TOKEN
   ```
-3. Using the CLI for your container type, sign in to the {% data variables.product.prodname_capitalized_container_registry %} service at `ghcr.io`.
+3. Using the CLI for your container type, sign in to the {% data variables.product.prodname_container_registry %} service at `ghcr.io`.
   {% raw %}
   ```shell
   $ echo $CR_PAT | docker login ghcr.io -u USERNAME --password-stdin

data/reusables/package_registry/authenticate_with_pat_for_container_registry.md

@@ -2,7 +2,7 @@
 
 PATs can grant broad access to your account. You should select only the necessary `read:packages`, `write:packages`, or `delete:packages` scope when creating a PAT to authenticate to the {% data variables.product.prodname_container_registry %}.
 
-To authenticate to the {% data variables.product.prodname_capitalized_container_registry %} within a {% data variables.product.prodname_actions %} workflow, use the `GITHUB_TOKEN` for the best security and experience.
+To authenticate to the {% data variables.product.prodname_container_registry %} within a {% data variables.product.prodname_actions %} workflow, use the `GITHUB_TOKEN` for the best security and experience.
 
 For guidance on updating your workflows that authenticate to `ghcr.io` with a personal access token, see "[Upgrading a workflow that accesses `ghcr.io`](/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio)."
 

data/reusables/package_registry/container-registry-beta.md

@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** The {% data variables.product.prodname_capitalized_container_registry %} is currently in public beta and subject to change. During the beta, storage and bandwidth are free. To use the {% data variables.product.prodname_capitalized_container_registry %}, you must enable the feature preview. For more information, see "[Introduction to {% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages)" and "[Enabling improved container support with the {% data variables.product.prodname_container_registry %}](/packages/working-with-a-github-packages-registry/enabling-improved-container-support-with-the-container-registry)."
+**Note:** The {% data variables.product.prodname_container_registry %} is currently in public beta and subject to change. During the beta, storage and bandwidth are free. To use the {% data variables.product.prodname_container_registry %}, you must enable the feature preview. For more information, see "[Introduction to {% data variables.product.prodname_registry %}](/packages/learn-github-packages/introduction-to-github-packages)" and "[Enabling improved container support with the {% data variables.product.prodname_container_registry %}](/packages/working-with-a-github-packages-registry/enabling-improved-container-support-with-the-container-registry)."
 
 {% endnote %}

data/reusables/package_registry/docker-vs-container-registry.md

@@ -1,9 +1,9 @@
 {% if currentVersion == "free-pro-team@latest" %}
 {% note %}
 
-**Comparing the Docker registry and the {% data variables.product.prodname_capitalized_container_registry %}:**
+**Comparing the Docker registry and the {% data variables.product.prodname_container_registry %}:**
 - The {% data variables.product.prodname_container_registry %} (`https://ghcr.io`) offers improved performance for containers and will supercede the Docker registry in the future.
-- You can migrate your Docker images and workflows from the Docker registry  (`docker.pkg.github.com`)  to the {% data variables.product.prodname_capitalized_container_registry %} (`https://ghcr.io`) for granular permissions, container storage optimization, and more. For more information, see "[Migrating to the {% data variables.product.prodname_container_registry %} from the Docker registry](/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry)."
+- You can migrate your Docker images and workflows from the Docker registry  (`docker.pkg.github.com`)  to the {% data variables.product.prodname_container_registry %} (`https://ghcr.io`) for granular permissions, container storage optimization, and more. For more information, see "[Migrating to the {% data variables.product.prodname_container_registry %} from the Docker registry](/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry)."
 
 {% endnote %}
 {% endif %}

data/reusables/package_registry/docker_registry_deprecation_status.md

@@ -1,5 +1,5 @@
 {% warning %}
 
-**Note:** The {% data variables.product.prodname_registry %} Docker registry {% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %} will be superseded in a future {% data variables.product.product_name %} release with the {% data variables.product.prodname_capitalized_container_registry %}, which offers improved container support.{% elsif currentVersion == "free-pro-team@latest" %} is superseded by the {% data variables.product.prodname_capitalized_container_registry %}, which offers improved container support. {% endif %} {% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to the {% data variables.product.prodname_capitalized_container_registry %} from the Docker registry](/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry)." {% endif %}
+**Note:** The {% data variables.product.prodname_registry %} Docker registry {% if enterpriseServerVersions contains currentVersion or currentVersion == "github-ae@latest" %} will be superseded in a future {% data variables.product.product_name %} release with the {% data variables.product.prodname_container_registry %}, which offers improved container support.{% elsif currentVersion == "free-pro-team@latest" %} is superseded by the {% data variables.product.prodname_container_registry %}, which offers improved container support. {% endif %} {% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to the {% data variables.product.prodname_container_registry %} from the Docker registry](/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry)." {% endif %}
 
 {% endwarning %}

data/reusables/package_registry/feature-preview-for-container-registry.md

@@ -1,5 +1,5 @@
 {% note %}
 
-**Note:** Before you can use {% data variables.product.prodname_capitalized_container_registry %}, you must enable the feature for your account. For more information, see "[Enabling improved container support with the {% data variables.product.prodname_container_registry %}](/packages/working-with-a-github-packages-registry/enabling-improved-container-support-with-the-container-registry)."
+**Note:** Before you can use the {% data variables.product.prodname_container_registry %}, you must enable the feature for your account. For more information, see "[Enabling improved container support with the {% data variables.product.prodname_container_registry %}](/packages/working-with-a-github-packages-registry/enabling-improved-container-support-with-the-container-registry)."
 
 {% endnote %}

data/reusables/package_registry/github-token-security-over-pat.md

@@ -1,3 +1,3 @@
-{% data variables.product.prodname_capitalized_container_registry %} now supports `GITHUB_TOKEN` for easy and secure authentication in your workflows. If your workflow is using a personal access token (PAT) to authenticate to `ghcr.io`, then we highly recommend you update your workflow to use `GITHUB_TOKEN`.
+The {% data variables.product.prodname_container_registry %} now supports `GITHUB_TOKEN` for easy and secure authentication in your workflows. If your workflow is using a personal access token (PAT) to authenticate to `ghcr.io`, then we highly recommend you update your workflow to use `GITHUB_TOKEN`.
 
 For more information about `GITHUB_TOKEN`, see "[Authentication in a workflow](/actions/reference/authentication-in-a-workflow#using-the-github_token-in-a-workflow)."

data/variables/product.yml

@@ -100,8 +100,7 @@ prodname_discussions: 'GitHub Discussions'
 
 # GitHub Packages
 prodname_registry: 'GitHub Packages'
-prodname_capitalized_container_registry: 'Container registry'
+prodname_container_registry: 'Container registry'
-prodname_container_registry: 'container registry'
 
 # GitHub Insights
 prodname_insights: 'GitHub Insights'