diff --git a/devops/gcp/configmap/Chart.yaml b/devops/gcp/configmap/Chart.yaml
index d423a9dc2472d50f9ea9fa384f48e5b731773bb9..75d7fdd9463f1d1b460f5c8aa94aa9d701edd34c 100644
--- a/devops/gcp/configmap/Chart.yaml
+++ b/devops/gcp/configmap/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: partition-configmap
+name: gcp-partition-configmap
 description: A Helm chart for Kubernetes
 # A chart can be either an 'application' or a 'library' chart.
 #
diff --git a/devops/gcp/deploy/Chart.yaml b/devops/gcp/deploy/Chart.yaml
index 18597150be6fb9a46bd2e53c9d6f446af841f056..8db1c028981b97515fa192f90f0dcb87ea893e8b 100644
--- a/devops/gcp/deploy/Chart.yaml
+++ b/devops/gcp/deploy/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: partition-deploy
+name: gcp-partition-deploy
 description: A Helm chart for Kubernetes
 # A chart can be either an 'application' or a 'library' chart.
 #
diff --git a/devops/gcp/deploy/templates/partition-deploy.yml b/devops/gcp/deploy/templates/partition-deploy.yml
index 7640b812e8d18480038cb158962cc6d74beb457c..34791b8425c72ac6c9459d7a8e6dbaee5afbbc59 100644
--- a/devops/gcp/deploy/templates/partition-deploy.yml
+++ b/devops/gcp/deploy/templates/partition-deploy.yml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{ .Values.conf.app_name }}"
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
 spec:
   replicas: 1
   selector:
diff --git a/devops/gcp/deploy/templates/partition-service.yml b/devops/gcp/deploy/templates/partition-service.yml
index d507d68333728817447a99642023685b4e9e0a58..d03488ae7021338d1b4689eae7baa2472481d650 100644
--- a/devops/gcp/deploy/templates/partition-service.yml
+++ b/devops/gcp/deploy/templates/partition-service.yml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: "{{ .Values.conf.app_name }}"
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   annotations:
     cloud.google.com/neg: '{"ingress": true}'
 spec:
diff --git a/devops/gcp/deploy/templates/partition-virtual-service.yml b/devops/gcp/deploy/templates/partition-virtual-service.yml
index 4ac78d87c4834b425db9fd7dccb138599e93a7cd..13c21ddf1f4a77208f3b8850a9f540fc4ac35a36 100644
--- a/devops/gcp/deploy/templates/partition-virtual-service.yml
+++ b/devops/gcp/deploy/templates/partition-virtual-service.yml
@@ -2,7 +2,7 @@ apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: "{{ .Values.conf.app_name }}"
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
 spec:
   hosts:
     - "*"
@@ -11,9 +11,9 @@ spec:
   http:
     - match:
         - uri:
-            prefix: /api/partition
+            prefix: "/api/partition"
       route:
         - destination:
             port:
               number: 80
-            host: {{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local
+            host: "{{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local"