diff --git a/devops/gcp/deploy/templates/virtual-service.yaml b/devops/gcp/deploy/templates/virtual-service.yaml
index 4286f63f2313ada28a1a39e2c6573c0ccd7b05b7..87dc2a3bd19c717958453eb00429aa1ec6733519 100644
--- a/devops/gcp/deploy/templates/virtual-service.yaml
+++ b/devops/gcp/deploy/templates/virtual-service.yaml
@@ -5,7 +5,11 @@ metadata:
   namespace: "{{ .Release.Namespace }}"
 spec:
   hosts:
+    {{- if .Values.conf.domain }}
+    - {{ printf "osdu.%s" .Values.conf.domain | quote }}
+    {{- else }}
     - "*"
+    {{- end }}
   gateways:
     - service-gateway
   http:
diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml
index 9a1c7ee9dff5296156218ea17d8aa45065650e18..3b582d020437f9aa7892dfc09c4a0ae35c50a808 100644
--- a/devops/gcp/deploy/values.yaml
+++ b/devops/gcp/deploy/values.yaml
@@ -8,7 +8,7 @@ data:
   requests_memory: "2048M"
   limits_cpu: "1"
   limits_memory: "3G"
-  image: "" 
+  image: ""
   imagePullPolicy: "IfNotPresent"
   serviceAccountName: "storage"
 conf:
@@ -20,3 +20,4 @@ conf:
   postgres_secret_name: "storage-postgres-secret"
   rabbitmq_secret_name: "rabbitmq-secret"
   replicas: 3
+  domain: ""