diff --git a/k8s/helm/basket-api/templates/_names.tpl b/k8s/helm/basket-api/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/basket-api/templates/_names.tpl
+++ b/k8s/helm/basket-api/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/k8s/helm/catalog-api/templates/_names.tpl b/k8s/helm/catalog-api/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/catalog-api/templates/_names.tpl
+++ b/k8s/helm/catalog-api/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/k8s/helm/catalog-api/templates/configmap.yaml b/k8s/helm/catalog-api/templates/configmap.yaml
index 75cf686f9..4e67abf8f 100644
--- a/k8s/helm/catalog-api/templates/configmap.yaml
+++ b/k8s/helm/catalog-api/templates/configmap.yaml
@@ -1,5 +1,6 @@
 {{- $name := include "catalog-api.fullname" . -}}
 {{- $sqlsrv := include "sql-name" . -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -12,7 +13,7 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   catalog__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.catalog.db }};User Id={{ .Values.inf.sql.catalog.user }};Password={{ .Values.inf.sql.catalog.pwd }};
-  catalog__PicBaseUrl: http://{{ .Values.inf.k8s.dns }}/webshoppingapigw/api/v1/c/catalog/items/[0]/pic/
+  catalog__PicBaseUrl: http://{{ $webshoppingapigw }}/api/v1/c/catalog/items/[0]/pic/
   catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}"
   all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
   all__InstrumentationKey: {{ .Values.inf.appinsights.key }}
diff --git a/k8s/helm/identity-api/templates/_names.tpl b/k8s/helm/identity-api/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/identity-api/templates/_names.tpl
+++ b/k8s/helm/identity-api/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/k8s/helm/locations-api/templates/_names.tpl b/k8s/helm/locations-api/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/locations-api/templates/_names.tpl
+++ b/k8s/helm/locations-api/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/k8s/helm/marketing-api/templates/_names.tpl b/k8s/helm/marketing-api/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/marketing-api/templates/_names.tpl
+++ b/k8s/helm/marketing-api/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/k8s/helm/marketing-api/templates/configmap.yaml b/k8s/helm/marketing-api/templates/configmap.yaml
index 89cbfeb51..ea99a1b5a 100644
--- a/k8s/helm/marketing-api/templates/configmap.yaml
+++ b/k8s/helm/marketing-api/templates/configmap.yaml
@@ -1,5 +1,6 @@
 {{- $name := include "marketing-api.fullname" . -}}
 {{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
 {{- $mongo := include "mongo-name" . -}}
 
 apiVersion: v1
@@ -19,4 +20,5 @@ data:
   internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }}
   urls__IdentityUrl: {{ $identity }}
   marketing__ConnectionString: mongodb://{{ $mongo }}
-  marketing__Database: {{ .Values.inf.mongo.marketing.database }}
\ No newline at end of file
+  marketing__Database: {{ .Values.inf.mongo.marketing.database }} 
+  marketing__PicBaseUrl: http://{{ $webshoppingapigw }}/api/v1/c/catalog/items/[0]/pic/
\ No newline at end of file
diff --git a/k8s/helm/marketing-api/values.yaml b/k8s/helm/marketing-api/values.yaml
index 0258eed8d..8779685d6 100644
--- a/k8s/helm/marketing-api/values.yaml
+++ b/k8s/helm/marketing-api/values.yaml
@@ -46,6 +46,8 @@ env:
       key: marketing__ConnectionString
     - name: Database
       key: marketing__Database
+    - name: PicBaseUrl
+      key: marketing__PicBaseUrl
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
diff --git a/k8s/helm/ordering-api/templates/_names.tpl b/k8s/helm/ordering-api/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/ordering-api/templates/_names.tpl
+++ b/k8s/helm/ordering-api/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/k8s/helm/ordering-backgroundtasks/templates/_names.tpl b/k8s/helm/ordering-backgroundtasks/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/ordering-backgroundtasks/templates/_names.tpl
+++ b/k8s/helm/ordering-backgroundtasks/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}
diff --git a/k8s/helm/ordering-signalrhub/templates/_names.tpl b/k8s/helm/ordering-signalrhub/templates/_names.tpl
index 0f42702d4..7e817f9b7 100644
--- a/k8s/helm/ordering-signalrhub/templates/_names.tpl
+++ b/k8s/helm/ordering-signalrhub/templates/_names.tpl
@@ -27,12 +27,12 @@
 {{- $ctx := last .}}
 {{- $suffix := include "suffix-name" $ctx -}}
 {{- if $ctx.Values.inf.k8s.dnsprefix -}}
-{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     # Value is <prefix>.<dns>/<name>
+{{- printf "%s.%s/%s" $suffix $ctx.Values.inf.k8s.dns $name -}}     {{/* Value is <prefix>.<dns>/<name> */}}
 {{- else -}}
 {{- if $ctx.Values.inf.k8s.suffix -}}
-{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     # Value is <dns>/<name>-<sufix>
+{{- printf "%s/%s-%s" $ctx.Values.inf.k8s.dns $name $suffix -}}     {{/*Value is <dns>/<name>-<sufix> */}}
 {{- else -}}
-{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                # Value is just <dns>/<name>
+{{- printf "%s/%s" $ctx.Values.inf.k8s.dns $name -}}                {{/*Value is just <dns>/<name> */}}
 {{- end -}}
 {{- end -}}
 {{- end -}}