diff --git a/charts/argo-events/templates/gateway-controller-configmap.yaml b/charts/argo-events/templates/gateway-controller-configmap.yaml
index 1f0a0fd7..5e01b9b8 100644
--- a/charts/argo-events/templates/gateway-controller-configmap.yaml
+++ b/charts/argo-events/templates/gateway-controller-configmap.yaml
@@ -9,4 +9,6 @@ metadata:
 data:
   config: |
     instanceID: {{ .Values.instanceID }}
+{{- if .Values.singleNamespace }}
     namespace: {{ .Values.namespace }}
+{{- end }}
diff --git a/charts/argo-events/templates/sensor-controller-configmap.yaml b/charts/argo-events/templates/sensor-controller-configmap.yaml
index abd1c8b9..17735823 100644
--- a/charts/argo-events/templates/sensor-controller-configmap.yaml
+++ b/charts/argo-events/templates/sensor-controller-configmap.yaml
@@ -9,4 +9,6 @@ metadata:
 data:
   config: |
     instanceID: {{ .Values.instanceID }}
-    namespace: {{ .Values.namespace }}
\ No newline at end of file
+{{- if .Values.singleNamespace }}
+    namespace: {{ .Values.namespace }}
+{{- end }}
diff --git a/charts/argo-events/values.yaml b/charts/argo-events/values.yaml
index 09579cb3..3a1cf0d8 100644
--- a/charts/argo-events/values.yaml
+++ b/charts/argo-events/values.yaml
@@ -9,7 +9,13 @@ serviceAccount: argo-events-sa
 
 instanceID: argo-events
 
+
+
+# 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
 
 # sensor controller
 sensorController: