diff --git a/CODEOWNERS b/CODEOWNERS
index 4faa6935..eff2aab2 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,5 +1,8 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
 
+# All charts
+/charts/* @mkilchhofer
+
 # Argo Workflows
 /charts/argo @stefansedich @paguos @vladlosev @yann-soubeyrand @oliverbaehler
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b64861bb..f4c7d89c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,6 +22,12 @@ helm delete argo-cd --purge
 kubectl delete crd -l app.kubernetes.io/part-of=argocd
 ```
 
+Pre-requisites:
+```
+helm repo add redis-ha https://dandydeveloper.github.io/charts/
+helm dependency update
+```
+
 Minimally:
 
 ```
diff --git a/charts/argo-cd/Chart.lock b/charts/argo-cd/Chart.lock
index 497aa297..52941728 100644
--- a/charts/argo-cd/Chart.lock
+++ b/charts/argo-cd/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: redis-ha
   repository: https://dandydeveloper.github.io/charts/
-  version: 4.10.4
-digest: sha256:e36321520ffd6f91962b0bcfeae947a86983d6b6d273eb616f08425e2b8ab9c2
-generated: "2021-04-14T13:41:16.151666-07:00"
+  version: 4.12.14
+digest: sha256:34275a4f4df92c570d07b0553da5d1fa200b6f057f7091746c853fd7399ee30a
+generated: "2021-05-03T16:02:41.4356045-04:00"
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 766578ef..e154e4b0 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 2.0.0
+appVersion: 2.0.1
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.2.2
+version: 3.2.5
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
@@ -16,6 +16,6 @@ maintainers:
   - name: seanson
 dependencies:
   - name: redis-ha
-    version: 4.10.4
+    version: 4.12.14
     repository: https://dandydeveloper.github.io/charts/
     condition: redis-ha.enabled
diff --git a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
index 3426c9c8..bd6ff8aa 100644
--- a/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/clusterrole.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
 rules:
+{{- if .Values.controller.clusterRoleRules.enabled }}
+{{- toYaml .Values.controller.clusterRoleRules.rules | nindent 2 }}
+{{ else }}
 - apiGroups:
   - '*'
   resources:
@@ -16,4 +19,5 @@ rules:
   - '*'
   verbs:
   - '*'
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index dc04e3eb..f5bff3b4 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -10,7 +10,7 @@ installCRDs: true
 global:
   image:
     repository: quay.io/argoproj/argocd
-    tag: v2.0.0
+    tag: v2.0.1
     imagePullPolicy: IfNotPresent
   securityContext: {}
   #  runAsUser: 999
@@ -183,6 +183,13 @@ controller:
   ## Enable if you would like to grant rights to ArgoCD to deploy to the local Kubernetes cluster.
   clusterAdminAccess:
     enabled: true
+  ## Enable Custom Rules for the Application Controller's Cluster Role resource
+  ## Enable this and set the rules: to whatever custom rules you want for the Cluster Role resource.
+  ## Defaults to off
+  clusterRoleRules:
+    enabled: false
+    rules: []
+
 
 ## Dex
 dex:
diff --git a/charts/argo-ci/.helmignore b/charts/argo-ci/.helmignore
deleted file mode 100644
index f0c13194..00000000
--- a/charts/argo-ci/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/charts/argo-ci/Chart.yaml b/charts/argo-ci/Chart.yaml
deleted file mode 100644
index c41334d9..00000000
--- a/charts/argo-ci/Chart.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v2
-description: A Helm chart for Argo-CI
-name: argo-ci
-version: 1.0.0
-icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
-appVersion: v1.0.0-alpha2
-home: https://github.com/argoproj/argo-helm
-deprecated: true
-dependencies:
-  - name: argo
-    version: "^0.16.0"
-    repository: https://argoproj.github.io/argo-helm
diff --git a/charts/argo-ci/README.md b/charts/argo-ci/README.md
deleted file mode 100644
index 7eaa9039..00000000
--- a/charts/argo-ci/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Argo CI Chart
-
-**Deprecated** - Use [Argo-Events](./argo-events) instead.
-
-This is a **community maintained** chart.
diff --git a/charts/argo-ci/templates/NOTES.txt b/charts/argo-ci/templates/NOTES.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/charts/argo-ci/templates/_helpers.tpl b/charts/argo-ci/templates/_helpers.tpl
deleted file mode 100644
index f0d83d2e..00000000
--- a/charts/argo-ci/templates/_helpers.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/charts/argo-ci/templates/ci-deployment.yaml b/charts/argo-ci/templates/ci-deployment.yaml
deleted file mode 100644
index bf2e4121..00000000
--- a/charts/argo-ci/templates/ci-deployment.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-ci
-  labels:
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}-ci
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}-ci
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-        - name: ci
-          image: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}"
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
-          env:
-          - name: IN_CLUSTER
-            value: "true"
-          - name: NAMESPACE
-            value: {{ .Values.workflowNamespace }}
-          - name: ARGO_CI_IMAGE
-            value: "{{ .Values.imageNamespace }}/{{ .Values.ciImage }}:{{ .Values.imageTag }}"
-          - name: CONTROLLER_INSTANCE_ID
-            value: {{ .Release.Name }}
-          ports:
-          - containerPort: 8001
-          - containerPort: 8002
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
diff --git a/charts/argo-ci/templates/ci-service.yaml b/charts/argo-ci/templates/ci-service.yaml
deleted file mode 100644
index 3c335c62..00000000
--- a/charts/argo-ci/templates/ci-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-ci
-  labels:
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  ports:
-  - port: 80
-    protocol: TCP
-    targetPort: 8001
-  selector:
-    app: {{ .Release.Name }}-ci
-  sessionAffinity: None
-  type: LoadBalancer
diff --git a/charts/argo-ci/values.yaml b/charts/argo-ci/values.yaml
deleted file mode 100644
index 86dadf98..00000000
--- a/charts/argo-ci/values.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-imageNamespace: argoproj
-ciImage: argoci
-imageTag: v1.0.0-alpha2
-imagePullPolicy: Always
-# Secrets with credentials to pull images from a private registry
-imagePullSecrets: []
-# - name: argo-pull-secret
-workflowNamespace: default
-
-argo:
-  imagesNamespace: argoproj
-  installMinio: true
-  minioBucketName: argo-artifacts
-  useReleaseAsInstanceID: true
diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index c9f2ae12..5def36c7 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 1.3.3
+version: 1.4.0
 keywords:
   - argo-events
   - sensor-controller
@@ -12,6 +12,6 @@ sources:
 maintainers:
   - name: VaibhavPage
   - name: whynowy
-appVersion: 1.2.3
+appVersion: 1.3.1
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index b786e260..a54ec010 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -45,7 +45,7 @@ singleNamespace: true
 sensorController:
   name: sensor-controller
   image: sensor-controller
-  tag: v1.2.3
+  tag: v1.3.1
   replicaCount: 1
   sensorImage: sensor
   podAnnotations: {}
@@ -58,7 +58,7 @@ sensorController:
 eventsourceController:
   name: eventsource-controller
   image: eventsource-controller
-  tag: v1.2.3
+  tag: v1.3.1
   replicaCount: 1
   eventsourceImage: eventsource
   podAnnotations: {}
@@ -71,7 +71,7 @@ eventsourceController:
 eventbusController:
   name: eventbus-controller
   image: eventbus-controller
-  tag: v1.2.3
+  tag: v1.3.1
   replicaCount: 1
   podAnnotations: {}
   nodeSelector: {}
diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
index 99269837..84752bf3 100644
--- a/charts/argo-rollouts/Chart.yaml
+++ b/charts/argo-rollouts/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "0.10.2"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 0.5.1
+version: 0.5.2
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml
index b9595710..c3fb9f0c 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-clusterrole.yaml
@@ -130,6 +130,7 @@ rules:
   - networking.istio.io
   resources:
   - virtualservices
+  - destinationrules
   verbs:
   - watch
   - get
diff --git a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
index dd04516a..1c4342bf 100644
--- a/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
+++ b/charts/argo-rollouts/templates/argo-rollouts-deployment.yaml
@@ -38,6 +38,10 @@ spec:
         imagePullPolicy: {{ .Values.controller.image.pullPolicy }}
         name: {{ .Values.controller.name }}
         resources:
+{{- toYaml .Values.controller.resources | nindent 10 }}
+        securityContext:
+          {{- toYaml .Values.securityContext | nindent 12 }}
+        resources:
           {{- toYaml .Values.controller.resources | nindent 10 }}
       {{- if .Values.controller.nodeSelector }}
       nodeSelector:
diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml
index 12c03d53..8a1e04d8 100644
--- a/charts/argocd-notifications/Chart.yaml
+++ b/charts/argocd-notifications/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
-version: 1.2.0
+version: 1.3.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argocd-notifications/templates/configmap.yaml b/charts/argocd-notifications/templates/configmap.yaml
index 442234bc..37f95b53 100644
--- a/charts/argocd-notifications/templates/configmap.yaml
+++ b/charts/argocd-notifications/templates/configmap.yaml
@@ -8,6 +8,9 @@ metadata:
 data:
   context: |
     argocdUrl: {{ .Values.argocdUrl | quote }}
+  {{- with .Values.context }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
   {{- with .Values.notifiers }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
@@ -21,4 +24,4 @@ data:
   {{- with .Values.triggers }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml
index ace4c84e..bfe746c3 100644
--- a/charts/argocd-notifications/values.yaml
+++ b/charts/argocd-notifications/values.yaml
@@ -19,6 +19,11 @@ nodeSelector: {}
 updateStrategy:
   type: Recreate
 
+context:
+  # Add custom values into context
+  #  region: east
+  #  environmentName: staging
+
 secret:
   # Whether helm chart creates controller secret
   create: true