diff --git a/ansible/neo/inventory/group_vars/kubernetes/supplemental.yaml b/ansible/neo/inventory/group_vars/kubernetes/supplemental.yaml
index 82aacf5b..3a4553d4 100644
--- a/ansible/neo/inventory/group_vars/kubernetes/supplemental.yaml
+++ b/ansible/neo/inventory/group_vars/kubernetes/supplemental.yaml
@@ -3,9 +3,9 @@ timezone: "Asia/Singapore"
 github_username: abasitt
 kubeapi_addr: "2001:470:ee86:30:192:168:30:60"  #kube-vip-address
 cluster_cidr: "10.44.0.0/16"
-cluster_v6cidr: "2001:470:ee86:44::/56"
+cluster_v6cidr: "2001:470:ee86:4400::/56"
 service_cidr: "10.45.0.0/16"
-service_v6cidr: "2001:470:ee86:4:10:45::/112"
+service_v6cidr: "2001:470:ee86:4500:10:45::/112"
 coredns_v4addr: "{{ service_cidr.split(',')[0] | ansible.utils.nthhost(10) }}"
 coredns_v6addr: "{{ service_v6cidr.split(',')[0] | ansible.utils.nthhost(10) }}"
 nodes_v4cidr: "192.168.30.0/24"
diff --git a/ansible/neo/inventory/group_vars/master/main.yaml b/ansible/neo/inventory/group_vars/master/main.yaml
index 663b1ce5..10ff63b0 100644
--- a/ansible/neo/inventory/group_vars/master/main.yaml
+++ b/ansible/neo/inventory/group_vars/master/main.yaml
@@ -41,7 +41,7 @@ k3s_server:
     - "bind-address=::"          # Required to monitor kube-scheduler with kube-prometheus-stack
   kube-apiserver-arg:
     - "bind-address=::"
-    - "--advertise-address={{ kubeapi_addr }}"
+    #- "--advertise-address={{ kubeapi_addr }}"
     - "anonymous-auth=true"           # Required for HAProxy health-checks
     - "default-not-ready-toleration-seconds=20"
     - "default-unreachable-toleration-seconds=20"
diff --git a/ansible/neo/inventory/group_vars/worker/main.yaml b/ansible/neo/inventory/group_vars/worker/main.yaml
index 23c16229..f854cf9c 100644
--- a/ansible/neo/inventory/group_vars/worker/main.yaml
+++ b/ansible/neo/inventory/group_vars/worker/main.yaml
@@ -4,10 +4,10 @@
 
 k3s_control_node: false
 k3s_agent:
-  node-ip: "{{ ansible_host }},{{ ansible_v6host }}"
+  node-ip: "{{ ansible_v6host }},{{ ansible_host }}"
   #node-ip: "{{ ansible_default_ipv6.address }},{{ ansible_host }}"
   pause-image: registry.k8s.io/pause:3.10
   kubelet-arg:
     - "image-gc-high-threshold=55"
     - "image-gc-low-threshold=50"
-    - "node-ip=::"
+    - "node-ip={{ ansible_v6host }}"
diff --git a/ansible/neo/playbooks/templates/custom-calico-installation.yaml.j2 b/ansible/neo/playbooks/templates/custom-calico-installation.yaml.j2
index 29918afe..4fc4a545 100644
--- a/ansible/neo/playbooks/templates/custom-calico-installation.yaml.j2
+++ b/ansible/neo/playbooks/templates/custom-calico-installation.yaml.j2
@@ -30,3 +30,4 @@ spec:
         nodeSelector: all()
   nodeMetricsPort: 9091
   typhaMetricsPort: 9093
+  kubeletVolumePluginPath: None
diff --git a/ansible/neo/playbooks/templates/kube-vip-ds.yaml.j2 b/ansible/neo/playbooks/templates/kube-vip-ds.yaml.j2
index b9cf5d2e..993689f1 100644
--- a/ansible/neo/playbooks/templates/kube-vip-ds.yaml.j2
+++ b/ansible/neo/playbooks/templates/kube-vip-ds.yaml.j2
@@ -30,7 +30,7 @@ spec:
             - name: port
               value: "6443"
             - name: vip_cidr
-              value: "32"
+              value: "128"
             - name: cp_enable
               value: "true"
             - name: cp_namespace