diff --git a/docs/devcontainers/attach-container.md b/docs/devcontainers/attach-container.md
index c23ac631ef..bc0c0c76d0 100644
--- a/docs/devcontainers/attach-container.md
+++ b/docs/devcontainers/attach-container.md
@@ -90,7 +90,7 @@ Variables can be referenced in certain string values in attached configuration f
 
 ## Attach to a container in a Kubernetes cluster
 
-To attach to a container in a Kubernetes cluster, first install the [Kubernetes extension](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools) and `kubectl` along with the Dev Containers extension. Then select the Kubernetes explorer from the Activity bar and expand the cluster and Pod where the container you want to attach to resides. Finally, right-click on the container and select **Attach Visual Studio Code** from context menu.
+To attach to a container in a Kubernetes cluster, either select **Dev Containers: Attach to Running Kubernetes Container...** from the Command Palette (`kbstyle(F1)`) or first install the [Kubernetes extension](https://marketplace.visualstudio.com/items?itemName=ms-kubernetes-tools.vscode-kubernetes-tools) and `kubectl` along with the Dev Containers extension. Then select the Kubernetes explorer from the Activity bar and expand the cluster and Pod where the container you want to attach to resides. Finally, right-click on the container and select **Attach Visual Studio Code** from context menu.
 
 > **Note:** Attached container configuration files are not yet supported for containers in a Kubernetes cluster.
 
diff --git a/docs/devcontainers/containers.md b/docs/devcontainers/containers.md
index acb683b209..ba129eb9e0 100644
--- a/docs/devcontainers/containers.md
+++ b/docs/devcontainers/containers.md
@@ -612,7 +612,7 @@ See the Docker troubleshooting guide for [Windows](https://docs.docker.com/docke
 
 ### Docker Extension limitations
 
-If you are using the Docker or Kubernetes extension from a WSL or Remote - SSH window, you will not be able to use the right-click **Attach to Container** option. This will only work if you are using it from your local machine.
+If you are using the Docker or Kubernetes extension from a WSL, Remote - Tunnels or Remote - SSH window, using the **Attach Visual Studio Code** context menu action in the Docker or Kubernetes views will ask to pick from the available containers a second time.
 
 ### Extension limitations
 
diff --git a/docs/remote/ssh.md b/docs/remote/ssh.md
index 5bf1f6a8dc..1b9287d05f 100644
--- a/docs/remote/ssh.md
+++ b/docs/remote/ssh.md
@@ -295,7 +295,7 @@ SSHFS is the most convenient option and does not require any file sync'ing. Howe
 
 ### Docker Extension limitations
 
-If you are using the Docker or Kubernetes extension in a Remote - SSH window, you will not be able to use the right-click **Attach VS Code to Container** option. This will only work if you are using it from your local machine.
+If you are using the Docker or Kubernetes extension from a WSL, Remote - Tunnels or Remote - SSH window, using the **Attach Visual Studio Code** context menu action in the Docker or Kubernetes views will ask to pick from the available containers a second time.
 
 ### Extension limitations