diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 4f5960c4..cc676f23 100644
--- a/charts/argo-events/Chart.yaml
+++ b/charts/argo-events/Chart.yaml
@@ -1,7 +1,7 @@
-apiVersion: v1
+apiVersion: v2
 description: A Helm chart to install Argo-Events in k8s Cluster
 name: argo-events
-version: 1.0.0
+version: 1.2.3
 keywords:
   - argo-events
   - sensor-controller
@@ -12,6 +12,6 @@ sources:
 maintainers:
   - name: VaibhavPage
   - name: whynowy
-appVersion: 1.0.0
+appVersion: 1.2.3
 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/crds/eventbus-crd.yml b/charts/argo-events/crds/eventbus-crd.yml
index 340d4989..d7cf3a1c 100644
--- a/charts/argo-events/crds/eventbus-crd.yml
+++ b/charts/argo-events/crds/eventbus-crd.yml
@@ -1,4 +1,4 @@
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: eventbus.argoproj.io
@@ -12,4 +12,7 @@ spec:
       - eb
     singular: eventbus
   scope: Namespaced
-  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
diff --git a/charts/argo-events/crds/eventsource-crd.yml b/charts/argo-events/crds/eventsource-crd.yml
index 2ed64f2e..3bddfee5 100644
--- a/charts/argo-events/crds/eventsource-crd.yml
+++ b/charts/argo-events/crds/eventsource-crd.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: eventsources.argoproj.io
@@ -13,6 +13,9 @@ spec:
     listKind: EventSourceList
     shortNames:
       - es
-  version: "v1alpha1"
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
 
 
diff --git a/charts/argo-events/crds/sensor-crd.yml b/charts/argo-events/crds/sensor-crd.yml
index b38207f7..04b1d6b7 100644
--- a/charts/argo-events/crds/sensor-crd.yml
+++ b/charts/argo-events/crds/sensor-crd.yml
@@ -1,5 +1,5 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: sensors.argoproj.io
@@ -13,5 +13,8 @@ spec:
     shortNames:
       - sn
   scope: Namespaced
-  version: "v1alpha1"
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
 
diff --git a/charts/argo-events/templates/eventbus-controller-deployment.yaml b/charts/argo-events/templates/eventbus-controller-deployment.yaml
index dc698b1b..dd734a88 100644
--- a/charts/argo-events/templates/eventbus-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventbus-controller-deployment.yaml
@@ -37,7 +37,31 @@ spec:
               value: {{ .Values.eventbusController.natsStreamingImage }}
             - name: NATS_METRICS_EXPORTER_IMAGE
               value: {{ .Values.eventbusController.natsMetricsExporterImage }}
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8081
+            initialDelaySeconds: 3
+            periodSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: 8081
+            initialDelaySeconds: 3
+            periodSeconds: 3
+      {{- with .Values.securityContext }}
+      securityContext: {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.eventbusController.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.eventbusController.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventbusController.tolerations }}
+      tolerations: {{ toYaml .Values.eventbusController.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventbusController.affinity }}
+      affinity: {{ toYaml .Values.eventbusController.affinity | nindent 8 }}
+      {{- end }}
diff --git a/charts/argo-events/templates/eventbus-crd.yaml b/charts/argo-events/templates/eventbus-crd.yaml
index 175e2e60..673e796f 100644
--- a/charts/argo-events/templates/eventbus-crd.yaml
+++ b/charts/argo-events/templates/eventbus-crd.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.installCRD }}
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: eventbus.argoproj.io
@@ -16,7 +16,6 @@ spec:
       - eb
     singular: eventbus
   scope: Namespaced
-  version: v1alpha1
   versions:
     - name: v1alpha1
       served: true
diff --git a/charts/argo-events/templates/eventsource-controller-deployment.yaml b/charts/argo-events/templates/eventsource-controller-deployment.yaml
index 99947ade..95e7e83a 100644
--- a/charts/argo-events/templates/eventsource-controller-deployment.yaml
+++ b/charts/argo-events/templates/eventsource-controller-deployment.yaml
@@ -35,7 +35,31 @@ spec:
                   fieldPath: metadata.namespace
             - name: EVENTSOURCE_IMAGE
               value: "{{ .Values.registry }}/{{ .Values.eventsourceController.eventsourceImage }}:{{ .Values.eventsourceController.tag }}"
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8081
+            initialDelaySeconds: 3
+            periodSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: 8081
+            initialDelaySeconds: 3
+            periodSeconds: 3
+      {{- with .Values.securityContext }}
+      securityContext: {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.eventsourceController.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.eventsourceController.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventsourceController.tolerations }}
+      tolerations: {{ toYaml .Values.eventsourceController.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.eventsourceController.affinity }}
+      affinity: {{ toYaml .Values.eventsourceController.affinity | nindent 8 }}
+      {{- end }}
diff --git a/charts/argo-events/templates/eventsource-crd.yaml b/charts/argo-events/templates/eventsource-crd.yaml
index e791608b..920f2478 100644
--- a/charts/argo-events/templates/eventsource-crd.yaml
+++ b/charts/argo-events/templates/eventsource-crd.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.installCRD }}
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: eventsources.argoproj.io
@@ -16,5 +16,8 @@ spec:
     listKind: EventSourceList
     shortNames:
       - es
-  version: "v1alpha1"
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
 {{- end }}
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 425fd66b..214ee2bb 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -35,7 +35,31 @@ spec:
                   fieldPath: metadata.namespace
             - name: SENSOR_IMAGE
               value: "{{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.tag }}"
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 8081
+            initialDelaySeconds: 3
+            periodSeconds: 3
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: 8081
+            initialDelaySeconds: 3
+            periodSeconds: 3
+      {{- with .Values.securityContext }}
+      securityContext: {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.sensorController.nodeSelector }}
+      nodeSelector: {{ toYaml .Values.sensorController.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.sensorController.tolerations }}
+      tolerations: {{ toYaml .Values.sensorController.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.sensorController.affinity }}
+      affinity: {{ toYaml .Values.sensorController.affinity | nindent 8 }}
+      {{- end }}
diff --git a/charts/argo-events/templates/sensor-crd.yaml b/charts/argo-events/templates/sensor-crd.yaml
index cf3793c4..b9ccc1bd 100644
--- a/charts/argo-events/templates/sensor-crd.yaml
+++ b/charts/argo-events/templates/sensor-crd.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.installCRD }}
 # Define a "sensor" custom resource definition
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: sensors.argoproj.io
@@ -17,5 +17,8 @@ spec:
     shortNames:
       - sn
   scope: Namespaced
-  version: v1alpha1
+  versions:
+    - name: v1alpha1
+      served: true
+      storage: true
 {{- end }}
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index 1da1335f..05a8d634 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -21,7 +21,6 @@ additionalSaNamespaces: []
 additionalServiceAccountRules:
 - apiGroups:
     - apiextensions.k8s.io
-    - apiextensions.k8s.io/v1beta1
   verbs:
     - create
     - delete
@@ -46,21 +45,34 @@ singleNamespace: true
 sensorController:
   name: sensor-controller
   image: sensor-controller
-  tag: v1.0.0
+  tag: v1.2.3
   replicaCount: 1
   sensorImage: sensor
+  nodeSelector: {}
+  tolerations: {}
+  affinity: {}
 
 eventsourceController:
   name: eventsource-controller
   image: eventsource-controller
-  tag: v1.0.0
+  tag: v1.2.3
   replicaCount: 1
   eventsourceImage: eventsource
+  nodeSelector: {}
+  tolerations: {}
+  affinity: {}
 
 eventbusController:
   name: eventbus-controller
   image: eventbus-controller
-  tag: v1.0.0
+  tag: v1.2.3
   replicaCount: 1
+  nodeSelector: {}
+  tolerations: {}
+  affinity: {}
   natsStreamingImage: nats-streaming:0.17.0
   natsMetricsExporterImage: synadia/prometheus-nats-exporter:0.6.2
+
+securityContext:
+  runAsNonRoot: true
+  runAsUser: 9731