diff --git a/bin/update.sh b/bin/update.sh
index c6c0d52..2601439 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -13,4 +13,8 @@ sed "$line_nb,$[$line_nb+1] s/# //" -i files/calico-node-DaemonSet.yaml
 
 # Switch to VxLan
 sed "/calico_backend:/ s/bird/vxlan/" -i files/calico-config-ConfigMap.yaml
-sed -e "s/IPIP$/VXLAN/" -e "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml
+line_nb=$(grep -n CALICO_IPV4POOL_IPIP files/calico-node-DaemonSet.yaml | cut -d: -f1)
+sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Never\"/" -i files/calico-node-DaemonSet.yaml
+line_nb=$(grep -n CALICO_IPV4POOL_VXLAN files/calico-node-DaemonSet.yaml | cut -d: -f1)
+sed "$line_nb,$[$line_nb+1] s/\(value: \).*/\1\"Always\"/" -i files/calico-node-DaemonSet.yaml
+sed "/-bird-/ s/\(- -bird-.*\)/# \1/" -i files/calico-node-DaemonSet.yaml
diff --git a/files/calico-node-DaemonSet.yaml b/files/calico-node-DaemonSet.yaml
index c129ca3..1db25aa 100644
--- a/files/calico-node-DaemonSet.yaml
+++ b/files/calico-node-DaemonSet.yaml
@@ -144,12 +144,12 @@ spec:
             # Auto-detect the BGP IP address.
             - name: IP
               value: "autodetect"
-            # Enable VXLAN
-            - name: CALICO_IPV4POOL_VXLAN
-              value: "Always"
+            # Enable IPIP
+            - name: CALICO_IPV4POOL_IPIP
+              value: "Never"
             # Enable or Disable VXLAN on the default IP pool.
             - name: CALICO_IPV4POOL_VXLAN
-              value: "Never"
+              value: "Always"
             # Set MTU for tunnel device used if ipip is enabled
             - name: FELIX_IPINIPMTU
               valueFrom: