diff --git a/kubernetes/files/kubelet/default.master b/kubernetes/files/kubelet/default.master
index 3439776..644e84d 100644
--- a/kubernetes/files/kubelet/default.master
+++ b/kubernetes/files/kubelet/default.master
@@ -7,6 +7,7 @@
 --cluster_dns={{ master.addons.dns.server }} \
 --register-node=false \
 --cluster_domain={{ master.addons.dns.domain }} \
+--cni-bin-dir={{ master.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
 --v=2 \
 {%- for key, value in master.get('kubelet', {}).get('daemon_opts', {}).iteritems() %}
 --{{ key }}="{{ value }}" \
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 84b89d0..6962b12 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -8,6 +8,7 @@
 --allow-privileged={{ pool.kubelet.allow_privileged }} \
 --cluster_dns={{ pool.cluster_dns }} \
 --cluster_domain={{ pool.cluster_domain }} \
+--cni-bin-dir={{ pool.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
 --v=2 \
 {%- if pool.network.engine == 'opencontrail' %}
 --network-plugin={{ pool.network.engine }} \
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index a8dd37a..65c7452 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -84,9 +84,6 @@
         --basic-auth-file=/srv/kubernetes/basic_auth.csv
         --bind-address={{ master.apiserver.address }}
         --client-ca-file=/etc/kubernetes/ssl/ca-{{ master.ca }}.crt
-        {%- if common.version >= 1.6 %}
-        --cni-bin-dir={{ master.apiserver.get('cni_bin_dir', '/opt/cni/bin') }}
-        {%- endif %}
         --etcd-quorum-read=true
         --insecure-bind-address={{ master.apiserver.insecure_address }}
         --insecure-port={{ master.apiserver.get('insecure_port', '8080') }}