diff --git a/kubernetes/files/manifest/kube-apiserver.manifest b/kubernetes/files/manifest/kube-apiserver.manifest
index 0d24f9a..d00f9eb 100644
--- a/kubernetes/files/manifest/kube-apiserver.manifest
+++ b/kubernetes/files/manifest/kube-apiserver.manifest
@@ -31,9 +31,7 @@
       --requestheader-extra-headers-prefix={{ master.auth.proxy.header.extra }}
       --requestheader-client-ca-file={{ master.auth.proxy.ca_file|default("/etc/kubernetes/ssl/ca-"+master.ca+".crt") }}
       {%- endif %}
-      {%- if master.auth.get('anonymous', False) %}
-      --anonymous-auth=true
-      {%- endif %}
+      --anonymous-auth={{ master.auth.get('anonymous', {}).enabled|default(False) }}
       {%- if master.auth.get('basic', {}).enabled|default(True) %}
       --basic-auth-file={{ master.auth.basic.file|default("/srv/kubernetes/basic_auth.csv") }}
       {%- endif %}
diff --git a/kubernetes/master/controller.sls b/kubernetes/master/controller.sls
index f8ae0a2..5e1566f 100644
--- a/kubernetes/master/controller.sls
+++ b/kubernetes/master/controller.sls
@@ -112,9 +112,7 @@
         --requestheader-extra-headers-prefix={{ master.auth.proxy.header.extra }}
         --requestheader-client-ca-file={{ master.auth.proxy.ca_file|default("/etc/kubernetes/ssl/ca-"+master.ca+".crt") }}
         {%- endif %}
-        {%- if master.auth.get('anonymous', False) %}
-        --anonymous-auth=true
-        {%- endif %}
+        --anonymous-auth={{ master.auth.get('anonymous', {}).enabled|default(False) }}
         --etcd-quorum-read=true
         --insecure-bind-address={{ master.apiserver.insecure_address }}
         --insecure-port={{ master.apiserver.insecure_port }}
diff --git a/metadata/service/master/cluster.yml b/metadata/service/master/cluster.yml
index 8088d33..2d93f4e 100644
--- a/metadata/service/master/cluster.yml
+++ b/metadata/service/master/cluster.yml
@@ -29,8 +29,6 @@
         insecure_address: 127.0.0.1
         insecure_port: 8080
         count: 3
-        daemon_opts:
-          anonymous-auth: false
       etcd:
         members:
           - host: ${_param:cluster_node01_address}
diff --git a/metadata/service/master/single.yml b/metadata/service/master/single.yml
index 80ad876..22c83f5 100644
--- a/metadata/service/master/single.yml
+++ b/metadata/service/master/single.yml
@@ -26,8 +26,6 @@
         internal_address: ${_param:kubernetes_internal_api_address}
         insecure_address: 127.0.0.1
         insecure_port: 8080
-        daemon_opts:
-          anonymous-auth: false
       etcd:
         members:
           - host: ${_param:single_address}