diff --git a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2 b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2
index cf0ad430..8346ffed 100644
--- a/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2
+++ b/bootstrap/templates/ansible/playbooks/templates/custom-cilium-helmchart.yaml.j2.j2
@@ -37,8 +37,8 @@ spec:
     ipv6:
       enabled: true
     #% endif %#
-    k8sServiceHost: "{{ kube_api_addr }}"
-    k8sServicePort: 6443
+    k8sServiceHost: 127.0.0.1
+    k8sServicePort: 6444
     kubeProxyReplacement: true
     kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
     l2announcements:
diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2
index 7f249913..fa5e8a82 100644
--- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmrelease.yaml.j2
@@ -90,8 +90,13 @@ spec:
     ipv6:
       enabled: true
     #% endif %#
+    #% if bootstrap_distribution == "k3s" %#
+    k8sServiceHost: 127.0.0.1
+    k8sServicePort: 6444
+    #% else %#
     k8sServiceHost: "${KUBE_API_ADDR}"
     k8sServicePort: 6443
+    #% endif %#
     kubeProxyReplacement: true
     kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
     l2announcements: