diff --git a/admin/environment-management/cvms.md b/admin/environment-management/cvms.md
index d3e45289d..23f922cb8 100644
--- a/admin/environment-management/cvms.md
+++ b/admin/environment-management/cvms.md
@@ -22,6 +22,10 @@ such as Docker and systemd, in their environments.
 **Note:** Coder doesn't support legacy versions of cluster-wide proxy services
 such as Istio.
 
+> NVIDIA GPUs can be added to CVMs on bare metal clusters only. This feature is
+> not supported on Google Kubernetes Engine or other cloud providers at this
+> time.
+>
 > Support for NVIDIA [GPUs](gpu-acceleration.md) is in **beta**. We do not
 > support AMD GPUs at this time.
 
diff --git a/changelog/1.17.3.md b/changelog/1.17.3.md
index bbbaf33db..d958f7a9b 100644
--- a/changelog/1.17.3.md
+++ b/changelog/1.17.3.md
@@ -12,12 +12,15 @@ description: "Released on 04/09/21"
 - web: Added a toggle to enable/disable workspaces as code on the **Manage >
   Admin > Templates** page. Disabling workspaces as code has the following
   impact:
-  - New workspaces cannot be created from a template
+  - New workspaces cannot be created from a template.
   - Existing workspaces built from a template will continue to operate and may
     be rebuilt. These workspaces will still be notified of changes to remote
     templates.
 - infra: Added beta support for NVIDIA GPUs in environments created as
   container-based virtual machines (CVMs).
+  - NVIDIA GPUs can be added to container-based virtual machines (CVMs) on bare
+    metal clusters. GKE and other cloud providers are currently not supported
+    at this time.
 - web: Environments can now be created with multiple GPUs (maximum number of
   GPUs: 20).