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/map.jinja b/kubernetes/map.jinja
index f36f9e3..594b50b 100644
--- a/kubernetes/map.jinja
+++ b/kubernetes/map.jinja
@@ -1,11 +1,15 @@
+{% set _version = salt['cmd.run']("hyperkube --version | sed -e 's/-.*//g' -e 's/v//g' -e 's/Kubernetes //g' | awk -F '.' '{ print $1 \".\" $2 }'") %}
+
 {% set common = salt['grains.filter_by']({
     'Debian': {
         'pkgs': ['curl', 'git', 'apt-transport-https', 'python-apt', 'nfs-common', 'socat', 'netcat-traditional', 'openssl'],
         'services': [],
+        'version': _version|float,
     },
     'RedHat': {
         'pkgs': ['curl', 'git', 'apt-transport-https', 'python-apt', 'nfs-common', 'socat', 'netcat-traditional', 'python'],
         'services': [],
+        'version': _version|float,
     },
 }, merge=salt['pillar.get']('kubernetes:common')) %}
 
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index 9795dbb..65c7452 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -1,4 +1,5 @@
 {%- from "kubernetes/map.jinja" import master with context %}
+{%- from "kubernetes/map.jinja" import common with context %}
 {%- if master.enabled %}
 
 /srv/kubernetes/known_tokens.csv:
@@ -78,7 +79,7 @@
     - mode: 644
     - contents: >-
         DAEMON_ARGS="
-        --admission-control=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAccount,ResourceQuota
+        --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,ResourceQuota
         --allow-privileged=True
         --basic-auth-file=/srv/kubernetes/basic_auth.csv
         --bind-address={{ master.apiserver.address }}