diff --git a/docs/clusterdefinition.md b/docs/clusterdefinition.md
index 0ca7df2371..b6602cf9b8 100644
--- a/docs/clusterdefinition.md
+++ b/docs/clusterdefinition.md
@@ -181,8 +181,8 @@ Below is a list of kubelet options that are *not* currently user-configurable, e
 |"--pod-manifest-path"|"/etc/kubernetes/manifests"|
 |"--network-plugin"|"cni"|
 |"--node-labels"|(based on Azure node metadata)|
-|"--cgroups-per-qos"|"false"|
-|"--enforce-node-allocatable"|""|
+|"--cgroups-per-qos"|"true"|
+|"--enforce-node-allocatable"|"pods"|
 |"--kubeconfig"|"/var/lib/kubelet/kubeconfig"|
 |"--register-node" (master nodes only)|"true"|
 |"--register-with-taints" (master nodes only)|"node-role.kubernetes.io/master=true:NoSchedule"|
diff --git a/pkg/acsengine/defaults-kubelet.go b/pkg/acsengine/defaults-kubelet.go
index d2df9bfdf2..22abe02606 100644
--- a/pkg/acsengine/defaults-kubelet.go
+++ b/pkg/acsengine/defaults-kubelet.go
@@ -18,8 +18,8 @@ func setKubeletConfig(cs *api.ContainerService) {
 		"--client-ca-file":                  "/etc/kubernetes/certs/ca.crt",
 		"--pod-manifest-path":               "/etc/kubernetes/manifests",
 		"--cluster-dns":                     o.KubernetesConfig.DNSServiceIP,
-		"--cgroups-per-qos":                 "false",
-		"--enforce-node-allocatable":        "",
+		"--cgroups-per-qos":                 "true",
+		"--enforce-node-allocatable":        "pods",
 		"--kubeconfig":                      "/var/lib/kubelet/kubeconfig",
 		"--azure-container-registry-config": "/etc/kubernetes/azure.json",
 		"--keep-terminated-pod-volumes":     "false",