diff --git a/charts/argo/Chart.yaml b/charts/argo/Chart.yaml
index 3f10ee6f..3f34fc53 100644
--- a/charts/argo/Chart.yaml
+++ b/charts/argo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.12.5
 description: A Helm chart for Argo Workflows
 name: argo
-version: 0.16.10
+version: 0.16.11
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
diff --git a/charts/argo/templates/server-deployment.yaml b/charts/argo/templates/server-deployment.yaml
index 832fd37d..bfae431c 100644
--- a/charts/argo/templates/server-deployment.yaml
+++ b/charts/argo/templates/server-deployment.yaml
@@ -44,7 +44,7 @@ spec:
           {{- if .Values.singleNamespace }}
           - "--namespaced"
           {{- end }}
-          image: "{{ .Values.images.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}"
+          image: "{{ default .Values.images.namespace .Values.server.image.namespace }}/{{ .Values.images.server }}:{{ default .Values.images.tag .Values.server.image.tag }}"
           imagePullPolicy: {{ .Values.images.pullPolicy }}
           {{- if .Values.server.podPortName }}
           ports:
diff --git a/charts/argo/templates/workflow-controller-deployment.yaml b/charts/argo/templates/workflow-controller-deployment.yaml
index 9ad509d0..810b7f6b 100755
--- a/charts/argo/templates/workflow-controller-deployment.yaml
+++ b/charts/argo/templates/workflow-controller-deployment.yaml
@@ -32,14 +32,14 @@ spec:
       {{- end }}
       containers:
         - name: controller
-          image: "{{ .Values.images.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}"
+          image: "{{ default .Values.images.namespace .Values.controller.image.namespace }}/{{ .Values.images.controller }}:{{ default .Values.images.tag .Values.controller.image.tag }}"
           imagePullPolicy: {{ .Values.images.pullPolicy }}
           command: [ "workflow-controller" ]
           args:
           - "--configmap"
           - "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
           - "--executor-image"
-          - "{{ .Values.images.namespace }}/{{ .Values.images.executor }}:{{ default .Values.images.tag .Values.executor.image.tag }}"
+          - "{{default .Values.images.namespace .Values.executor.image.namespace }}/{{ .Values.images.executor }}:{{ default .Values.images.tag .Values.executor.image.tag }}"
           - "--loglevel"
           - "{{ .Values.controller.logging.level }}"
           - "--gloglevel"
diff --git a/charts/argo/values.yaml b/charts/argo/values.yaml
index 31a36041..712595fb 100644
--- a/charts/argo/values.yaml
+++ b/charts/argo/values.yaml
@@ -36,6 +36,8 @@ controller:
   image:
     # Overrides .images.tag if defined.
     tag: ""
+    # Overrides .images.namespace if defined.
+    namespace: ""
   # parallelism dictates how many workflows can be running at the same time
   parallelism:
   # podAnnotations is an optional map of annotations to be applied to the controller Pods
@@ -144,6 +146,8 @@ executor:
   image:
     # Overrides .images.tag if defined.
     tag: ""
+    # Overrides .images.namespace if defined.
+    namespace: ""    
   resources: {}
   # Adds environment variables for the executor.
   env: {}
@@ -159,6 +163,8 @@ server:
   image:
     # Overrides .images.tag if defined.
     tag: ""
+    # Overrides .images.namespace if defined.
+    namespace: ""    
   # optional map of annotations to be applied to the ui Pods
   podAnnotations: {}
   # Optional labels to add to the UI pods