diff --git a/manifests/init.pp b/manifests/init.pp
index eb884719..eec1a018 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -73,6 +73,10 @@
 #   The default runtime to use with containerd
 #   Defaults to runc
 #
+# [*containerd_snapshotter*]
+#   The default snapshotter to use with containerd
+#   Defaults to overlayfs
+#
 # [*containerd_sandbox_image*]
 #  The configuration for the image pause container
 #  Defaults k8s.gcr.io/pause:3.2
@@ -679,6 +683,7 @@
     },
   },
   Enum['runc','nvidia'] $containerd_default_runtime_name  = 'runc',
+  Enum['overlayfs', 'zfs'] $containerd_snapshotter        = 'overlayfs',
   String $containerd_sandbox_image                        = 'k8s.gcr.io/pause:3.2',
   String $etcd_archive                                    = "etcd-v${etcd_version}-linux-amd64.tar.gz",
   Optional[String] $etcd_archive_checksum                 = undef,
diff --git a/manifests/kube_addons.pp b/manifests/kube_addons.pp
index 6d0684f9..22a13430 100644
--- a/manifests/kube_addons.pp
+++ b/manifests/kube_addons.pp
@@ -39,7 +39,7 @@
     if $cni_provider == 'calico-tigera' {
       if $cni_network_preinstall {
         exec { 'Install cni network (preinstall)':
-          command     => ['kubectl', 'apply', '-f', $cni_network_preinstall],
+          command     => ['kubectl', 'apply', '--server-side', '-f', $cni_network_preinstall],
           onlyif      => $exec_onlyif,
           unless      => 'kubectl -n tigera-operator get deployments | egrep "^tigera-operator"',
           environment => $env,
diff --git a/manifests/packages.pp b/manifests/packages.pp
index e54371c4..624d735a 100644
--- a/manifests/packages.pp
+++ b/manifests/packages.pp
@@ -26,6 +26,8 @@
   Optional[Hash] $containerd_plugins_registry           = $kubernetes::containerd_plugins_registry,
   Enum['runc','nvidia']
   $containerd_default_runtime_name                      = $kubernetes::containerd_default_runtime_name,
+  Enum['overlayfs', 'zfs']
+  $containerd_snapshotter                               = $kubernetes::containerd_snapshotter,
   String $etcd_archive                                  = $kubernetes::etcd_archive,
   Optional[String] $etcd_archive_checksum               = $kubernetes::etcd_archive_checksum,
   String $etcd_version                                  = $kubernetes::etcd_version,
diff --git a/templates/containerd/config.toml.erb b/templates/containerd/config.toml.erb
index 948c7d23..d4b07827 100644
--- a/templates/containerd/config.toml.erb
+++ b/templates/containerd/config.toml.erb
@@ -69,7 +69,7 @@ oom_score = 0
     disable_hugetlb_controller = true
     ignore_image_defined_volumes = false
     [plugins."io.containerd.grpc.v1.cri".containerd]
-      snapshotter = "overlayfs"
+      snapshotter = "<%= @containerd_snapshotter -%>"
       default_runtime_name = "<%= @containerd_default_runtime_name %>"
       no_pivot = false
       disable_snapshot_annotations = true
diff --git a/templates/v1beta3/config_kubeadm.yaml.erb b/templates/v1beta3/config_kubeadm.yaml.erb
index 4e498f4f..3d595b65 100644
--- a/templates/v1beta3/config_kubeadm.yaml.erb
+++ b/templates/v1beta3/config_kubeadm.yaml.erb
@@ -150,4 +150,3 @@ mode: "<%= @proxy_mode %>"
 nodePortAddresses: null
 oomScoreAdj: -999
 portRange: ""
-udpIdleTimeout: 250ms