From ada1540f27a05462b29f0825537827e40d7201ba Mon Sep 17 00:00:00 2001
From: Alvaro Gonzalez <33456307+alvarorm22@users.noreply.github.com>
Date: Wed, 16 Mar 2022 13:03:21 +0100
Subject: [PATCH] Refactor carto values and secrets (#49)

* Refactor carto values and custom client values

* rename some secrets params

* remane the google serviceaccount secret ref
---
 chart/templates/_helpers.tpl                  |  4 +--
 chart/templates/accounts-www/configmap.yaml   | 12 ++++-----
 chart/templates/accounts-www/secret.yaml      |  4 +--
 .../cdn-invalidator-sub/configmap.yaml        |  2 +-
 .../cdn-invalidator-sub/deployment.yaml       |  2 +-
 .../templates/cdn-invalidator-sub/secret.yaml |  4 +--
 ...yaml => google-serviceaccount-secret.yaml} |  8 +++---
 chart/templates/http-cache/deployment.yaml    |  2 +-
 chart/templates/http-cache/secret.yaml        |  4 +--
 chart/templates/import-api/configmap.yaml     | 14 +++++-----
 chart/templates/import-api/secret.yaml        | 10 +++----
 chart/templates/import-worker/configmap.yaml  | 12 ++++-----
 chart/templates/import-worker/secret.yaml     | 10 +++----
 chart/templates/lds-api/configmap.yaml        |  8 +++---
 chart/templates/lds-api/secret.yaml           |  4 +--
 chart/templates/maps-api/configmap.yaml       | 12 ++++-----
 chart/templates/maps-api/secret.yaml          |  4 +--
 chart/templates/router/configmap.yaml         |  6 ++---
 chart/templates/router/secret.yaml            |  4 +--
 chart/templates/workspace-api/configmap.yaml  | 26 +++++++++----------
 chart/templates/workspace-api/secret.yaml     | 14 +++++-----
 .../workspace-subscriber/configmap.yaml       |  2 +-
 .../workspace-subscriber/secret.yaml          |  4 +--
 chart/templates/workspace-www/configmap.yaml  | 12 ++++-----
 chart/templates/workspace-www/secret.yaml     |  4 +--
 chart/values.yaml                             | 25 +++++++++++-------
 26 files changed, 109 insertions(+), 104 deletions(-)
 rename chart/templates/{google-credential-secret.yaml => google-serviceaccount-secret.yaml} (71%)

diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
index e1789538..79e2d931 100644
--- a/chart/templates/_helpers.tpl
+++ b/chart/templates/_helpers.tpl
@@ -30,14 +30,14 @@ If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value
   {{- $defaultUrl = printf "%s%s" $host $port -}}
 {{- end -}}
 
-{{- default $defaultUrl (printf "%s" .Values.cartoConfigValues.selfHostedDomain) -}}
+{{- default $defaultUrl (printf "%s" .Values.customConfigValues.selfHostedDomain) -}}
 {{- end -}}
 
 {{/*
 Create gcsBucketsProjectId using the gcsBucketsProjectId config or, if not defined, selfHostedGcpProjectId
 */}}
 {{- define "carto.gcsBucketsProjectId" -}}
-{{ default .Values.cartoConfigValues.selfHostedGcpProjectId .Values.cartoConfigValues.gcsBucketsProjectId }}
+{{ default .Values.cartoConfigValues.selfHostedGcpProjectId .Values.customConfigValues.gcsBucketsProjectId }}
 {{- end -}}
 
 {{/*
diff --git a/chart/templates/accounts-www/configmap.yaml b/chart/templates/accounts-www/configmap.yaml
index 0cf17026..ba7e6267 100644
--- a/chart/templates/accounts-www/configmap.yaml
+++ b/chart/templates/accounts-www/configmap.yaml
@@ -19,14 +19,14 @@ data:
   CARTO_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
   CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   LOG_LEVEL: "debug"
   PORT: {{ .Values.accountsWww.containerPorts.http | quote }}
   REACT_APP_ACCOUNTS_API_URL: "https://{{ .Values.cartoConfigValues.cartoAccDomain }}"
-  REACT_APP_ACCOUNTS_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/acc/"
-  REACT_APP_API_BASE_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/api"
+  REACT_APP_ACCOUNTS_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/acc/"
+  REACT_APP_API_BASE_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/api"
   REACT_APP_AUTH0_AUDIENCE: "carto-cloud-native-api"
   REACT_APP_AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   REACT_APP_BIGQUERY_OAUTH: "false"
@@ -35,8 +35,8 @@ data:
   REACT_APP_HUBSPOT_ID: "474999"
   REACT_APP_HUBSPOT_LIMIT_FORM_ID: "cd9486fa-5766-4bac-81b9-d8c6cd029b3b"
   REACT_APP_LAUNCH_DARKLY_CLIENT_SIDE_ID: {{ .Values.cartoConfigValues.reactAppLaunchDarklyClientSideId | quote }}
-  REACT_APP_PUBLIC_MAP_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/api/v3/maps/public"
-  REACT_APP_WORKSPACE_API_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/workspace-api"
+  REACT_APP_PUBLIC_MAP_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/api/v3/maps/public"
+  REACT_APP_WORKSPACE_API_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/workspace-api"
   REACT_APP_WORKSPACE_URL_TEMPLATE: "https://{tenantDomain}"
-  SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/accounts-www/secret.yaml b/chart/templates/accounts-www/secret.yaml
index 37c13ac1..1eea38a1 100644
--- a/chart/templates/accounts-www/secret.yaml
+++ b/chart/templates/accounts-www/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
 {{- end }}
diff --git a/chart/templates/cdn-invalidator-sub/configmap.yaml b/chart/templates/cdn-invalidator-sub/configmap.yaml
index 31ee1a48..c3fafb60 100644
--- a/chart/templates/cdn-invalidator-sub/configmap.yaml
+++ b/chart/templates/cdn-invalidator-sub/configmap.yaml
@@ -15,7 +15,7 @@ data:
   ACC_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
   ACC_GCP_PROJECT_REGION: {{ .Values.cartoConfigValues.cartoAccGcpProjectRegion | quote }}  
   CARTO3_SELFHOSTED_VOLUMES_BASE_PATH: "./"
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
diff --git a/chart/templates/cdn-invalidator-sub/deployment.yaml b/chart/templates/cdn-invalidator-sub/deployment.yaml
index bd8d9658..bbbf87f0 100644
--- a/chart/templates/cdn-invalidator-sub/deployment.yaml
+++ b/chart/templates/cdn-invalidator-sub/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (include "carto.baseUrl" .) (eq .Values.cartoConfigValues.httpCacheEnabled "true") }}
+{{- if and (include "carto.baseUrl" .) (eq .Values.customConfigValues.httpCacheEnabled "true") }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
diff --git a/chart/templates/cdn-invalidator-sub/secret.yaml b/chart/templates/cdn-invalidator-sub/secret.yaml
index 1ddbb4cb..5230da9e 100644
--- a/chart/templates/cdn-invalidator-sub/secret.yaml
+++ b/chart/templates/cdn-invalidator-sub/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  VARNISH_DEBUG_SECRET: {{ .Values.cartoSecrets.varnishDebugSecret | b64enc | quote }}
-  VARNISH_PURGE_SECRET: {{ .Values.cartoSecrets.varnishPurgeSecret | b64enc | quote }}
+  VARNISH_DEBUG_SECRET: {{ .Values.cartoSecretsValues.varnishDebugSecret | b64enc | quote }}
+  VARNISH_PURGE_SECRET: {{ .Values.cartoSecretsValues.varnishPurgeSecret | b64enc | quote }}
 {{- end }}
diff --git a/chart/templates/google-credential-secret.yaml b/chart/templates/google-serviceaccount-secret.yaml
similarity index 71%
rename from chart/templates/google-credential-secret.yaml
rename to chart/templates/google-serviceaccount-secret.yaml
index e28aa06f..d669b265 100644
--- a/chart/templates/google-credential-secret.yaml
+++ b/chart/templates/google-serviceaccount-secret.yaml
@@ -7,11 +7,11 @@ metadata:
     {{- if .Values.commonLabels }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
     {{- end }}
-    app.kubernetes.io/component: workspace-www
+  namespace: {{ .Release.Namespace | quote }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
-stringData:
-  {{ template "carto.google.secretKey" . }}: |
-    {{- include "common.tplvalues.render" ( dict "value" .Values.google.credentialFile "context" $ ) | nindent 4 }}
+type: Opaque
+data:
+  key.json: {{ .Values.cartoSecretsValues.googleServiceAccount }}
 {{- end }}
diff --git a/chart/templates/http-cache/deployment.yaml b/chart/templates/http-cache/deployment.yaml
index e1920037..90f78eea 100644
--- a/chart/templates/http-cache/deployment.yaml
+++ b/chart/templates/http-cache/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if and (include "carto.baseUrl" .) (eq .Values.cartoConfigValues.httpCacheEnabled "true") }}
+{{- if and (include "carto.baseUrl" .) (eq .Values.customConfigValues.httpCacheEnabled "true") }}
 apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
diff --git a/chart/templates/http-cache/secret.yaml b/chart/templates/http-cache/secret.yaml
index bea2b73a..5541feaf 100644
--- a/chart/templates/http-cache/secret.yaml
+++ b/chart/templates/http-cache/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  VARNISH_DEBUG_SECRET: {{ .Values.cartoSecrets.varnishDebugSecret | b64enc | quote }}
-  VARNISH_PURGE_SECRET: {{ .Values.cartoSecrets.varnishPurgeSecret | b64enc | quote }}
+  VARNISH_DEBUG_SECRET: {{ .Values.cartoSecretsValues.varnishDebugSecret | b64enc | quote }}
+  VARNISH_PURGE_SECRET: {{ .Values.cartoSecretsValues.varnishPurgeSecret | b64enc | quote }}
 {{- end }}
diff --git a/chart/templates/import-api/configmap.yaml b/chart/templates/import-api/configmap.yaml
index 3fdc416a..b96900c5 100644
--- a/chart/templates/import-api/configmap.yaml
+++ b/chart/templates/import-api/configmap.yaml
@@ -23,10 +23,10 @@ data:
   CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
   CARTO_SELFHOSTED_CARTO_DW_LOCATION: {{ .Values.cartoConfigValues.cartoSelfhostedDwLocation | quote }}
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
-  IMPORT_BUCKET: {{ .Values.cartoConfigValues.importBucket | quote }}
+  IMPORT_BUCKET: {{ .Values.customConfigValues.importBucket | quote }}
   IMPORT_PORT: {{ .Values.importApi.containerPorts.http | quote }}
   IMPORT_PUBSUB_TENANT_BUS_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/tenant-bus-import-sub"
   IMPORT_PUBSUB_TENANT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/tenant-bus"
@@ -37,18 +37,18 @@ data:
   REDIS_CACHE_PREFIX: "onprem"
   REDIS_HOST: {{ include "carto.redis.host" . }}
   REDIS_PORT: {{ include "carto.redis.port" . }}
-  SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   SELFHOSTED_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   WORKSPACE_POSTGRES_DB: {{ include "carto.postgresql.databaseName" . }}
   WORKSPACE_POSTGRES_HOST: {{ include "carto.postgresql.host" . }}
   WORKSPACE_POSTGRES_PORT: {{ include "carto.postgresql.port" . }}
   WORKSPACE_POSTGRES_USER: {{ include "carto.postgresql.user" . }}
-  IMPORT_PROVIDER: {{ .Values.cartoConfigValues.storageProvider | quote }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "gcp" }}
+  IMPORT_PROVIDER: {{ .Values.customConfigValues.storageProvider | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "gcp" }}
   IMPORT_PROJECTID: {{ include "carto.gcsBucketsProjectId" . | quote }}
   {{- end }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
-  IMPORT_REGION: {{ .Values.cartoConfigValues.awsS3Region | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "s3" }}
+  IMPORT_REGION: {{ .Values.customConfigValues.awsS3Region | quote }}
   {{- end }}
 {{- end }}
diff --git a/chart/templates/import-api/secret.yaml b/chart/templates/import-api/secret.yaml
index 4cadf8ab..3260a439 100644
--- a/chart/templates/import-api/secret.yaml
+++ b/chart/templates/import-api/secret.yaml
@@ -12,10 +12,10 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
-  IMPORT_ACCESSKEYID: {{ .Values.cartoSecrets.awsAccessKeyId | b64enc | quote }}
-  IMPORT_SECRETACCESSKEY: {{ .Values.cartoSecrets.awsAccessKeySecret | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "s3" }}
+  IMPORT_ACCESSKEYID: {{ .Values.clientSecrets.awsAccessKeyId | b64enc | quote }}
+  IMPORT_SECRETACCESSKEY: {{ .Values.clientSecrets.awsAccessKeySecret | b64enc | quote }}
   {{- end }}
 {{- end }}
diff --git a/chart/templates/import-worker/configmap.yaml b/chart/templates/import-worker/configmap.yaml
index 15fb461f..93452e60 100644
--- a/chart/templates/import-worker/configmap.yaml
+++ b/chart/templates/import-worker/configmap.yaml
@@ -16,12 +16,12 @@ data:
   ACC_GCP_PROJECT_REGION: {{ .Values.cartoConfigValues.cartoAccGcpProjectRegion | quote }}
   CARTO3_SELFHOSTED_VOLUMES_BASE_PATH: "./"
   CARTO_SELFHOSTED_CARTO_DW_LOCATION: {{ .Values.cartoConfigValues.cartoSelfhostedDwLocation | quote }}
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   DO_ENABLED: "false"
   GOOGLE_APPLICATION_CREDENTIALS: "../certs/key.json"
-  IMPORT_BUCKET: {{ .Values.cartoConfigValues.importBucket | quote }}
+  IMPORT_BUCKET: {{ .Values.customConfigValues.importBucket | quote }}
   IMPORT_PUBSUB_TENANT_BUS_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/tenant-bus-import-sub"
   IMPORT_PUBSUB_TENANT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/tenant-bus"
   IMPORT_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
@@ -33,11 +33,11 @@ data:
   WORKSPACE_POSTGRES_HOST: {{ include "carto.postgresql.host" . }}
   WORKSPACE_POSTGRES_PORT: {{ include "carto.postgresql.port" . }}
   WORKSPACE_POSTGRES_USER: {{ include "carto.postgresql.user" . }}
-  IMPORT_PROVIDER: {{ .Values.cartoConfigValues.storageProvider | quote }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "gcp" }}
+  IMPORT_PROVIDER: {{ .Values.customConfigValues.storageProvider | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "gcp" }}
   IMPORT_PROJECTID: {{ include "carto.gcsBucketsProjectId" . | quote }}
   {{- end }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
-  IMPORT_REGION: {{ .Values.cartoConfigValues.awsS3Region | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "s3" }}
+  IMPORT_REGION: {{ .Values.customConfigValues.awsS3Region | quote }}
   {{- end }}
 {{- end }}
diff --git a/chart/templates/import-worker/secret.yaml b/chart/templates/import-worker/secret.yaml
index 61380801..b65d4b0e 100644
--- a/chart/templates/import-worker/secret.yaml
+++ b/chart/templates/import-worker/secret.yaml
@@ -12,10 +12,10 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
-  IMPORT_ACCESSKEYID: {{ .Values.cartoSecrets.awsAccessKeyId | b64enc | quote }}
-  IMPORT_SECRETACCESSKEY: {{ .Values.cartoSecrets.awsAccessKeySecret | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "s3" }}
+  IMPORT_ACCESSKEYID: {{ .Values.clientSecrets.awsAccessKeyId | b64enc | quote }}
+  IMPORT_SECRETACCESSKEY: {{ .Values.clientSecrets.awsAccessKeySecret | b64enc | quote }}
   {{- end }}
 {{- end }}
diff --git a/chart/templates/lds-api/configmap.yaml b/chart/templates/lds-api/configmap.yaml
index f21fe0a1..4a4ab7cc 100644
--- a/chart/templates/lds-api/configmap.yaml
+++ b/chart/templates/lds-api/configmap.yaml
@@ -12,7 +12,7 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   DO_ENABLED: "false"
@@ -21,15 +21,15 @@ data:
   REDIS_CACHE_PREFIX: "onprem"
   REDIS_HOST: {{ include "carto.redis.host" . }}
   REDIS_PORT: {{ include "carto.redis.port" . }}
-  SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   SELFHOSTED_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
-  WORKSPACE_IMPORTS_BUCKET: {{ .Values.cartoConfigValues.workspaceImportsBucket | quote }}
+  WORKSPACE_IMPORTS_BUCKET: {{ .Values.customConfigValues.workspaceImportsBucket | quote }}
   WORKSPACE_POSTGRES_DB: {{ include "carto.postgresql.databaseName" . }}
   WORKSPACE_POSTGRES_HOST: {{ include "carto.postgresql.host" . }}
   WORKSPACE_POSTGRES_PORT: {{ include "carto.postgresql.port" . }}
   WORKSPACE_POSTGRES_USER: {{ include "carto.postgresql.user" . }}
   WORKSPACE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-workspace-sub"
   WORKSPACE_PUBSUB_DATA_UPDATES_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/data-updates"
-  WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.cartoConfigValues.workspaceThumbnailsBucket | quote }}
+  WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.customConfigValues.workspaceThumbnailsBucket | quote }}
 {{- end }}
diff --git a/chart/templates/lds-api/secret.yaml b/chart/templates/lds-api/secret.yaml
index 38bf4f20..45fbf2a0 100644
--- a/chart/templates/lds-api/secret.yaml
+++ b/chart/templates/lds-api/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
 {{- end }}
diff --git a/chart/templates/maps-api/configmap.yaml b/chart/templates/maps-api/configmap.yaml
index 2db0d240..6c225339 100644
--- a/chart/templates/maps-api/configmap.yaml
+++ b/chart/templates/maps-api/configmap.yaml
@@ -23,7 +23,7 @@ data:
   CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
   CARTO_SELFHOSTED_CARTO_DW_LOCATION: {{ .Values.cartoConfigValues.cartoSelfhostedDwLocation | quote }}
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   DO_ENABLED: "false"
@@ -32,8 +32,8 @@ data:
   GOOGLE_APPLICATION_CREDENTIALS: "../certs/key.json"
   LOG_LEVEL: "debug"
   MAPS_API_V3_PORT: "{{ .Values.mapsApi.containerPorts.http }}"
-  MAPS_API_V3_RESOURCE_URL_ALLOWED_HOSTS: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
-  MAPS_API_V3_RESOURCE_URL_HOST: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  MAPS_API_V3_RESOURCE_URL_ALLOWED_HOSTS: {{ .Values.customConfigValues.selfHostedDomain | quote }}
+  MAPS_API_V3_RESOURCE_URL_HOST: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   MAPS_API_V3_RESOURCE_URL_TEMPLATE_NEW: 'https://${host}/api/${path}'
   MAPS_API_V3_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   PUBSUB_DATA_UPDATES_TOPICS_TEMPLATE: "projects/{project_id}/topics/data-updates"
@@ -42,10 +42,10 @@ data:
   REDIS_CACHE_PREFIX: "onprem"
   REDIS_HOST: {{ include "carto.redis.host" . }}
   REDIS_PORT: {{ include "carto.redis.port" . }}
-  SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   SELFHOSTED_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
-  WORKSPACE_IMPORTS_BUCKET: {{ .Values.cartoConfigValues.workspaceImportsBucket | quote }}
+  WORKSPACE_IMPORTS_BUCKET: {{ .Values.customConfigValues.workspaceImportsBucket | quote }}
   WORKSPACE_PORT: "{{ .Values.workspaceApi.containerPorts.http }}"
   WORKSPACE_PORT: {{ .Values.workspaceApi.containerPorts.http  | quote }}
   WORKSPACE_POSTGRES_DB: {{ include "carto.postgresql.databaseName" . }}
@@ -55,5 +55,5 @@ data:
   WORKSPACE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-workspace-sub"
   WORKSPACE_PUBSUB_DATA_UPDATES_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/data-updates"
   WORKSPACE_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
-  WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.cartoConfigValues.workspaceThumbnailsBucket | quote }}
+  WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.customConfigValues.workspaceThumbnailsBucket | quote }}
 {{- end }}
\ No newline at end of file
diff --git a/chart/templates/maps-api/secret.yaml b/chart/templates/maps-api/secret.yaml
index d4637d39..873f3a76 100644
--- a/chart/templates/maps-api/secret.yaml
+++ b/chart/templates/maps-api/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
 {{- end }}
diff --git a/chart/templates/router/configmap.yaml b/chart/templates/router/configmap.yaml
index 8c37b793..deb24cd2 100644
--- a/chart/templates/router/configmap.yaml
+++ b/chart/templates/router/configmap.yaml
@@ -12,16 +12,16 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  HTTP_CACHE_ENABLED: {{ .Values.cartoConfigValues.httpCacheEnabled | quote }}
+  HTTP_CACHE_ENABLED: {{ .Values.customConfigValues.httpCacheEnabled | quote }}
   ROUTER_ACCOUNTS_WWW_INTERNAL_URL: {{ include "carto.accountsWww.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
   ROUTER_HTTP_CACHE_INTERNAL_URL: {{ include "carto.httpCache.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
   ROUTER_IMPORT_API_INTERNAL_URL: {{ include "carto.importApi.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
   ROUTER_LDS_API_INTERNAL_URL: {{ include "carto.ldsApi.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
   ROUTER_MAPS_API_INTERNAL_URL: {{ include "carto.mapsApi.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
-  ROUTER_SSL_AUTOGENERATE: {{ .Values.cartoConfigValues.routerSslAutogenerate | quote }}
+  ROUTER_SSL_AUTOGENERATE: {{ .Values.customConfigValues.routerSslAutogenerate | quote }}
   ROUTER_SSL_CERTIFICATE_KEY_PATH: /usr/src/certs/{{ template "carto.tlsCerts.secretKeyKey" . }}
   ROUTER_SSL_CERTIFICATE_PATH: /usr/src/certs/{{ template "carto.tlsCerts.secretCertKey" . }}
   ROUTER_WORKSPACE_API_INTERNAL_URL: {{ include "carto.workspaceApi.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
   ROUTER_WORKSPACE_WWW_INTERNAL_URL: {{ include "carto.workspaceWww.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
-  SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
 {{- end }}
diff --git a/chart/templates/router/secret.yaml b/chart/templates/router/secret.yaml
index 424962a3..3f074eb5 100644
--- a/chart/templates/router/secret.yaml
+++ b/chart/templates/router/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
 {{- end }}
diff --git a/chart/templates/workspace-api/configmap.yaml b/chart/templates/workspace-api/configmap.yaml
index de32501e..d0a1b36d 100644
--- a/chart/templates/workspace-api/configmap.yaml
+++ b/chart/templates/workspace-api/configmap.yaml
@@ -23,7 +23,7 @@ data:
   CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
   CARTO_SELFHOSTED_CARTO_DW_LOCATION: {{ .Values.cartoConfigValues.cartoSelfhostedDwLocation | quote }}
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   DO_ENABLED: "false"
@@ -31,18 +31,18 @@ data:
   EVENT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.cartoAccGcpProjectId }}/topics/{{ .Values.cartoConfigValues.cartoAccGcpProjectRegion }}-event-bus"
   GOOGLE_APPLICATION_CREDENTIALS: "../certs/key.json"
   LOG_LEVEL: "debug"
-  MAPS_API_V3_RESOURCE_URL_ALLOWED_HOSTS: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
-  MAPS_API_V3_RESOURCE_URL_HOST: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  MAPS_API_V3_RESOURCE_URL_ALLOWED_HOSTS: {{ .Values.customConfigValues.selfHostedDomain | quote }}
+  MAPS_API_V3_RESOURCE_URL_HOST: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   PUBSUB_DATA_UPDATES_TOPICS_TEMPLATE: "projects/{project_id}/topics/data-updates"
   PUBSUB_MODE: "pull"
   PUBSUB_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   REDIS_CACHE_PREFIX: "onprem"
   REDIS_HOST: {{ include "carto.redis.host" . }}
   REDIS_PORT: {{ include "carto.redis.port" . }}
-  SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   SELFHOSTED_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
-  WORKSPACE_IMPORTS_BUCKET: {{ .Values.cartoConfigValues.workspaceImportsBucket | quote }}
+  WORKSPACE_IMPORTS_BUCKET: {{ .Values.customConfigValues.workspaceImportsBucket | quote }}
   WORKSPACE_PORT: "{{ .Values.workspaceApi.containerPorts.http }}"
   WORKSPACE_PORT: {{ .Values.workspaceApi.containerPorts.http  | quote }}
   WORKSPACE_POSTGRES_DB: {{ include "carto.postgresql.databaseName" . }}
@@ -52,16 +52,16 @@ data:
   WORKSPACE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-workspace-sub"
   WORKSPACE_PUBSUB_DATA_UPDATES_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/data-updates"
   WORKSPACE_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
-  WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.cartoConfigValues.workspaceThumbnailsBucket | quote }}
-  WORKSPACE_THUMBNAILS_PUBLIC: {{ .Values.cartoConfigValues.workspaceThumbnailsPublic | quote }}
-  WORKSPACE_THUMBNAILS_PROVIDER: {{ .Values.cartoConfigValues.storageProvider | quote }}
-  WORKSPACE_IMPORTS_PROVIDER: {{ .Values.cartoConfigValues.storageProvider | quote }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "gcp" }}
+  WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.customConfigValues.workspaceThumbnailsBucket | quote }}
+  WORKSPACE_THUMBNAILS_PUBLIC: {{ .Values.customConfigValues.workspaceThumbnailsPublic | quote }}
+  WORKSPACE_THUMBNAILS_PROVIDER: {{ .Values.customConfigValues.storageProvider | quote }}
+  WORKSPACE_IMPORTS_PROVIDER: {{ .Values.customConfigValues.storageProvider | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "gcp" }}
   WORKSPACE_THUMBNAILS_PROJECTID: {{ include "carto.gcsBucketsProjectId" . | quote }}
   WORKSPACE_IMPORTS_PROJECTID: {{ include "carto.gcsBucketsProjectId" . | quote }}
   {{- end }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
-  WORKSPACE_THUMBNAILS_REGION: {{ .Values.cartoConfigValues.awsS3Region | quote }}
-  WORKSPACE_IMPORTS_REGION: {{ .Values.cartoConfigValues.awsS3Region | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "s3" }}
+  WORKSPACE_THUMBNAILS_REGION: {{ .Values.customConfigValues.awsS3Region | quote }}
+  WORKSPACE_IMPORTS_REGION: {{ .Values.customConfigValues.awsS3Region | quote }}
   {{- end }}
 {{- end }}
diff --git a/chart/templates/workspace-api/secret.yaml b/chart/templates/workspace-api/secret.yaml
index 2ef3b70f..96b49f0f 100644
--- a/chart/templates/workspace-api/secret.yaml
+++ b/chart/templates/workspace-api/secret.yaml
@@ -12,12 +12,12 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
-  {{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
-  WORKSPACE_THUMBNAILS_ACCESSKEYID: {{ .Values.cartoSecrets.awsAccessKeyId | b64enc | quote }}
-  WORKSPACE_THUMBNAILS_SECRETACCESSKEY: {{ .Values.cartoSecrets.awsAccessKeySecret | b64enc | quote }}
-  WORKSPACE_IMPORTS_ACCESSKEYID: {{ .Values.cartoSecrets.awsAccessKeyId | b64enc | quote }}
-  WORKSPACE_IMPORTS_SECRETACCESSKEY: {{ .Values.cartoSecrets.awsAccessKeySecret | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
+  {{- if eq .Values.customConfigValues.storageProvider "s3" }}
+  WORKSPACE_THUMBNAILS_ACCESSKEYID: {{ .Values.clientSecrets.awsAccessKeyId | b64enc | quote }}
+  WORKSPACE_THUMBNAILS_SECRETACCESSKEY: {{ .Values.clientSecrets.awsAccessKeySecret | b64enc | quote }}
+  WORKSPACE_IMPORTS_ACCESSKEYID: {{ .Values.clientSecrets.awsAccessKeyId | b64enc | quote }}
+  WORKSPACE_IMPORTS_SECRETACCESSKEY: {{ .Values.clientSecrets.awsAccessKeySecret | b64enc | quote }}
   {{- end }}
 {{- end }}
diff --git a/chart/templates/workspace-subscriber/configmap.yaml b/chart/templates/workspace-subscriber/configmap.yaml
index c14e8022..e4907a7a 100644
--- a/chart/templates/workspace-subscriber/configmap.yaml
+++ b/chart/templates/workspace-subscriber/configmap.yaml
@@ -15,7 +15,7 @@ data:
   ACC_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
   ACC_GCP_PROJECT_REGION: {{ .Values.cartoConfigValues.cartoAccGcpProjectRegion | quote }}  
   CARTO3_SELFHOSTED_VOLUMES_BASE_PATH: "./"
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
diff --git a/chart/templates/workspace-subscriber/secret.yaml b/chart/templates/workspace-subscriber/secret.yaml
index 2f9d60ba..cdf50aa5 100644
--- a/chart/templates/workspace-subscriber/secret.yaml
+++ b/chart/templates/workspace-subscriber/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
 {{- end }}
diff --git a/chart/templates/workspace-www/configmap.yaml b/chart/templates/workspace-www/configmap.yaml
index 535caa25..e144cc3a 100644
--- a/chart/templates/workspace-www/configmap.yaml
+++ b/chart/templates/workspace-www/configmap.yaml
@@ -21,13 +21,13 @@ data:
   CARTO_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
   CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
-  CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   LOG_LEVEL: "debug"
   REACT_APP_ACCOUNTS_API_URL: "https://{{ .Values.cartoConfigValues.cartoAccDomain }}"
-  REACT_APP_ACCOUNTS_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/acc/"
-  REACT_APP_API_BASE_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/api"
+  REACT_APP_ACCOUNTS_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/acc/"
+  REACT_APP_API_BASE_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/api"
   REACT_APP_AUTH0_AUDIENCE: "carto-cloud-native-api"
   REACT_APP_AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   REACT_APP_BIGQUERY_OAUTH: "false"
@@ -36,8 +36,8 @@ data:
   REACT_APP_HUBSPOT_ID: "474999"
   REACT_APP_HUBSPOT_LIMIT_FORM_ID: "cd9486fa-5766-4bac-81b9-d8c6cd029b3b"
   REACT_APP_LAUNCH_DARKLY_CLIENT_SIDE_ID: {{ .Values.cartoConfigValues.reactAppLaunchDarklyClientSideId | quote }}
-  REACT_APP_PUBLIC_MAP_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/api/v3/maps/public"
-  REACT_APP_WORKSPACE_API_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/workspace-api"
+  REACT_APP_PUBLIC_MAP_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/api/v3/maps/public"
+  REACT_APP_WORKSPACE_API_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/workspace-api"
   REACT_APP_WORKSPACE_URL_TEMPLATE: "https://{tenantDomain}"
-  SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
+  SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
 {{- end }}
diff --git a/chart/templates/workspace-www/secret.yaml b/chart/templates/workspace-www/secret.yaml
index d7b51d4a..fbfbf0ae 100644
--- a/chart/templates/workspace-www/secret.yaml
+++ b/chart/templates/workspace-www/secret.yaml
@@ -12,6 +12,6 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
-  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
-  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
+  ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
+  REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
 {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 2f7278e2..0f885ad7 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,5 +1,15 @@
 ## @section CARTO parameters
 ##
+customConfigValues:
+  selfHostedDomain: "carto3-selfhosted.lan"
+  httpCacheEnabled: "true"
+  routerSslAutogenerate: ""
+  importBucket: ""
+  workspaceImportsBucket: ""
+  workspaceThumbnailsBucket: ""
+  workspaceThumbnailsPublic: ""
+  storageProvider: "gcp"
+  gcsBucketsProjectId: ""
 
 cartoConfigValues:
   cartoAccDomain: ""
@@ -8,24 +18,19 @@ cartoConfigValues:
   cartoAuth0ClientId: ""
   cartoAuth0CustomDomain: ""
   cartoSelfhostedDwLocation: ""
-  httpCacheEnabled: "true"
-  storageProvider: "gcp"
-  importBucket: ""
-  routerSslAutogenerate: ""
-  selfHostedDomain: "carto3-selfhosted.lan"
   selfHostedGcpProjectId: ""
   selfHostedTenantId: ""
-  workspaceImportsBucket: ""
-  workspaceThumbnailsBucket: ""
-  workspaceThumbnailsPublic: ""
   reactAppLaunchDarklyClientSideId: ""
-  gcsBucketsProjectId: ""
 
-cartoSecrets:
+customSecretsValues:
   googleMapsApiKey: ""
+
+cartoSecretsValues:
   encryptionSecretKey: ""
   varnishDebugSecret: ""
   varnishPurgeSecret: ""
+  googleServiceAccount: ""
+
 
 ## @section Global parameters
 ## Global Docker image parameters