diff --git a/deploy/pve-cloud-controller-manager.yaml b/deploy/pve-cloud-controller-manager.yaml
index 0f93bdc..8d233a8 100644
--- a/deploy/pve-cloud-controller-manager.yaml
+++ b/deploy/pve-cloud-controller-manager.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: cloud-controller-manager
   namespace: kube-system
+  name: cloud-controller-manager
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -59,8 +59,8 @@ rules:
   - get
   - update
 ---
-kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
 metadata:
   name: system:cloud-controller-manager
 roleRef:
@@ -69,22 +69,22 @@ roleRef:
   name: system:cloud-controller-manager
 subjects:
 - kind: ServiceAccount
-  name: cloud-controller-manager
   namespace: kube-system
+  name: cloud-controller-manager
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: system:cloud-controller-manager:extension-apiserver-authentication-reader
   namespace: kube-system
+  name: system:cloud-controller-manager:extension-apiserver-authentication-reader
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: extension-apiserver-authentication-reader
 subjects:
 - kind: ServiceAccount
-  name: cloud-controller-manager
   namespace: kube-system
+  name: cloud-controller-manager
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/deploy/pve-csr-approver-manager.yaml b/deploy/pve-csr-approver-manager.yaml
index 0736cba..5b8bd41 100644
--- a/deploy/pve-csr-approver-manager.yaml
+++ b/deploy/pve-csr-approver-manager.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: pve-csr-approver
   namespace: kube-system
+  name: pve-csr-approver
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: pve-csr-approver
+  name: system:pve-csr-approver
 rules:
 - apiGroups: ["certificates.k8s.io"]
   resources: ["signers"]
@@ -50,14 +50,14 @@ rules:
   resources: ["configmaps"]
   verbs: ["create"]
 ---
-kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
 metadata:
-  name: pve-csr-approver
+  name: system:pve-csr-approver
 roleRef:
-  kind: ClusterRole
-  name: pve-csr-approver
   apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:pve-csr-approver
 subjects:
 - kind: ServiceAccount
   namespace: kube-system