diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index d3c33558..8019e90d 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.1.1
+version: 3.1.2
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/dex/serviceaccount.yaml b/charts/argo-cd/templates/dex/serviceaccount.yaml
index bb235eec..71707f09 100644
--- a/charts/argo-cd/templates/dex/serviceaccount.yaml
+++ b/charts/argo-cd/templates/dex/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.dex.serviceAccount.create }}
+{{- if and .Values.dex.enabled .Values.dex.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.dex.serviceAccount.automountServiceAccountToken }}
diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index fcea120d..a7a9854e 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.2.4
+version: 1.3.1
 keywords:
   - argo-events
   - sensor-controller
diff --git a/charts/argo-events/templates/argo-events-roles.yaml b/charts/argo-events/templates/argo-events-roles.yaml
index d6de39d2..56721159 100644
--- a/charts/argo-events/templates/argo-events-roles.yaml
+++ b/charts/argo-events/templates/argo-events-roles.yaml
@@ -49,10 +49,13 @@ rules:
       - workflowtemplates/finalizers
       - sensors
       - sensors/finalizers
+      - sensors/status
       - eventsources
       - eventsources/finalizers
+      - eventsources/status
       - eventbus
       - eventbus/finalizers
+      - eventbus/status
   - apiGroups:
       - ""
     resources:
diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml
index dd734a88..900daf41 100644
--- a/charts/argo-events/templates/eventbus-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.eventbusController.name }}
         release: {{ .Release.Name }}
+      {{- with .Values.eventbusController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml
index 95e7e83a..9fcd1eaf 100644
--- a/charts/argo-events/templates/eventsource-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.eventsourceController.name }}
         release: {{ .Release.Name }}
+      {{- with .Values.eventsourceController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 214ee2bb..371fe82f 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -18,6 +18,9 @@ spec:
       labels:
         app: {{ .Release.Name }}-{{ .Values.sensorController.name }}
         release: {{ .Release.Name }}
+      {{- with .Values.sensorController.podAnnotations }}
+      annotations: {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index 05a8d634..ec251fe6 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -48,6 +48,7 @@ sensorController:
   tag: v1.2.3
   replicaCount: 1
   sensorImage: sensor
+  podAnnotations: {}
   nodeSelector: {}
   tolerations: {}
   affinity: {}
@@ -58,6 +59,7 @@ eventsourceController:
   tag: v1.2.3
   replicaCount: 1
   eventsourceImage: eventsource
+  podAnnotations: {}
   nodeSelector: {}
   tolerations: {}
   affinity: {}
@@ -67,6 +69,7 @@ eventbusController:
   image: eventbus-controller
   tag: v1.2.3
   replicaCount: 1
+  podAnnotations: {}
   nodeSelector: {}
   tolerations: {}
   affinity: {}
diff --git a/charts/argo-applicationset/.helmignore b/charts/argocd-applicationset/.helmignore
similarity index 100%
rename from charts/argo-applicationset/.helmignore
rename to charts/argocd-applicationset/.helmignore
diff --git a/charts/argo-applicationset/Chart.yaml b/charts/argocd-applicationset/Chart.yaml
similarity index 95%
rename from charts/argo-applicationset/Chart.yaml
rename to charts/argocd-applicationset/Chart.yaml
index c467c3c6..ebb5ee1c 100644
--- a/charts/argo-applicationset/Chart.yaml
+++ b/charts/argocd-applicationset/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-applicationset
 description: A Helm chart for installing ArgoCD ApplicationSet
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: "v0.1.0"
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
diff --git a/charts/argo-applicationset/README.md b/charts/argocd-applicationset/README.md
similarity index 98%
rename from charts/argo-applicationset/README.md
rename to charts/argocd-applicationset/README.md
index 316bd8ce..b200d9cf 100644
--- a/charts/argo-applicationset/README.md
+++ b/charts/argocd-applicationset/README.md
@@ -18,7 +18,7 @@ To install the chart with the release name `my-release`:
 $ helm repo add argo https://argoproj.github.io/argo-helm
 "argo" has been added to your repositories
 
-$ helm install --name my-release argo/argo-applicationset
+$ helm install --name my-release argo/argocd-applicationset
 NAME: my-release
 ...
 ```
@@ -61,7 +61,7 @@ ct install --namespace argocd
 | mountTLSCertsVolume | bool | `true` | Mount the `argocd-tls-certs-cm` volume |
 | mountGPGKeysVolume | bool | `false` | Mount the `argocd-gpg-keys-cm` volume |
 | mountGPGKeyringVolume | bool | `true` | Mount an emptyDir volume for `gpg-keyring` |
-| nameOverride | string | `""` | Provide a name in place of `argo-applicationset` |
+| nameOverride | string | `""` | Provide a name in place of `argocd-applicationset` |
 | nodeSelector | object | `{}` | [Node selector](https://kubernetes.io/docs/user-guide/node-selection/) |
 | podAnnotations | object | `{}` | Annotations for the controller pods |
 | podSecurityContext | object | `{}` | Pod Security Context |
diff --git a/charts/argo-applicationset/ci/default-values.yaml b/charts/argocd-applicationset/ci/default-values.yaml
similarity index 100%
rename from charts/argo-applicationset/ci/default-values.yaml
rename to charts/argocd-applicationset/ci/default-values.yaml
diff --git a/charts/argo-applicationset/ci/leader-election-values.yaml b/charts/argocd-applicationset/ci/leader-election-values.yaml
similarity index 100%
rename from charts/argo-applicationset/ci/leader-election-values.yaml
rename to charts/argocd-applicationset/ci/leader-election-values.yaml
diff --git a/charts/argo-applicationset/crds/crd-applicationset.yaml b/charts/argocd-applicationset/crds/crd-applicationset.yaml
similarity index 100%
rename from charts/argo-applicationset/crds/crd-applicationset.yaml
rename to charts/argocd-applicationset/crds/crd-applicationset.yaml
diff --git a/charts/argo-applicationset/templates/_helpers.tpl b/charts/argocd-applicationset/templates/_helpers.tpl
similarity index 100%
rename from charts/argo-applicationset/templates/_helpers.tpl
rename to charts/argocd-applicationset/templates/_helpers.tpl
diff --git a/charts/argo-applicationset/templates/crds.yaml b/charts/argocd-applicationset/templates/crds.yaml
similarity index 100%
rename from charts/argo-applicationset/templates/crds.yaml
rename to charts/argocd-applicationset/templates/crds.yaml
diff --git a/charts/argo-applicationset/templates/deployment.yaml b/charts/argocd-applicationset/templates/deployment.yaml
similarity index 100%
rename from charts/argo-applicationset/templates/deployment.yaml
rename to charts/argocd-applicationset/templates/deployment.yaml
diff --git a/charts/argo-applicationset/templates/psp.yaml b/charts/argocd-applicationset/templates/psp.yaml
similarity index 100%
rename from charts/argo-applicationset/templates/psp.yaml
rename to charts/argocd-applicationset/templates/psp.yaml
diff --git a/charts/argo-applicationset/templates/rbac.yaml b/charts/argocd-applicationset/templates/rbac.yaml
similarity index 100%
rename from charts/argo-applicationset/templates/rbac.yaml
rename to charts/argocd-applicationset/templates/rbac.yaml
diff --git a/charts/argo-applicationset/templates/serviceaccount.yaml b/charts/argocd-applicationset/templates/serviceaccount.yaml
similarity index 100%
rename from charts/argo-applicationset/templates/serviceaccount.yaml
rename to charts/argocd-applicationset/templates/serviceaccount.yaml
diff --git a/charts/argo-applicationset/values.yaml b/charts/argocd-applicationset/values.yaml
similarity index 100%
rename from charts/argo-applicationset/values.yaml
rename to charts/argocd-applicationset/values.yaml
diff --git a/charts/argocd-notifications/Chart.yaml b/charts/argocd-notifications/Chart.yaml
index f0bcb4e6..2d1ada91 100644
--- a/charts/argocd-notifications/Chart.yaml
+++ b/charts/argocd-notifications/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.1.0
+appVersion: 1.1.1
 description: A Helm chart for ArgoCD notifications, an add-on to ArgoCD.
 name: argocd-notifications
 type: application
diff --git a/charts/argocd-notifications/values.yaml b/charts/argocd-notifications/values.yaml
index dab1f0cb..8f400c1f 100644
--- a/charts/argocd-notifications/values.yaml
+++ b/charts/argocd-notifications/values.yaml
@@ -7,7 +7,7 @@ fullnameOverride: ""
 
 image:
   repository: argoprojlabs/argocd-notifications
-  tag: v1.1.0
+  tag: v1.1.1
   pullPolicy: IfNotPresent
 
 imagePullSecrets: []
@@ -339,7 +339,7 @@ bots:
 
     image:
       repository: argoprojlabs/argocd-notifications
-      tag: v1.1.0
+      tag: v1.1.1
       pullPolicy: IfNotPresent
 
     imagePullSecrets: []