diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 00000000..28539881
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,10 @@
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
+
+# Argo CD
+/charts/argo-cd @seanson
+
+# Argo Events
+/charts/argo-events @jbehling
+
+# Argo Workflows
+/charts/argo @benjaminws
diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index cdb6dde0..4d7f9aa4 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 0.5.0
+version: 0.5.1
 keywords:
 - argo-events
 - sensor-controller
diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/charts/argo-events/templates/argo-events-cluster-roles.yaml
index d5f119ec..c7a47254 100644
--- a/charts/argo-events/templates/argo-events-cluster-roles.yaml
+++ b/charts/argo-events/templates/argo-events-cluster-roles.yaml
@@ -8,12 +8,12 @@ roleRef:
   name: argo-events-role
 subjects:
   - kind: ServiceAccount
-    name: argo-events-sa
+    name: {{ .Values.serviceAccount }}
     namespace: {{ .Release.Namespace }}
   {{- if .Values.additionalSaNamespaces }}
   {{- range $namespace := .Values.additionalSaNamespaces }}
   - kind: ServiceAccount
-    name: argo-events-sa
+    name: {{ .Values.serviceAccount }}
     namespace: {{ $namespace }}
   {{- end }}
   {{- end }}
diff --git a/charts/argo-events/templates/argo-events-sa.yaml b/charts/argo-events/templates/argo-events-sa.yaml
index 5855b0c7..04a39f51 100644
--- a/charts/argo-events/templates/argo-events-sa.yaml
+++ b/charts/argo-events/templates/argo-events-sa.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: argo-events-sa
+  name: {{ .Values.serviceAccount }}
   namespace: {{ .Release.Namespace }}
 {{- if .Values.additionalSaNamespaces }}
 {{- range $namespace := .Values.additionalSaNamespaces }}
@@ -11,7 +11,7 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: argo-events-sa
+  name: {{ .Values.serviceAccount }}
   namespace: {{ $namespace }}
 {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 2c23f5a5..e8bc5a0c 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v1
 appVersion: "v2.4.2"
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.6.1
+version: 0.6.2
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
diff --git a/charts/argo/templates/workflow-crd.yaml b/charts/argo/templates/workflow-crd.yaml
index 75aa6154..bada1925 100644
--- a/charts/argo/templates/workflow-crd.yaml
+++ b/charts/argo/templates/workflow-crd.yaml
@@ -1,4 +1,4 @@
-{{- if .installCRD }}
+{{- if .Values.installCRD }}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/charts/argo/templates/workflow-template-crd.yaml b/charts/argo/templates/workflow-template-crd.yaml
index 0ecc8cd6..55c940d5 100644
--- a/charts/argo/templates/workflow-template-crd.yaml
+++ b/charts/argo/templates/workflow-template-crd.yaml
@@ -1,4 +1,4 @@
-{{- if .installCRD }}
+{{- if .Values.installCRD }}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata: