diff --git a/ansible/roles/setup-kubernetes/tasks/k3s.yml b/ansible/roles/setup-kubernetes/tasks/k3s.yml
index 58b5de4e0d24ab1210c9664b886cc3a95a7c1a41..745b9dd8aa4ebc9b29574bacab4cac6dbc30c5a5 100644
--- a/ansible/roles/setup-kubernetes/tasks/k3s.yml
+++ b/ansible/roles/setup-kubernetes/tasks/k3s.yml
@@ -18,6 +18,7 @@
 - name: Replace hostname in kubeconfig
   tags:
     - k3s
+    - kubeconfig
   lineinfile:
     dest: "/etc/rancher/k3s/k3s.yaml"
     state: present
@@ -25,10 +26,33 @@
     line: "    server: https://{{ ip_address }}:6443"
     insertafter: "- cluster:"
 
+- name: Replace clustername in kubeconfig context section
+  tags:
+    - k3s
+    - kubeconfig
+  lineinfile:
+    dest: "/etc/rancher/k3s/k3s.yaml"
+    state: present
+    regexp: "^    cluster: default"
+    line: "    cluster: {{ inventory_hostname }}"
+
+- name: Replace clustername in kubeconfig cluster section
+  tags:
+    - k3s
+    - kubeconfig
+  lineinfile:
+    dest: "/etc/rancher/k3s/k3s.yaml"
+    state: present
+    regexp: "^  name: default"
+    line: "  name: {{ inventory_hostname }}"
+    insertbefore: "contexts:"
+    firstmatch: true
+
 
 - name: Set kubeconfig variable
   tags:
     - k3s
+    - kubeconfig
   lineinfile:
     dest: "/etc/environment"
     state: present
@@ -40,6 +64,7 @@
     - fetch
     - k3s
     - kubectl
+    - kubeconfig
   fetch:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"