diff --git a/charts/argo-events/templates/gateway-controller-deployment.yaml b/charts/argo-events/templates/gateway-controller-deployment.yaml
index 63350fbf..5505b394 100644
--- a/charts/argo-events/templates/gateway-controller-deployment.yaml
+++ b/charts/argo-events/templates/gateway-controller-deployment.yaml
@@ -31,3 +31,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: CONTROLLER_CONFIG_MAP
               value: {{ .Release.Name }}-{{ .Values.gatewayController.name }}-configmap
+            - name: GATEWAY_CLIENT_IMAGE
+              value: {{ .Values.registry }}/{{ .Values.gatewayController.clientImage }}:{{ .Values.gatewayController.tag }}
+            - name: GATEWAY_SERVER_IMAGE
+              value: {{ .Values.registry }}/{{ .Values.gatewayController.serverImage }}:{{ .Values.gatewayController.tag }}
diff --git a/charts/argo-events/templates/sensor-controller-deployment.yaml b/charts/argo-events/templates/sensor-controller-deployment.yaml
index 2dd9602e..b8e9c321 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.tag }}
\ No newline at end of file
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index cada3253..b7e74494 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -44,9 +44,12 @@ sensorController:
   image: sensor-controller
   tag: v0.16.0
   replicaCount: 1
+  sensorImage: sensor
 
 gatewayController:
   name: gateway-controller
   image: gateway-controller
   tag: v0.16.0
   replicaCount: 1
+  clientImage: gateway-client
+  serverImage: gateway-server