diff --git a/charts/argo/templates/server-crb.yaml b/charts/argo/templates/server-crb.yaml
index fc76740f..339aefa5 100644
--- a/charts/argo/templates/server-crb.yaml
+++ b/charts/argo/templates/server-crb.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 {{- if .Values.singleNamespace }}
 kind: RoleBinding
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name}}-rb
+  name: {{ .Release.Name }}-{{ .Values.server.name}}-role-binding
 {{ else }}
 kind: ClusterRoleBinding
 metadata:
@@ -23,7 +23,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.server.name}}-crb
+  name: {{ .Release.Name }}-{{ .Values.server.name}}-cluster-template-crb
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/charts/argo/templates/workflow-controller-crb.yaml b/charts/argo/templates/workflow-controller-crb.yaml
index 80f0a102..4172de1f 100644
--- a/charts/argo/templates/workflow-controller-crb.yaml
+++ b/charts/argo/templates/workflow-controller-crb.yaml
@@ -5,7 +5,7 @@ kind: RoleBinding
 kind: ClusterRoleBinding
 {{- end }}
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-binding
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}-role-binding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -31,7 +31,7 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template-binding
+  name: {{ .Release.Name }}-{{ .Values.controller.name }}-cluster-template-crb
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole