diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index c29777c7..2d6a7fae 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.7.0
+version: 1.8.0
 keywords:
   - argo-events
   - sensor-controller
@@ -12,10 +12,9 @@ sources:
 maintainers:
   - name: VaibhavPage
   - name: whynowy
-appVersion: 1.3.1
+appVersion: v1.5.0
 icon: https://argoproj.github.io/argo-events/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Ability to specify additional/custom environment variables"
-    - "[Fixed]: Charts icon url"
+    - "[Changed]: Update to Argo Events v1.5.0"
diff --git a/charts/argo-events/templates/argo-events-cluster-roles.yaml b/charts/argo-events/templates/argo-events-cluster-roles.yaml
index c3904980..cef1ad2e 100644
--- a/charts/argo-events/templates/argo-events-cluster-roles.yaml
+++ b/charts/argo-events/templates/argo-events-cluster-roles.yaml
@@ -40,10 +40,6 @@ rules:
       - update
       - watch
     resources:
-      - workflows
-      - workflows/finalizers
-      - workflowtemplates
-      - workflowtemplates/finalizers
       - sensors
       - sensors/finalizers
       - sensors/status
@@ -61,7 +57,6 @@ rules:
       - configmaps
       - secrets
       - services
-      - events
       - persistentvolumeclaims
     verbs:
       - create
@@ -71,18 +66,6 @@ rules:
       - update
       - patch
       - delete
-  - apiGroups:
-      - "batch"
-    resources:
-      - jobs
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - patch
-      - delete
   - apiGroups:
       - "apps"
     resources:
@@ -96,5 +79,4 @@ rules:
       - update
       - patch
       - delete
-
 {{- end }}
diff --git a/charts/argo-events/templates/argo-events-roles.yaml b/charts/argo-events/templates/argo-events-roles.yaml
index 1371f6a6..7406073c 100644
--- a/charts/argo-events/templates/argo-events-roles.yaml
+++ b/charts/argo-events/templates/argo-events-roles.yaml
@@ -42,10 +42,6 @@ rules:
       - update
       - watch
     resources:
-      - workflows
-      - workflows/finalizers
-      - workflowtemplates
-      - workflowtemplates/finalizers
       - sensors
       - sensors/finalizers
       - sensors/status
@@ -63,7 +59,6 @@ rules:
       - configmaps
       - secrets
       - services
-      - events
       - persistentvolumeclaims
     verbs:
       - create
@@ -73,18 +68,6 @@ rules:
       - update
       - patch
       - delete
-  - apiGroups:
-      - "batch"
-    resources:
-      - jobs
-    verbs:
-      - create
-      - get
-      - list
-      - watch
-      - update
-      - patch
-      - delete
   - apiGroups:
       - "apps"
     resources:
@@ -98,5 +81,4 @@ rules:
       - update
       - patch
       - delete
-
 {{- end }}
diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml
index 747bfc11..834425fe 100644
--- a/charts/argo-events/templates/eventbus-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml
@@ -29,10 +29,11 @@ spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
         - name: {{ .Values.eventbusController.name }}
-          image: "{{ .Values.registry }}/{{ .Values.eventbusController.image }}:{{ .Values.eventbusController.tag }}"
+          image: "{{ .Values.registry }}/{{ .Values.eventbusController.image }}:{{ .Values.eventbusController.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          {{- if .Values.singleNamespace }}
           args:
+            - eventbus-controller
+          {{- if .Values.singleNamespace }}
             - --namespaced
           {{- end }}
           env:
diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml
index 651ff39b..2d79a4ff 100644
--- a/charts/argo-events/templates/eventsource-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml
@@ -29,10 +29,11 @@ spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
         - name: {{ .Values.eventsourceController.name }}
-          image: "{{ .Values.registry }}/{{ .Values.eventsourceController.image }}:{{ .Values.eventsourceController.tag }}"
+          image: "{{ .Values.registry }}/{{ .Values.eventsourceController.image }}:{{ .Values.eventsourceController.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          {{- if .Values.singleNamespace }}
           args:
+            - eventsource-controller
+          {{- if .Values.singleNamespace }}
             - --namespaced
           {{- end }}
           env:
@@ -44,7 +45,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: EVENTSOURCE_IMAGE
-              value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}"
+              value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag | default .Chart.AppVersion }}"
           livenessProbe:
             httpGet:
               path: /healthz
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 6c2f6a04..e3590578 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -29,10 +29,11 @@ spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
         - name: {{ .Values.sensorController.name }}
-          image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag }}"
+          image: "{{ .Values.registry }}/{{ .Values.sensorController.image }}:{{ .Values.sensorController.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.imagePullPolicy }}
-          {{- if .Values.singleNamespace }}
           args:
+            - sensor-controller
+          {{- if .Values.singleNamespace }}
             - --namespaced
           {{- end }}
           env:
@@ -44,7 +45,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: SENSOR_IMAGE
-              value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}"
+              value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag | default .Chart.AppVersion }}"
           livenessProbe:
             httpGet:
               path: /healthz
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index db6f679d..8b75651b 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -44,13 +44,13 @@ singleNamespace: true
 # sensor controller
 sensorController:
   name: sensor-controller
-  image: argoproj/sensor-controller
-  tag: v1.3.1
+  image: argoproj/argo-events
+  tag: ""
   replicaCount: 1
   extraEnv: []
     # - name: DEBUG_LOG
     #   value: "true"
-  sensorImage: argoproj/sensor
+  sensorImage: argoproj/argo-events
   podAnnotations: {}
   nodeSelector: {}
   podLabels: {}
@@ -61,13 +61,13 @@ sensorController:
 
 eventsourceController:
   name: eventsource-controller
-  image: argoproj/eventsource-controller
-  tag: v1.3.1
+  image: argoproj/argo-events
+  tag: ""
   replicaCount: 1
   extraEnv: []
     # - name: DEBUG_LOG
     #   value: "true"
-  eventsourceImage: argoproj/eventsource
+  eventsourceImage: argoproj/argo-events
   podAnnotations: {}
   nodeSelector: {}
   podLabels: {}
@@ -78,8 +78,8 @@ eventsourceController:
 
 eventbusController:
   name: eventbus-controller
-  image: argoproj/eventbus-controller
-  tag: v1.3.1
+  image: argoproj/argo-events
+  tag: ""
   replicaCount: 1
   extraEnv: []
     # - name: DEBUG_LOG
@@ -91,8 +91,8 @@ eventbusController:
   tolerations: []
   affinity: {}
   resources: {}
-  natsStreamingImage: nats-streaming:0.17.0
-  natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2
+  natsStreamingImage: nats-streaming:0.22.1
+  natsMetricsExporterImage: natsio/prometheus-nats-exporter:0.8.0
 
 securityContext:
   runAsNonRoot: true