diff --git a/website/docs/kubernetes/existing-kubernetes/index.md b/website/docs/kubernetes/existing-kubernetes/index.md
index 2b4c5ae6cb8..652106c4acb 100644
--- a/website/docs/kubernetes/existing-kubernetes/index.md
+++ b/website/docs/kubernetes/existing-kubernetes/index.md
@@ -30,7 +30,7 @@ You can also use the Kubernetes CLI to configure access to your Kubernetes clust
#### Verification
-- You can [view and select the Kubernetes cluster in Podman Desktop](/docs/kubernetes/viewing-and-selecting-current-kubernete-context)
+- You can [view and select the Kubernetes cluster in Podman Desktop](/docs/kubernetes/viewing-and-selecting-current-kubernetes-context)
#### Additional resopurces
diff --git a/website/docs/kubernetes/img/selecting-context-from-dropdown.png b/website/docs/kubernetes/img/selecting-context-from-dropdown.png
new file mode 100644
index 00000000000..fc220a4e38f
Binary files /dev/null and b/website/docs/kubernetes/img/selecting-context-from-dropdown.png differ
diff --git a/website/docs/kubernetes/img/selecting-context.png b/website/docs/kubernetes/img/selecting-context.png
new file mode 100644
index 00000000000..11bd9483643
Binary files /dev/null and b/website/docs/kubernetes/img/selecting-context.png differ
diff --git a/website/docs/kubernetes/index.md b/website/docs/kubernetes/index.md
index 7a529df71fc..0fe4d905b1b 100644
--- a/website/docs/kubernetes/index.md
+++ b/website/docs/kubernetes/index.md
@@ -23,8 +23,7 @@ Podman Desktop and Podman have many features allowing easy migration from contai
#### Next steps
-1. [Select the current Kubernetes context based on your Kube config](/docs/kubernetes/viewing-and-selecting-current-kubernete-context).
1. [Migrate containers to Kubernetes](/docs/kubernetes).
-1. [Select your Kubernetes context](/docs/kubernetes/viewing-and-selecting-current-kubernete-context-in-the-status-bar).
-1. [Deploy a container](/docs/kubernetes/deploying-a-container-to-kubernetes).
-1. [Deploy a pod](/docs/kubernetes/deploying-a-pod-to-kubernetes).
+2. [Select your Kubernetes context](/docs/kubernetes/viewing-and-selecting-current-kubernetes-context).
+3. [Deploy a container](/docs/kubernetes/deploying-a-container-to-kubernetes).
+4. [Deploy a pod](/docs/kubernetes/deploying-a-pod-to-kubernetes).
diff --git a/website/docs/kubernetes/viewing-and-selecting-current-kubernete-context-in-the-status-bar.md b/website/docs/kubernetes/viewing-and-selecting-current-kubernete-context-in-the-status-bar.md
deleted file mode 100644
index c29c066814c..00000000000
--- a/website/docs/kubernetes/viewing-and-selecting-current-kubernete-context-in-the-status-bar.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-sidebar_position: 2
-title: Selecting a context in the status bar
-description: Viewing and selecting the current Kubernetes context in the status bar
-keywords: [podman desktop, podman, containers, pods, migrating, kubernetes]
-tags: [migrating-to-kubernetes]
----
-
-# Viewing and selecting the current Kubernetes context
-
-With Podman Desktop, you can view and select your current Kubernetes context in the status bar.
-
-#### Prerequisites
-
-- You have a Kubernetes context in your kubeconfig file: _<your_kubernetes_cluster>_.
- For example, [Creating a kind cluster](/docs/kind/creating-a-kind-cluster).
-
-#### Procedure
-
-1. To view your current Kubernetes context, in the **Podman Desktop** main window status bar, see the name next to the icon.
-
-1. (Optionally) To change your Kubernetes context:
- 1. Click .
- 2. In the drop-down menu, click the context name to activate.
diff --git a/website/docs/kubernetes/viewing-and-selecting-current-kubernete-context.md b/website/docs/kubernetes/viewing-and-selecting-current-kubernetes-context.md
similarity index 50%
rename from website/docs/kubernetes/viewing-and-selecting-current-kubernete-context.md
rename to website/docs/kubernetes/viewing-and-selecting-current-kubernetes-context.md
index 57967251cfe..45271261d85 100644
--- a/website/docs/kubernetes/viewing-and-selecting-current-kubernete-context.md
+++ b/website/docs/kubernetes/viewing-and-selecting-current-kubernetes-context.md
@@ -2,8 +2,8 @@
sidebar_position: 2
title: Selecting a context
description: Viewing and selecting the current Kubernetes context
-keywords: [podman desktop, podman, containers, pods, migrating, kubernetes]
-tags: [migrating-to-kubernetes]
+keywords: [podman desktop, podman, containers, pods, context, kubernetes]
+tags: [selecting-context, kubernetes]
---
import Tabs from '@theme/Tabs';
@@ -11,14 +11,40 @@ import TabItem from '@theme/TabItem';
# Viewing and selecting the current Kubernetes context
-With Podman Desktop, you can view and select your current Kubernetes context.
+With Podman Desktop, you can view and select your current Kubernetes context to access:
+
+- The Kubernetes cluster you want to interact with
+- The namespace where you define your application resources
+
+Based on your configurations, Podman Desktop automatically populates the context list. For example, if you have created a Minikube, Kind, or Developer Sandbox cluster, a respective Kubernetes context is automatically added in the Podman Desktop application. Then, you can easily switch from one context to another if needed.
+
+:::note
+
+When you select a Kubernetes context, you can access all the namespaces associated with it. However, you cannot switch from one namespace to another using the Podman Desktop UI. As an alternative, you can use this command: `kubectl config set-context --current --namespace=`.
+
+:::
#### Prerequisites
- You have a Kubernetes context in your kubeconfig file: _<your_kubernetes_cluster>_.
For example, [Creating a kind cluster](/docs/kind/creating-a-kind-cluster).
-#### Procedure
+#### Procedure: Using the status bar
+
+1. To view your current Kubernetes context, in the **Podman Desktop** main window status bar, see the name next to the **Current Kubernetes context** icon.
+
+2. Optional: To change your Kubernetes context:
+ 1. Click the context in the status bar.
+ 2. Select a Kubernetes context to activate from the dropdown list.
+ 
+
+#### Procedure: Using the Podman Desktop Settings
+
+1. Go to **Settings > Kubernetes** to view the configured Kubernetes contexts.
+1. Optional: Click the **Set as Current Context** icon to change your context.
+ 
+
+#### Procedure: Using the tray menu
1. Open the **Podman Desktop tray** menu.
diff --git a/website/docs/openshift/developer-sandbox/index.md b/website/docs/openshift/developer-sandbox/index.md
index 8378c34e750..fc3847d85a9 100644
--- a/website/docs/openshift/developer-sandbox/index.md
+++ b/website/docs/openshift/developer-sandbox/index.md
@@ -42,7 +42,7 @@ With Podman Desktop, you can configure access to your Developer Sandbox instance

-1. [Select your Developer Sandbox in the Podman Desktop tray](/docs/kubernetes/viewing-and-selecting-current-kubernete-context)
+1. [Select your Developer Sandbox in the Podman Desktop tray](/docs/kubernetes/viewing-and-selecting-current-kubernetes-context)
1. Run basic tasks such as:
- [Deploying a container](/docs/kubernetes/deploying-a-container-to-kubernetes)
- [Deploying a pod](/docs/kubernetes/deploying-a-pod-to-kubernetes)
diff --git a/website/docs/openshift/openshift-local/index.md b/website/docs/openshift/openshift-local/index.md
index b40699aea52..9fd283ebab6 100644
--- a/website/docs/openshift/openshift-local/index.md
+++ b/website/docs/openshift/openshift-local/index.md
@@ -80,7 +80,7 @@ With Podman Desktop and the OpenShift Local extension, you can manage your OpenS

-1. [Select your OpenShift Local instance the Podman Desktop tray](/docs/kubernetes/viewing-and-selecting-current-kubernete-context).
+1. [Select your OpenShift Local instance the Podman Desktop tray](/docs/kubernetes/viewing-and-selecting-current-kubernetes-context).
1. Run basic tasks such as:
- [Deploying a container](/docs/kubernetes/deploying-a-container-to-kubernetes)
- [Deploying a pod](/docs/kubernetes/deploying-a-pod-to-kubernetes)