diff --git a/k8s/helm/app.yaml b/k8s/helm/app.yaml
index 0cc140b0d..b92f73ac8 100644
--- a/k8s/helm/app.yaml
+++ b/k8s/helm/app.yaml
@@ -23,19 +23,21 @@ app:                                                  # app global settings
       locations: locations-api                        # ingress entry for locations api
       marketing: marketing-api                        # ingress entry for marketing api
   svc:
-      basket: basket                                  # service name for basket api
-      catalog: catalog                                # service name for catalog api
-      ordering: ordering                              # service name for ordering api
-      identity: identity                              # service name for identity api
-      mvc: webmvc                                     # service name for web mvc
-      spa: webspa                                     # service name for web spa
-      status: webstatus                               # service name for web status
-      webshoppingapigw: webshoppingapigw              # service name for web shopping Agw
-      webmarketingapigw: webmarketingapigw            # service name for web mkg Agw
-      mobilemarketingapigw: mobilemarketingapigw      # service name for mobile mkg Agw
-      mobileshoppingapigw: mobileshoppingapigw        # service name for mobile shopping Agw
-      webshoppingagg: webshoppingagg                  # service name for web shopping aggregator
-      mobileshoppingagg: mobileshoppingagg            # service name for mobile shopping aggregator
-      payment: payment                                # service name for payment api
-      locations: locations                            # service name for locations api
-      marketing: marketing                            # service name for marketing api
+      basket: basket                                    # service name for basket api
+      catalog: catalog                                  # service name for catalog api
+      ordering: ordering                                # service name for ordering api
+      orderingbackgroundtasks: orderingbackgroundtasks  # service name for orderingbackgroundtasks
+      orderingsignalrhub: orderingsignalrhub            # service name for orderingsignalrhub
+      identity: identity                                # service name for identity api
+      mvc: webmvc                                       # service name for web mvc
+      spa: webspa                                       # service name for web spa
+      status: webstatus                                 # service name for web status
+      webshoppingapigw: webshoppingapigw                # service name for web shopping Agw
+      webmarketingapigw: webmarketingapigw              # service name for web mkg Agw
+      mobilemarketingapigw: mobilemarketingapigw        # service name for mobile mkg Agw
+      mobileshoppingapigw: mobileshoppingapigw          # service name for mobile shopping Agw
+      webshoppingagg: webshoppingagg                    # service name for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg              # service name for mobile shopping aggregator
+      payment: payment                                  # service name for payment api
+      locations: locations                              # service name for locations api
+      marketing: marketing                              # service name for marketing api
diff --git a/k8s/helm/basket-api/templates/_names.tpl b/k8s/helm/basket-api/templates/_names.tpl
index 0611ab704..0f42702d4 100644
--- a/k8s/helm/basket-api/templates/_names.tpl
+++ b/k8s/helm/basket-api/templates/_names.tpl
@@ -14,6 +14,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "url-of" -}}
 {{- $name := first .}}
 {{- $ctx := last .}}
diff --git a/k8s/helm/basket-api/templates/service.yaml b/k8s/helm/basket-api/templates/service.yaml
index c3b4be3e3..20224c3b5 100644
--- a/k8s/helm/basket-api/templates/service.yaml
+++ b/k8s/helm/basket-api/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "basket-api.fullname" . }}
+  name: {{ .Values.app.svc.basket }}
   labels:
     app: {{ template "basket-api.name" . }}
     chart: {{ template "basket-api.chart" . }}
diff --git a/k8s/helm/catalog-api/templates/_names.tpl b/k8s/helm/catalog-api/templates/_names.tpl
index 0611ab704..0f42702d4 100644
--- a/k8s/helm/catalog-api/templates/_names.tpl
+++ b/k8s/helm/catalog-api/templates/_names.tpl
@@ -14,6 +14,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "url-of" -}}
 {{- $name := first .}}
 {{- $ctx := last .}}
diff --git a/k8s/helm/catalog-api/templates/service.yaml b/k8s/helm/catalog-api/templates/service.yaml
index 0291e6fac..e63d4a4fc 100644
--- a/k8s/helm/catalog-api/templates/service.yaml
+++ b/k8s/helm/catalog-api/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "catalog-api.fullname" . }}
+  name: {{ .Values.app.svc.catalog }}
   labels:
     app: {{ template "catalog-api.name" . }}
     chart: {{ template "catalog-api.chart" . }}
diff --git a/k8s/helm/identity-api/templates/_names.tpl b/k8s/helm/identity-api/templates/_names.tpl
index 0611ab704..0f42702d4 100644
--- a/k8s/helm/identity-api/templates/_names.tpl
+++ b/k8s/helm/identity-api/templates/_names.tpl
@@ -14,6 +14,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "url-of" -}}
 {{- $name := first .}}
 {{- $ctx := last .}}
diff --git a/k8s/helm/ordering-api/templates/_names.tpl b/k8s/helm/ordering-api/templates/_names.tpl
index 0611ab704..0f42702d4 100644
--- a/k8s/helm/ordering-api/templates/_names.tpl
+++ b/k8s/helm/ordering-api/templates/_names.tpl
@@ -14,6 +14,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "url-of" -}}
 {{- $name := first .}}
 {{- $ctx := last .}}
diff --git a/k8s/helm/ordering-api/templates/service.yaml b/k8s/helm/ordering-api/templates/service.yaml
index 83545e5f8..bedfd6f01 100644
--- a/k8s/helm/ordering-api/templates/service.yaml
+++ b/k8s/helm/ordering-api/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "ordering-api.fullname" . }}
+  name: {{ .Values.app.svc.ordering }}
   labels:
     app: {{ template "ordering-api.name" . }}
     chart: {{ template "ordering-api.chart" . }}
diff --git a/k8s/helm/ordering-backgroundtasks/templates/_names.tpl b/k8s/helm/ordering-backgroundtasks/templates/_names.tpl
index 0611ab704..0f42702d4 100644
--- a/k8s/helm/ordering-backgroundtasks/templates/_names.tpl
+++ b/k8s/helm/ordering-backgroundtasks/templates/_names.tpl
@@ -14,6 +14,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "url-of" -}}
 {{- $name := first .}}
 {{- $ctx := last .}}
diff --git a/k8s/helm/ordering-backgroundtasks/templates/service.yaml b/k8s/helm/ordering-backgroundtasks/templates/service.yaml
index c1738bd51..d8fcba036 100644
--- a/k8s/helm/ordering-backgroundtasks/templates/service.yaml
+++ b/k8s/helm/ordering-backgroundtasks/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "ordering-backgroundtasks.fullname" . }}
+  name: {{ .Values.app.svc.orderingbackgroundtasks }}
   labels:
     app: {{ template "ordering-backgroundtasks.name" . }}
     chart: {{ template "ordering-backgroundtasks.chart" . }}
diff --git a/k8s/helm/ordering-signalrhub/templates/_names.tpl b/k8s/helm/ordering-signalrhub/templates/_names.tpl
index 0611ab704..0f42702d4 100644
--- a/k8s/helm/ordering-signalrhub/templates/_names.tpl
+++ b/k8s/helm/ordering-signalrhub/templates/_names.tpl
@@ -14,6 +14,14 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "mongo-name" -}}
+{{- if .Values.inf.mongo.host -}}
+{{- .Values.inf.mongo.host -}}
+{{- else -}}
+{{- printf "%s" "nosql-data" -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "url-of" -}}
 {{- $name := first .}}
 {{- $ctx := last .}}
diff --git a/k8s/helm/ordering-signalrhub/templates/service.yaml b/k8s/helm/ordering-signalrhub/templates/service.yaml
index b76486d8f..501539923 100644
--- a/k8s/helm/ordering-signalrhub/templates/service.yaml
+++ b/k8s/helm/ordering-signalrhub/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "ordering-signalrhub.fullname" . }}
+  name: {{ .Values.app.svc.orderingsignalrhub }}
   labels:
     app: {{ template "ordering-signalrhub.name" . }}
     chart: {{ template "ordering-signalrhub.chart" . }}