diff --git a/charts/argo-events/Chart.yaml b/charts/argo-events/Chart.yaml
index 4d953bcf..09eb2b46 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.14.0
+version: 0.15.0
 keywords:
   - argo-events
   - sensor-controller
@@ -10,6 +10,6 @@ sources:
   - https://github.com/argoproj/argo-events
 maintainers:
   - name: VaibhavPage
-appVersion: 0.14.0
+appVersion: 0.15.0
 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/templates/gateway-controller-configmap.yaml b/charts/argo-events/templates/gateway-controller-configmap.yaml
index 5e01b9b8..21ff76e3 100644
--- a/charts/argo-events/templates/gateway-controller-configmap.yaml
+++ b/charts/argo-events/templates/gateway-controller-configmap.yaml
@@ -8,7 +8,13 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   config: |
-    instanceID: {{ .Values.instanceID }}
+{{- if .Values.instanceID.enabled }}
+  {{- if .Values.instanceID.useReleaseName }}
+    instanceID: {{ .Release.Name }}
+  {{- else }}
+    instanceID: {{ .Values.instanceID.explicitID }}
+  {{- end }}
+{{- end }}
 {{- if .Values.singleNamespace }}
     namespace: {{ .Values.namespace }}
 {{- end }}
diff --git a/charts/argo-events/templates/gateway-controller-deployment.yaml b/charts/argo-events/templates/gateway-controller-deployment.yaml
index 63350fbf..300a8d90 100644
--- a/charts/argo-events/templates/gateway-controller-deployment.yaml
+++ b/charts/argo-events/templates/gateway-controller-deployment.yaml
@@ -31,3 +31,9 @@ spec:
                   fieldPath: metadata.namespace
             - name: CONTROLLER_CONFIG_MAP
               value: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap
+            - name: GATEWAY_CLIENT_IMAGE
+              value: {{ .Values.registry }}/{{ .Values.gatewayController.gatewayClientImage }}:{{ .Values.gatewayController.gatewayClientTag }}
+            - name: GATEWAY_IMAGE_REGISTRY
+              value: docker.io
+            - name: GATEWAY_IMAGE_VERSION
+              value: {{ .Values.gatewayController.gatewayServerTag }}
diff --git a/charts/argo-events/templates/sensor-controller-configmap.yaml b/charts/argo-events/templates/sensor-controller-configmap.yaml
index 17735823..a617e1f2 100644
--- a/charts/argo-events/templates/sensor-controller-configmap.yaml
+++ b/charts/argo-events/templates/sensor-controller-configmap.yaml
@@ -8,7 +8,13 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   config: |
-    instanceID: {{ .Values.instanceID }}
+{{- if .Values.instanceID.enabled }}
+  {{- if .Values.instanceID.useReleaseName }}
+    instanceID: {{ .Release.Name }}
+  {{- else }}
+    instanceID: {{ .Values.instanceID.explicitID }}
+  {{- end }}
+{{- end }}
 {{- if .Values.singleNamespace }}
     namespace: {{ .Values.namespace }}
 {{- end }}
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 2dd9602e..77555366 100644
--- a/charts/argo-events/templates/sensor-controller-deployment.yaml
+++ b/charts/argo-events/templates/sensor-controller-deployment.yaml
@@ -31,3 +31,5 @@ spec:
                   fieldPath: metadata.namespace
             - name: CONTROLLER_CONFIG_MAP
               value: {{ .Release.Name }}-{{ .Values.sensorController.name }}-configmap
+            - name: SENSOR_IMAGE
+              value: {{ .Values.registry }}/{{ .Values.sensorController.sensorImage }}:{{ .Values.sensorController.sensorTag }}
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index 4ac26da1..a7dc512f 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -30,23 +30,36 @@ additionalServiceAccountRules:
   resources:
     - customresourcedefinitions
 
-instanceID: argo-events
+instanceID:
+  # `instanceID.enabled` configures the controllers to filter the requests
+  # to only those which have a matching instanceID attribute.
+  enabled: false
+  # NOTE: If `instanceID.enabled` is set to `true` then either `instanceID.userReleaseName`
+  # or `instanceID.explicitID` must be defined.
+  # useReleaseName: true
+  # explicitID: unique-argo-events-controller-identifier
 
 # set `singleNamespace` to false to have the controllers
 # listen on all namespaces.  Otherwise the controllers will listen
 # on the namespace provided
 namespace: argo-events
-singleNamespace: true
+singleNamespace: false
 
 # sensor controller
 sensorController:
   name: sensor-controller
   image: sensor-controller
-  tag: v0.14.0
+  tag: v0.15.0
+  sensorImage: sensor
+  sensorTag: v0.15.0
   replicaCount: 1
 
 gatewayController:
   name: gateway-controller
   image: gateway-controller
-  tag: v0.14.0
+  tag: v0.15.0
+  gatewayServerImage: gateway-server
+  gatewayServerTag: v0.15.0
+  gatewayClientImage: gateway-client
+  gatewayClientTag: v0.15.0
   replicaCount: 1