diff --git a/devops/gcp/configmap/Chart.yaml b/devops/gcp/configmap/Chart.yaml
deleted file mode 100644
index fa47c6d0c5a79c736a3a1e593c6b557818f44e4e..0000000000000000000000000000000000000000
--- a/devops/gcp/configmap/Chart.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: v2
-name: gcp-storage-configmap
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
-type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
diff --git a/devops/gcp/configmap/README.md b/devops/gcp/configmap/README.md
deleted file mode 100644
index f1b82f3c4f7c51259537b79fc687435ae91b6801..0000000000000000000000000000000000000000
--- a/devops/gcp/configmap/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--- Configmap -->
-
-# Configmap helm chart
-
-## Introduction
-
-This chart bootstraps a configmap deployment on a [Kubernetes](https://kubernetes.io) cluster using [Helm](https://helm.sh) package manager.
-
-## Prerequisites
-
-The code was tested on **Kubernetes cluster** (v1.21.11) with **Istio** (1.12.6)
-> It is possible to use other versions, but it hasn't been tested
-
-### Operation system
-
-The code works in Debian-based Linux (Debian 10 and Ubuntu 20.04) and Windows WSL 2. Also, it works but is not guaranteed in Google Cloud Shell. All other operating systems, including macOS, are not verified and supported.
-
-### Packages
-
-Packages are only needed for installation from a local computer.
-
-- **HELM** (version: v3.7.1 or higher) [helm](https://helm.sh/docs/intro/install/)
-- **Kubectl** (version: v1.21.0 or higher) [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl)
-## Installation
-First you need to set variables in **values.yaml** file using any code editor. Some of the values are prefilled, but you need to specify some values as well. You can find more information about them below.
-
-### Common variables
-
-| Name | Description | Type | Default |Required |
-|------|-------------|------|---------|---------|
-**logLevel** | logging level | string | INFO | yes
-**springProfilesActive** | active spring profile | string | gcp | yes
-**defaultDataCountry** | Data storage region | string | US | yes
-**storageServiceAccountEmail** | Storage service account email, used during OQM events processing | string | storage@service.local | yes
-
-### Google Cloud variables
-
-| Name | Description | Type | Default |Required |
-|------|-------------|------|---------|---------|
-**entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes
-**partitionHost** | partition service host address | string | `http://partition` | yes
-**crsConverterHost** | CRS Converter service host address | string | `http://crs-conversion` | yes
-**legalHost** | Legal service host address | string | `http://legal` | yes
-**redisGroupHost** | Redis host for groups | string | `redis-group-master` | yes
-**redisStorageHost** | Redis host for storage | string | `redis-storage-master` | yes
-**googleAudiences** | your Google Cloud client ID | string | - | yes
-
-> googleAudiences: If you are connected to Google Cloud console with `gcloud auth application-default login --no-browser` from your terminal, you can get your client_id using the command:
-
-```console
-cat ~/.config/gcloud/application_default_credentials.json | grep client_id
-```
-
-### Bootstrap variables
-
-This variables can be omitted in case **conf.bootstrapEnabled** is set to `false`.
-
-| Name | Description | Type | Default |Required |
-|------|-------------|------|---------|---------|
-**storageHost** | Storage service host address | string | `http://storage` | yes
-**defaultLegalTag** | Name of the previously created legal tag (without partition part) | string | `default-data-tag` | yes
-**dataPartitionId** | Data partition id | string | `redis-storage-master` | yes
-
-### Config variables
-
-| Name | Description | Type | Default |Required |
-|------|-------------|------|---------|---------|
-**appName** | name of the app | string | storage | yes
-**configmap** | configmap name | string | storage-config | yes
-**onPremEnabled** | whether on-prem is enabled | boolean | false | yes
-**bootstrapEnabled** | whether to enable storage bootstrap (requires previously created legal tag) | boolean | false | yes
-
-### Install the helm chart
-
-Run this command from within this directory:
-
-```bash
-helm install gcp-storage-configmap .
-```
-
-## Uninstalling the Chart
-
-To uninstall the helm deployment:
-
-```bash
-helm uninstall gcp-storage-configmap
-```
-
-[Move-to-Top](#configmap-helm-chart)
diff --git a/devops/gcp/configmap/templates/bootstrap-configmap.yaml b/devops/gcp/configmap/templates/bootstrap-configmap.yaml
deleted file mode 100644
index b58659ae622712c09f63b895f4f32ab0f5f7249d..0000000000000000000000000000000000000000
--- a/devops/gcp/configmap/templates/bootstrap-configmap.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- if .Values.conf.bootstrapEnabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "{{ .Values.conf.appName }}-bootstrap"
-  name: "{{ .Values.conf.configmap }}-bootstrap"
-  namespace: "{{ .Release.Namespace }}"
-data:
-  STORAGE_HOST: "{{ .Values.data.storageHost }}"
-  DEFAULT_LEGAL_TAG: "{{ .Values.data.defaultLegalTag }}"
-  DATA_PARTITION_ID: "{{ .Values.data.dataPartitionId }}"
-  ONPREM_ENABLED: "{{ .Values.conf.onPremEnabled }}"
-{{- end }}
diff --git a/devops/gcp/configmap/templates/configmap.yaml b/devops/gcp/configmap/templates/configmap.yaml
deleted file mode 100644
index 9984f8140cc2de8c3acbb39bb78c77f7dffabf2c..0000000000000000000000000000000000000000
--- a/devops/gcp/configmap/templates/configmap.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    app: "{{ .Values.conf.appName }}"
-  name: "{{ .Values.conf.configmap }}"
-  namespace: "{{ .Release.Namespace }}"
-data:
-  CRS_CONVERTER_HOST: "{{ .Values.data.crsConverterHost }}"
-  DEFAULT_DATA_COUNTRY: "{{ .Values.data.defaultDataCountry }}"
-  ENTITLEMENTS_HOST: "{{ .Values.data.entitlementsHost }}"  
-  LEGAL_HOST: "{{ .Values.data.legalHost }}"
-  LOG_LEVEL: "{{ .Values.data.logLevel }}"
-  PARTITION_HOST: "{{ .Values.data.partitionHost }}"
-  REDIS_GROUP_HOST: "{{ .Values.data.redisGroupHost }}"
-  REDIS_STORAGE_HOST: "{{ .Values.data.redisStorageHost }}"
-  STORAGE_SERVICE_ACCOUNT_EMAIL: "{{ .Values.data.storageServiceAccountEmail }}"
-  SPRING_PROFILES_ACTIVE: "{{ .Values.data.springProfilesActive }}"
-  OPA_ENABLED: "{{ .Values.data.opaEnabled }}"
-  OPA_ENDPOINT: "{{ .Values.data.opaEndpoint }}"
-  {{- if not .Values.conf.onPremEnabled }}
-  GOOGLE_AUDIENCES: "{{ .Values.data.googleAudiences }}"
-  {{- end }}
diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml
deleted file mode 100644
index ef9b5667955ce2014087910ce7ba1bdf6da86e3c..0000000000000000000000000000000000000000
--- a/devops/gcp/configmap/values.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# Default values for storage-configmap.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-data:
-  # common
-  logLevel: "ERROR"
-  springProfilesActive: "gcp"
-  defaultDataCountry: "US"
-  storageServiceAccountEmail: "storage@service.local"
-  entitlementsHost: "http://entitlements"
-  partitionHost: "http://partition"
-  crsConverterHost: "http://crs-conversion"
-  legalHost: "http://legal"
-  redisGroupHost: "redis-group-master"
-  redisStorageHost: "redis-storage-master"
-
-  # bootstrap
-  storageHost: "http://storage"
-  defaultLegalTag: "default-data-tag"
-  dataPartitionId: ""
-
-  # gcp
-  googleAudiences: ""
-
-  # opa
-  opaEnabled: true
-  opaEndpoint: "http://opa"
-conf:
-  appName: "storage"
-  configmap: "storage-config"
-  onPremEnabled: false
-  bootstrapEnabled: false
diff --git a/devops/gcp/deploy/README.md b/devops/gcp/deploy/README.md
index 763c5035c70623f5cd9a03f4c877837fe33689a2..25867b55f1a6cef87a646acb36c25e39abc324fa 100644
--- a/devops/gcp/deploy/README.md
+++ b/devops/gcp/deploy/README.md
@@ -24,41 +24,59 @@ Packages are only needed for installation from a local computer.
 
 ## Installation
 
-Before installing deploy Helm chart you need to install [configmap Helm chart](../configmap).
 First you need to set variables in **values.yaml** file using any code editor. Some of the values are prefilled, but you need to specify some values as well. You can find more information about them below.
 
-### Common variables
+### Configmap variables
 
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
-**requestsCpu** | amount of requested CPU | string | 0.25 | yes
-**requestsMemory** | amount of requested memory| string | 2048M | yes
-**limitsCpu** | CPU limit | string | 1 | yes
-**limitsMemory** | memory limit | string | 3G | yes
-**image** | service image | string | - | yes
-**imagePullPolicy** | when to pull image | string | IfNotPresent | yes
-**serviceAccountName** | name of your service account | string | storage | yes
-**bootstrapImage** | bootstrap image | string | - | yes
-**bootstrapServiceAccountName** | service account that will be used for bootstrap | string | - | yes
-
-### Config variables
+**logLevel** | logging level | string | `ERROR` | yes
+**springProfilesActive** | active spring profile | string | `gcp` | yes
+**defaultDataCountry** | Data storage region | string | `US` | yes
+**storageServiceAccountEmail** | Storage service account email, used during OQM events processing | string | `storage@service.local` | yes
+**entitlementsHost** | Entitlements service host address | string | `http://entitlements` | yes
+**partitionHost** | Partition service host address | string | `http://partition` | yes
+**crsConverterHost** | CRS Converter service host address | string | `http://crs-conversion` | yes
+**legalHost** | Legal service host address | string | `http://legal` | yes
+**redisGroupHost** | Redis host for groups | string | `redis-group-master` | yes
+**redisStorageHost** | Redis host for storage | string | `redis-storage-master` | yes
+**googleAudiences** | Client ID of Google Cloud Credentials, ex `123-abc123.apps.googleusercontent.com` | string | - | yes
+**opaEnabled** | whether OPA is enabled | boolean | true | yes
+**opaEndpoint** | OPA host address | string | `http://opa` | yes
+**storageHost** | Storage service host address | string | `http://storage` | only if `conf.bootstrapEnabled` is true
+**defaultLegalTag** | Name of the previously created legal tag (without partition part) | string | `default-data-tag` | only if `conf.bootstrapEnabled` is true
+**dataPartitionId** | Data partition id | string | - | only if `conf.bootstrapEnabled` is true
+
+### Deployment variables
 
 | Name | Description | Type | Default |Required |
 |------|-------------|------|---------|---------|
+**requestsCpu** | amount of requested CPU | string | `0.25` | yes
+**requestsMemory** | amount of requested memory| string | `1024M` | yes
+**limitsCpu** | CPU limit | string | `1` | yes
+**limitsMemory** | memory limit | string | `3G` | yes
+**image** | path to the image in a registry | string | - | yes
+**imagePullPolicy** | when to pull the image | string | `IfNotPresent` | yes
+**serviceAccountName** | name of kubernetes service account | string | `storage` | yes
+**bootstrapImage** | path to the bootstrap image in a registry | string | - | only if `conf.bootstrapEnabled` is true
+**bootstrapServiceAccountName** | name of kubernetes service account that will be used for bootstrap | string | - | only if `conf.bootstrapEnabled` is true
+
+### Configuration variables
 
-**appName** | name of the app | string | `storage` | yes
-**configmap** | configmap to be used | string | `storage-config` | yes
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**appName** | Service name | string | `storage` | yes
 **keycloakSecretName** | secret for keycloak | string | `storage-keycloak-secret` | yes
 **minioSecretName** | secret for minio | string | `storage-minio-secret` | yes
 **postgresSecretName** | secret for postgres | string | `storage-postgres-secret` | yes
 **rabbitmqSecretName** | secret for rabbitmq | string | `rabbitmq-secret` | yes
-**bootstrapSecretName** | secret for bootstrap to access opendi provider | string | `datafier-secret` | yes
+**bootstrapSecretName** | secret for bootstrap to access openid provider | string | `datafier-secret` | only if `conf.bootstrapEnabled` is true
 **replicas** | Number of replicas | integer | 3 | yes
 **onPremEnabled** | whether on-prem is enabled | boolean | false | yes
-**bootstrapEnabled** | whether to enable storage bootstrap (should be enabled also for config chart) | boolean | false | yes
-**domain** | your domain | string | - | yes
+**bootstrapEnabled** | whether storage bootstrap is enabled | boolean | false | yes
+**domain** | your domain, ex `example.com` | string | - | yes
 
-### Install the helm chart
+## Install the Helm chart
 
 Run this command from within this directory:
 
@@ -66,7 +84,7 @@ Run this command from within this directory:
 helm install gcp-storage-deploy .
 ```
 
-## Uninstalling the Chart
+## Uninstall the Helm chart
 
 To uninstall the helm deployment:
 
@@ -74,4 +92,6 @@ To uninstall the helm deployment:
 helm uninstall gcp-storage-deploy
 ```
 
+> Do not forget to delete all k8s secrets and PVCs accociated with the Service.
+
 [Move-to-Top](#deploy-helm-chart)
diff --git a/devops/gcp/deploy/templates/bootstrap-configmap.yaml b/devops/gcp/deploy/templates/bootstrap-configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f4cf7f0a305c0634ec02e0b3ca7bcedf9c949933
--- /dev/null
+++ b/devops/gcp/deploy/templates/bootstrap-configmap.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.conf.bootstrapEnabled }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: {{ printf "%s-bootstrap" .Values.conf.appName | quote }}
+  name: {{ printf "%s-config-bootstrap" .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
+data:
+  STORAGE_HOST: {{ .Values.data.storageHost | quote }}
+  DEFAULT_LEGAL_TAG: {{ .Values.data.defaultLegalTag | quote }}
+  DATA_PARTITION_ID: {{ .Values.data.dataPartitionId | quote }}
+  ONPREM_ENABLED: {{ .Values.conf.onPremEnabled | quote }}
+{{- end }}
diff --git a/devops/gcp/deploy/templates/bootstrap-deployment.yaml b/devops/gcp/deploy/templates/bootstrap-deployment.yaml
index c4ecb6ed37d0f1912655965749a64e3ddd2b2e9c..c8a6db26d122fb128a7ac25fc63fa12a09cd33f1 100644
--- a/devops/gcp/deploy/templates/bootstrap-deployment.yaml
+++ b/devops/gcp/deploy/templates/bootstrap-deployment.yaml
@@ -3,36 +3,36 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: "{{ .Values.conf.appName }}-bootstrap"
-  name: "{{ .Values.conf.appName }}-bootstrap"
-  namespace: "{{ .Release.Namespace }}"
+    app: {{ printf "%s-bootstrap" .Values.conf.appName | quote }}
+  name: {{ printf "%s-bootstrap" .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: "{{ .Values.conf.appName }}-bootstrap"
+      app: {{ printf "%s-bootstrap" .Values.conf.appName | quote }}
   template:
     metadata:
       labels:
-        app: "{{ .Values.conf.appName }}-bootstrap"
+        app: {{ printf "%s-bootstrap" .Values.conf.appName | quote }}
       annotations:
         rollme: {{ randAlphaNum 5 | quote }}
     spec:
       containers:
-        - name: "{{ .Values.conf.appName }}-bootstrap"
-          image: "{{ .Values.data.bootstrapImage }}"
+        - name: {{ printf "%s-bootstrap" .Values.conf.appName | quote }}
+          image: {{ .Values.data.bootstrapImage | quote }}
           readinessProbe:
             exec:
               command:
               - cat
               - /tmp/bootstrap_ready
-          imagePullPolicy: "{{ .Values.data.imagePullPolicy }}"
+          imagePullPolicy: {{ .Values.data.imagePullPolicy | quote }}
           envFrom:
           - configMapRef:
-              name: "{{ .Values.conf.configmap }}-bootstrap"
+              name: {{ printf "%s-config-bootstrap" .Values.conf.appName | quote }}
           {{- if .Values.conf.onPremEnabled }}
           - secretRef:
-              name: "{{ .Values.conf.bootstrapSecretName }}"
+              name: {{ .Values.conf.bootstrapSecretName | quote }}
           {{- end }}
-      serviceAccountName: "{{ .Values.data.bootstrapServiceAccountName }}"
+      serviceAccountName: {{ .Values.data.bootstrapServiceAccountName | quote }}
 {{- end }}
diff --git a/devops/gcp/deploy/templates/configmap.yaml b/devops/gcp/deploy/templates/configmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a317d9ccfa578aad9d76425a250019cd49115d21
--- /dev/null
+++ b/devops/gcp/deploy/templates/configmap.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  labels:
+    app: {{ .Values.conf.appName | quote }}
+  name: {{ printf "%s-config" .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
+data:
+  CRS_CONVERTER_HOST: {{ .Values.data.crsConverterHost | quote }}
+  DEFAULT_DATA_COUNTRY: {{ .Values.data.defaultDataCountry | quote }}
+  ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote }}
+  LEGAL_HOST: {{ .Values.data.legalHost | quote }}
+  LOG_LEVEL: {{ .Values.data.logLevel | quote }}
+  PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
+  REDIS_GROUP_HOST: {{ .Values.data.redisGroupHost | quote }}
+  REDIS_STORAGE_HOST: {{ .Values.data.redisStorageHost | quote }}
+  STORAGE_SERVICE_ACCOUNT_EMAIL: {{ .Values.data.storageServiceAccountEmail | quote }}
+  SPRING_PROFILES_ACTIVE: {{ .Values.data.springProfilesActive | quote }}
+  OPA_ENABLED: {{ .Values.data.opaEnabled | quote }}
+  OPA_ENDPOINT: {{ .Values.data.opaEndpoint | quote }}
+  {{- if not .Values.conf.onPremEnabled }}
+  GOOGLE_AUDIENCES: {{ .Values.data.googleAudiences | quote }}
+  {{- end }}
diff --git a/devops/gcp/deploy/templates/deployment.yaml b/devops/gcp/deploy/templates/deployment.yaml
index c54713f1919fba115b7400ecf00f7057d7051ba9..8fd16a58b3023a9032699da406ab880c3417eecc 100644
--- a/devops/gcp/deploy/templates/deployment.yaml
+++ b/devops/gcp/deploy/templates/deployment.yaml
@@ -2,37 +2,37 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: "{{ .Values.conf.appName }}"
-  name: "{{ .Values.conf.appName }}"
-  namespace: "{{ .Release.Namespace }}"
+    app: {{ .Values.conf.appName | quote }}
+  name: {{ .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
 spec:
   selector:
     matchLabels:
-      app: "{{ .Values.conf.appName }}"
+      app: {{ .Values.conf.appName | quote }}
   replicas: {{ .Values.conf.replicas }}
   template:
     metadata:
       labels:
-        app: "{{ .Values.conf.appName }}"
+        app: {{ .Values.conf.appName | quote }}
       annotations:
         rollme: {{ randAlphaNum 5 | quote }}
     spec:
       containers:
-      - name: "{{ .Values.conf.appName }}"
-        image: "{{ .Values.data.image }}"
-        imagePullPolicy: "{{ .Values.data.imagePullPolicy }}"
+      - name: {{ .Values.conf.appName | quote }}
+        image: {{ .Values.data.image | quote }}
+        imagePullPolicy: {{ .Values.data.imagePullPolicy | quote }}
         envFrom:
         - configMapRef:
-            name: "{{ .Values.conf.configmap }}"
+            name: {{ printf "%s-config" .Values.conf.appName | quote }}
         {{- if .Values.conf.onPremEnabled }}
         - secretRef:
-            name: "{{ .Values.conf.keycloakSecretName }}"
+            name: {{ .Values.conf.keycloakSecretName | quote }}
         - secretRef:
-            name: "{{ .Values.conf.minioSecretName }}"
+            name: {{ .Values.conf.minioSecretName | quote }}
         - secretRef:
-            name: "{{ .Values.conf.postgresSecretName }}"
+            name: {{ .Values.conf.postgresSecretName | quote }}
         - secretRef:
-            name: "{{ .Values.conf.rabbitmqSecretName }}"
+            name: {{ .Values.conf.rabbitmqSecretName | quote }}
         {{- end }}
         securityContext:
           allowPrivilegeEscalation: false
@@ -41,9 +41,9 @@ spec:
         - containerPort: 8080
         resources:
           requests:
-            cpu: "{{ .Values.data.requestsCpu }}"
-            memory: "{{ .Values.data.requestsMemory }}"
+            cpu: {{ .Values.data.requestsCpu | quote }}
+            memory: {{ .Values.data.requestsMemory | quote }}
           limits:
-            cpu: "{{ .Values.data.limitsCpu }}"
-            memory: "{{ .Values.data.limitsMemory }}"
-      serviceAccountName: "{{ .Values.data.serviceAccountName }}"
+            cpu: {{ .Values.data.limitsCpu | quote }}
+            memory: {{ .Values.data.limitsMemory | quote }}
+      serviceAccountName: {{ .Values.data.serviceAccountName | quote }}
diff --git a/devops/gcp/deploy/templates/service-account.yaml b/devops/gcp/deploy/templates/service-account.yaml
index 25fd74efbfca059f541af82d98b676cfcb930d64..f0771985cd5da9db77781dc3ab635e52378b3fb6 100644
--- a/devops/gcp/deploy/templates/service-account.yaml
+++ b/devops/gcp/deploy/templates/service-account.yaml
@@ -2,6 +2,6 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: "{{ .Values.data.serviceAccountName }}"
-  namespace: "{{ .Release.Namespace }}"
+  name: {{ .Values.data.serviceAccountName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
 {{- end }}
diff --git a/devops/gcp/deploy/templates/service.yaml b/devops/gcp/deploy/templates/service.yaml
index b7e02b2ed551ad16a96b9894dad08399ddc4d02e..45bd505383e8204e40ebf5188814bc4a707b6c34 100644
--- a/devops/gcp/deploy/templates/service.yaml
+++ b/devops/gcp/deploy/templates/service.yaml
@@ -5,8 +5,8 @@ metadata:
   annotations:
     cloud.google.com/neg: '{"ingress": true}'
   {{- end }}
-  name: "{{ .Values.conf.appName }}"
-  namespace: "{{ .Release.Namespace }}"
+  name: {{ .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
 spec:
   ports:
     - protocol: TCP
@@ -14,4 +14,4 @@ spec:
       targetPort: 8080
       name: http
   selector:
-    app: "{{ .Values.conf.appName }}"
+    app: {{ .Values.conf.appName | quote }}
diff --git a/devops/gcp/deploy/templates/virtual-service.yaml b/devops/gcp/deploy/templates/virtual-service.yaml
index 50c783ac81efe547862e62968b8eb47b1101056a..4bf9d0e65def75bd50ce0285bfeb35621363f06b 100644
--- a/devops/gcp/deploy/templates/virtual-service.yaml
+++ b/devops/gcp/deploy/templates/virtual-service.yaml
@@ -1,8 +1,8 @@
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
-  name: "{{ .Values.conf.appName }}"
-  namespace: "{{ .Release.Namespace }}"
+  name: {{ .Values.conf.appName | quote }}
+  namespace: {{ .Release.Namespace | quote }}
 spec:
   hosts:
     {{- if and .Values.conf.domain .Values.conf.onPremEnabled }}
@@ -22,4 +22,4 @@ spec:
         - destination:
             port:
               number: 80
-            host: "{{ .Values.conf.appName }}.{{ .Release.Namespace }}.svc.cluster.local"
+            host: {{ printf "%s.%s.svc.cluster.local" .Values.conf.appName .Release.Namespace | quote }}
diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml
index 052e5431cd4883bbe0981e19e619a9bbab9853f8..cc0c4e6cf5fd431f0e9b02d1daf88f12959263fa 100644
--- a/devops/gcp/deploy/values.yaml
+++ b/devops/gcp/deploy/values.yaml
@@ -2,8 +2,25 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-# common
 data:
+  # configmaps
+  logLevel: "ERROR"
+  springProfilesActive: "gcp"
+  defaultDataCountry: "US"
+  storageServiceAccountEmail: "storage@service.local"
+  entitlementsHost: "http://entitlements"
+  partitionHost: "http://partition"
+  crsConverterHost: "http://crs-conversion"
+  legalHost: "http://legal"
+  redisGroupHost: "redis-group-master"
+  redisStorageHost: "redis-storage-master"
+  googleAudiences: ""
+  opaEnabled: true
+  opaEndpoint: "http://opa"
+  storageHost: "http://storage"
+  defaultLegalTag: "default-data-tag"
+  dataPartitionId: ""
+  # deployments
   requestsCpu: "0.25"
   requestsMemory: "1024M"
   limitsCpu: "1"
@@ -15,7 +32,6 @@ data:
   serviceAccountName: "storage"
 conf:
   appName: "storage"
-  configmap: "storage-config"
   keycloakSecretName: "storage-keycloak-secret"
   minioSecretName: "storage-minio-secret"
   postgresSecretName: "storage-postgres-secret"
diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml
index cda242a0a013aba8d1eae4a8fd968a8d8a3637d4..b50520a82ffec5f6773476b02ca08057924138cf 100644
--- a/devops/gcp/pipeline/override-stages.yml
+++ b/devops/gcp/pipeline/override-stages.yml
@@ -2,6 +2,8 @@ variables:
   OSDU_GCP_SERVICE: storage
   OSDU_GCP_VENDOR: gcp
   NO_DATA_ACCESS_TESTER: $OSDU_GCP_NO_DATA_ACCESS_TESTER
+  # FIXME remove when all services are migrated to a single helm
+  OSDU_GCP_ENABLE_HELM_CONFIG: "false"
 
 .define_DATA_BRANCH:
   script: