diff --git a/templates/addons/cilium/cilium.yaml b/templates/addons/cilium/cilium.yaml
index c5202a183..d6b3b573e 100644
--- a/templates/addons/cilium/cilium.yaml
+++ b/templates/addons/cilium/cilium.yaml
@@ -9,7 +9,7 @@ spec:
   repoURL: https://helm.cilium.io/
   chartName: cilium
   namespace: kube-system
-  version: ${CILIUM_VERSION:=1.18.4}
+  version: ${CILIUM_VERSION:=1.18.7}
   options:
     waitForJobs: true
     wait: true
diff --git a/templates/flavors/kubeadm/dual-stack/kustomization.yaml b/templates/flavors/kubeadm/dual-stack/kustomization.yaml
index 6d7ea183f..3280ccbf0 100644
--- a/templates/flavors/kubeadm/dual-stack/kustomization.yaml
+++ b/templates/flavors/kubeadm/dual-stack/kustomization.yaml
@@ -95,6 +95,14 @@ patches:
           bgpControlPlane:
             enabled: true
           routingMode: native
+          devices:
+            - eth0
+            - eth1
+          nodePort:
+            addresses:
+              - 0.0.0.0/0
+              - ::/0
+            directRoutingDevice: eth0
           kubeProxyReplacement: true
           ipv4NativeRoutingCIDR: ${VPC_NETWORK_CIDR:=10.0.0.0/8}
           ipv6NativeRoutingCIDR: ::/0
@@ -108,8 +116,6 @@ patches:
             allow-localhost: policy
           k8sServiceHost: {{ .InfraCluster.spec.controlPlaneEndpoint.host }}
           k8sServicePort: {{ .InfraCluster.spec.controlPlaneEndpoint.port }}
-          extraArgs:
-          - --nodeport-addresses=0.0.0.0/0
           ipam:
             mode: kubernetes
           ipv4: