diff --git a/charts/appmesh-gateway/Chart.yaml b/charts/appmesh-gateway/Chart.yaml
index 746297e..1054243 100644
--- a/charts/appmesh-gateway/Chart.yaml
+++ b/charts/appmesh-gateway/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/appmesh-gateway/templates/virtual-gateway.yaml b/charts/appmesh-gateway/templates/virtual-gateway.yaml
index 9e50818..65f8cb2 100644
--- a/charts/appmesh-gateway/templates/virtual-gateway.yaml
+++ b/charts/appmesh-gateway/templates/virtual-gateway.yaml
@@ -5,9 +5,13 @@ metadata:
   name: {{ .Values.appMesh.gateway.name }}
 spec:
   awsName: {{ .Values.appMesh.gateway.name }}
+  {{- if .Values.appMesh.gateway.matchAllNamespaces }}
+  namespaceSelector: {}
+  {{- else }}
   namespaceSelector:
     matchLabels:
       gateway: {{ .Values.appMesh.gateway.name }}
+  {{- end }}
   podSelector:
     matchLabels:
       app: {{ .Values.appMesh.gateway.name }}
diff --git a/charts/appmesh-gateway/values.yaml b/charts/appmesh-gateway/values.yaml
index 4d15bf2..5ccfd6a 100644
--- a/charts/appmesh-gateway/values.yaml
+++ b/charts/appmesh-gateway/values.yaml
@@ -26,6 +26,9 @@ backend:
 
 appMesh:
   gateway:
+    # To have the VirtualGateway match VirtualRoutes in all namespaces set matchAllNamespaces: true
+    # https://aws.github.io/aws-app-mesh-controller-for-k8s/reference/vgw/#namespaceselector
+    matchAllNamespaces: false
     create: true
     name: # The name of the appmesh gateway
     port: 8088 # The port of the appmesh gateway