diff --git a/kubectl.tf b/kubectl.tf
index e2508f0..c360250 100644
--- a/kubectl.tf
+++ b/kubectl.tf
@@ -1,6 +1,6 @@
 resource "local_file" "kubeconfig" {
   content  = "${data.template_file.kubeconfig.rendered}"
-  filename = "${var.config_output_path}/kubeconfig"
+  filename = "${var.config_output_path}/kubeconfig_eks_${data.aws_region.current.name}_${var.cluster_name}"
   count    = "${var.configure_kubectl_session ? 1 : 0}"
 }
 
diff --git a/templates/kubeconfig.tpl b/templates/kubeconfig.tpl
index 7babdb5..332d21e 100644
--- a/templates/kubeconfig.tpl
+++ b/templates/kubeconfig.tpl
@@ -6,17 +6,18 @@ clusters:
 - cluster:
     server: ${endpoint}
     certificate-authority-data: ${cluster_auth_base64}
-  name: ${cluster_name}
+  name: eks_${region}_${cluster_name}
 
 contexts:
 - context:
-    cluster: ${cluster_name}
-    user: ${user_name}
-  name: ${context_name}
-current-context: ${context_name}
+    cluster: eks_${region}_${cluster_name}
+    user: eks_${region}_${cluster_name}
+  name: eks_${region}_${cluster_name}
+
+current-context: eks_${region}_${cluster_name}
 
 users:
-- name: ${user_name}
+- name: eks_${region}_${cluster_name}
   user:
     exec:
       apiVersion: client.authentication.k8s.io/v1alpha1
@@ -26,4 +27,4 @@ users:
         - "-i"
         - "${cluster_name}"
 ${aws_authenticator_additional_args}
-${aws_authenticator_env_variables}
\ No newline at end of file
+${aws_authenticator_env_variables}