diff --git a/templates/config.j2 b/templates/config.j2
index d8e09e0..05eaea1 100644
--- a/templates/config.j2
+++ b/templates/config.j2
@@ -7,13 +7,13 @@ clusters:
 contexts:
 - context:
     cluster: {{ cluster }}
-    user: {{ username }}
+    user: {{ username }}@{{ cluster }}
   name: {{ cluster }}
 current-context: {{ cluster }}
 kind: Config
 preferences: {}
 users:
-- name: {{ username }}
+- name: {{ username }}@{{ cluster }}
   user:
     client-certificate-data: {{ user_cert_data }}
-    client-key-data: {{ user_key_data }}
\ No newline at end of file
+    client-key-data: {{ user_key_data }}