diff --git a/cluster/addons/rbac/kube-apiserver-kubelet-api-admin-binding.yaml b/cluster/addons/rbac/kubelet-api-auth/kube-apiserver-kubelet-api-admin-binding.yaml
similarity index 100%
rename from cluster/addons/rbac/kube-apiserver-kubelet-api-admin-binding.yaml
rename to cluster/addons/rbac/kubelet-api-auth/kube-apiserver-kubelet-api-admin-binding.yaml
diff --git a/cluster/addons/rbac/kubelet-api-admin-role.yaml b/cluster/addons/rbac/kubelet-api-auth/kubelet-api-admin-role.yaml
similarity index 100%
rename from cluster/addons/rbac/kubelet-api-admin-role.yaml
rename to cluster/addons/rbac/kubelet-api-auth/kubelet-api-admin-role.yaml
diff --git a/cluster/addons/rbac/kubelet-certificate-management.yaml b/cluster/addons/rbac/kubelet-cert-rotation/kubelet-certificate-management.yaml
similarity index 100%
rename from cluster/addons/rbac/kubelet-certificate-management.yaml
rename to cluster/addons/rbac/kubelet-cert-rotation/kubelet-certificate-management.yaml
diff --git a/cluster/addons/rbac/kubelet-binding.yaml b/cluster/addons/rbac/legacy-kubelet-user/kubelet-binding.yaml
similarity index 100%
rename from cluster/addons/rbac/kubelet-binding.yaml
rename to cluster/addons/rbac/legacy-kubelet-user/kubelet-binding.yaml