diff --git a/tasks/k3s/migrate_to_operator.yaml b/tasks/k3s/migrate_to_operator.yaml
index 74fa760..9f49754 100644
--- a/tasks/k3s/migrate_to_operator.yaml
+++ b/tasks/k3s/migrate_to_operator.yaml
@@ -13,6 +13,7 @@
       - FelixConfiguration-manifest-Calico_Cluster.yaml
       - IPPool-manifest-Calico_Cluster.yaml.j2
       - APIServer-manifest-Calico_Cluster.yaml
+      - ConfigMap-manifest-Calico_Service_Endpoint.yaml.j2
   block:
 
 
diff --git a/templates/ConfigMap-manifest-Calico_Service_Endpoint.yaml.j2 b/templates/ConfigMap-manifest-Calico_Service_Endpoint.yaml.j2
new file mode 100644
index 0000000..0572639
--- /dev/null
+++ b/templates/ConfigMap-manifest-Calico_Service_Endpoint.yaml.j2
@@ -0,0 +1,11 @@
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: kubernetes-services-endpoint
+  namespace: tigera-operator
+data:
+  KUBERNETES_SERVICE_HOST: "
+    {%- set octet = kubernetes_config.cluster.networking.ServiceSubnet | split('.') -%}
+    {{- octet[0] }}.{{- octet[1] }}.{{- octet[2] }}.1"
+  KUBERNETES_SERVICE_PORT: '443'
diff --git a/templates/FelixConfiguration-manifest-Calico_Cluster.yaml b/templates/FelixConfiguration-manifest-Calico_Cluster.yaml
index 465c114..a2f0257 100644
--- a/templates/FelixConfiguration-manifest-Calico_Cluster.yaml
+++ b/templates/FelixConfiguration-manifest-Calico_Cluster.yaml
@@ -5,6 +5,9 @@ kind: FelixConfiguration
 metadata:
   name: default
 spec:
+  bpfConnectTimeLoadBalancing: TCP
+  bpfExternalServiceMode: DSR
+  bpfHostNetworkedNATWithoutCTLB: Enabled
   bpfLogLevel: ""
   floatingIPs: Disabled
   healthPort: 9099
diff --git a/templates/Installation-manifest-Calico_Cluster.yaml.j2 b/templates/Installation-manifest-Calico_Cluster.yaml.j2
index 3f6fac8..c72d1b3 100644
--- a/templates/Installation-manifest-Calico_Cluster.yaml.j2
+++ b/templates/Installation-manifest-Calico_Cluster.yaml.j2
@@ -16,7 +16,8 @@ spec:
       encapsulation: VXLAN
       natOutgoing: Enabled
       nodeSelector: all()
-    linuxDataplane: Iptables
+    # linuxDataplane: Iptables
+    linuxDataplane: BPF
     mtu: 0
     multiInterfaceMode: None
     nodeAddressAutodetectionV4: