diff --git a/omni/cluster-templates/patches/cni-none.yaml b/omni/cluster-templates/patches/cni-none.yaml
index 60aaf0e..1c3ff94 100644
--- a/omni/cluster-templates/patches/cni-none.yaml
+++ b/omni/cluster-templates/patches/cni-none.yaml
@@ -1,4 +1,3 @@
-cluster:
-  network:
-    cni:
-      name: none
+apiVersion: v1alpha1
+kind: KubeFlannelCNIConfig
+$patch: delete
diff --git a/omni/cluster-templates/patches/disable-kube-proxy.yaml b/omni/cluster-templates/patches/disable-kube-proxy.yaml
index e5021d6..bec9e28 100644
--- a/omni/cluster-templates/patches/disable-kube-proxy.yaml
+++ b/omni/cluster-templates/patches/disable-kube-proxy.yaml
@@ -1,3 +1,3 @@
-cluster:
-  proxy:
-    disabled: true
+apiVersion: v1alpha1
+kind: KubeProxyConfig
+enabled: false