diff --git a/packages/core/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts b/packages/core/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
index b6b77d5a40..08aef8da1d 100644
--- a/packages/core/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
+++ b/packages/core/src/main/routes/kubeconfig-route/get-service-account-route.injectable.ts
@@ -84,7 +84,7 @@ function generateKubeConfig(username: string, secret: V1Secret, cluster: Cluster
     ],
     "contexts": [
       {
-        "name": cluster.contextName.get(),
+        "name": [cluster.contextName.get(), username].join("-"),
         "context": {
           "user": username,
           "cluster": cluster.contextName.get(),