diff --git a/devops/gcp/configmap/README.md b/devops/gcp/configmap/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..7cbc08d32a74bc23134ff55ca76e9ffe326ffe3a
--- /dev/null
+++ b/devops/gcp/configmap/README.md
@@ -0,0 +1,65 @@
+<!--- 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
+**opaUrl** | OPA host | string | "http://opa" | yes
+**entitlementsBaseUrl** | Entitlements host | string | "http://entitlements" | yes
+**entitlementsBasePath** | Entitlements path | string | "/api/entitlements/v2/groups" | yes
+**legalBaseUrl** | Legal host | string | "http://legal" | yes
+**bucketName** | bucket name | string | - | yes
+**useBundles** | use bundle or not | string | "yes" | yes
+**cloudProvider** | Cloud provider | string | "gcp" | yes
+
+### Config variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**configmap** | configmap to be used | string | policy-config | yes
+**appName** | name of the app | string | policy | yes
+
+### Install the helm chart
+
+Run this command from within this directory:
+
+```console
+helm install gcp-policy-configmap .
+```
+
+## Uninstalling the Chart
+
+To uninstall the helm deployment:
+
+```console
+helm uninstall gcp-policy-configmap
+```
+
+[Move-to-Top](#configmap-helm-chart)
diff --git a/devops/gcp/configmap/templates/policy-configmap.yaml b/devops/gcp/configmap/templates/policy-configmap.yaml
index e0d103d249499c704357f3a00446f0010e9d8763..07c4cb37ecf25509b7995dc371cb678883dbacdf 100644
--- a/devops/gcp/configmap/templates/policy-configmap.yaml
+++ b/devops/gcp/configmap/templates/policy-configmap.yaml
@@ -2,15 +2,15 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
   name: "{{ .Values.conf.configmap }}"
   namespace: "{{ .Release.Namespace }}"
 data:
-  LOG_LEVEL: "{{ .Values.data.log_level }}"
-  OPA_URL: "{{ .Values.data.opa_url }}"
-  ENTITLEMENTS_BASE_URL: "{{ .Values.data.entitlements_base_url }}"
-  ENTITLEMENTS_BASE_PATH: "{{ .Values.data.entitlements_base_path }}"
-  LEGAL_BASE_URL: "{{ .Values.data.legal_base_url }}"
-  POLICY_BUCKET: "{{ .Values.data.bucket_name }}"
-  USE_BUNDLES: "{{ .Values.data.use_bundles }}"
-  CLOUD_PROVIDER: "{{ .Values.data.cloud_provider }}"
+  LOG_LEVEL: "{{ .Values.data.logLevel }}"
+  OPA_URL: "{{ .Values.data.opaUrl }}"
+  ENTITLEMENTS_BASE_URL: "{{ .Values.data.entitlementsBaseUrl }}"
+  ENTITLEMENTS_BASE_PATH: "{{ .Values.data.entitlementsBasePath }}"
+  LEGAL_BASE_URL: "{{ .Values.data.legalBaseUrl }}"
+  POLICY_BUCKET: "{{ .Values.data.bucketName }}"
+  USE_BUNDLES: "{{ .Values.data.useBundles }}"
+  CLOUD_PROVIDER: "{{ .Values.data.cloudProvider }}"
diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml
index 1b1a139ea4998dd9e71ade20ac081982589aa9b2..e1d332f701e1d15001c95cbe19094ffb010e69d6 100644
--- a/devops/gcp/configmap/values.yaml
+++ b/devops/gcp/configmap/values.yaml
@@ -1,13 +1,13 @@
 data:
-  log_level: "INFO"
-  opa_url: "http://opa"
-  entitlements_base_url: "http://entitlements"
-  entitlements_base_path: "/api/entitlements/v2/groups"
-  legal_base_url: "http://legal"
-  bucket_name: ""
-  use_bundles: "yes"
-  cloud_provider: "gcp"
+  logLevel: "INFO"
+  opaUrl: "http://opa"
+  entitlementsBaseUrl: "http://entitlements"
+  entitlementsBasePath: "/api/entitlements/v2/groups"
+  legalBaseUrl: "http://legal"
+  bucketName: ""
+  useBundles: "yes"
+  cloudProvider: "gcp"
 
 conf:
   configmap: "policy-config"
-  app_name: "policy"
+  appName: "policy"
diff --git a/devops/gcp/configmap_opa/README.md b/devops/gcp/configmap_opa/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..3bc71291acca0c9f27fd387adc574a46ed791034
--- /dev/null
+++ b/devops/gcp/configmap_opa/README.md
@@ -0,0 +1,60 @@
+<!--- 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 |
+|------|-------------|------|---------|---------|
+**bucketName** | bucket name | string | - | yes
+**scopes** | scope of OPA | string | "https://www.googleapis.com/auth/devstorage.read_only" | yes
+
+### Config variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**configmap** | configmap to be used | string | opa-config | yes
+**appName** | name of the app | string | opa | yes
+**dataPartitionId** | data partition id | string | - | yes
+
+### Install the helm chart
+
+Run this command from within this directory:
+
+```console
+helm install gcp-opa-configmap .
+```
+
+## Uninstalling the Chart
+
+To uninstall the helm deployment:
+
+```console
+helm uninstall gcp-opa-configmap
+```
+
+[Move-to-Top](#configmap-helm-chart)
diff --git a/devops/gcp/configmap_opa/templates/opa-configmap.yaml b/devops/gcp/configmap_opa/templates/opa-configmap.yaml
index 1bd8b8c2e6d25ea204ddc431ca884502468ec1f7..64e061bdf09744ff05cb3ce6e57038dbd193c84d 100644
--- a/devops/gcp/configmap_opa/templates/opa-configmap.yaml
+++ b/devops/gcp/configmap_opa/templates/opa-configmap.yaml
@@ -2,14 +2,14 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
   name: "{{ .Values.conf.configmap }}"
   namespace: "{{ .Release.Namespace }}"
 data:
   config.yaml: |
     services:
       gcs:
-        url: "https://storage.googleapis.com/storage/v1/b/{{ .Values.data.bucket_name }}/o"
+        url: "https://storage.googleapis.com/storage/v1/b/{{ .Values.data.bucketName }}/o"
         credentials:
           gcp_metadata:
             scopes:
@@ -20,6 +20,6 @@ data:
         service: gcs
         # NOTE ?alt=media is required
         resource: 'bundle.tar.gz?alt=media'
-      osdu/partition/{{ .Values.conf.data_partition_id }}:
+      osdu/partition/{{ .Values.conf.dataPartitionId }}:
         service: gcs
-        resource: 'bundle-{{ .Values.conf.data_partition_id }}.tar.gz?alt=media'
+        resource: 'bundle-{{ .Values.conf.dataPartitionId }}.tar.gz?alt=media'
diff --git a/devops/gcp/configmap_opa/values.yaml b/devops/gcp/configmap_opa/values.yaml
index 03fb1d7edff3c57b12b887a9389212dcf5e47337..38f2233610d2563c2c57f25dfbba8ca1a6de81a7 100644
--- a/devops/gcp/configmap_opa/values.yaml
+++ b/devops/gcp/configmap_opa/values.yaml
@@ -1,8 +1,8 @@
 data:
-  bucket_name: ""
+  bucketName: ""
   scopes: "https://www.googleapis.com/auth/devstorage.read_only"
 
 conf:
   configmap: "opa-config"
-  app_name: "opa"
-  data_partition_id: ""
+  appName: "opa"
+  dataPartitionId: ""
diff --git a/devops/gcp/deploy/README.md b/devops/gcp/deploy/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..bcb278b5f6f841ad1945ac8552026a6e88c2f724
--- /dev/null
+++ b/devops/gcp/deploy/README.md
@@ -0,0 +1,66 @@
+<!--- Deploy -->
+
+# Deploy helm chart
+
+## Introduction
+
+This chart bootstraps a 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 |
+|------|-------------|------|---------|---------|
+**image** | your image name | string | - | yes
+**requestsCpu** | amount of requests CPU | string | 0.1 | yes
+**requestsMemory** | amount of requests memory| string | 128M | yes
+**limitsCpu** | CPU limit | string | 1 | yes
+**limitsMemory** | memory limit | string | 1G | yes
+**serviceAccountName** | name of your service account | string | - | yes
+**imagePullPolicy** | when to pull image | string | IfNotPresent | yes
+
+### Config variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**appName** | name of the app | string | policy | yes
+**configmap** | configmap to be used | string | policy-config | yes
+**domain** | your domain | string | - | yes
+
+### Install the helm chart
+
+Run this command from within this directory:
+
+```console
+helm install gcp-policy-deploy .
+```
+
+## Uninstalling the Chart
+
+To uninstall the helm deployment:
+
+```console
+helm uninstall gcp-policy-deploy
+```
+
+[Move-to-Top](#deploy-helm-chart)
diff --git a/devops/gcp/deploy/templates/deployment.yaml b/devops/gcp/deploy/templates/deployment.yaml
index df26c21df5d6416034a16fb8f0c21a01f8f4f2a9..f6b5203ff337b5c71ea978449f9e8e8587ccc654 100644
--- a/devops/gcp/deploy/templates/deployment.yaml
+++ b/devops/gcp/deploy/templates/deployment.yaml
@@ -2,23 +2,23 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: "{{ .Values.conf.app_name }}"
-  name: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
+  name: "{{ .Values.conf.appName }}"
   namespace: "{{ .Release.Namespace }}"
 spec:
   selector:
     matchLabels:
-      app: "{{ .Values.conf.app_name }}"
+      app: "{{ .Values.conf.appName }}"
   replicas: 1
   template:
     metadata:
       labels:
-        app: "{{ .Values.conf.app_name }}"
+        app: "{{ .Values.conf.appName }}"
       annotations:
         rollme: {{ randAlphaNum 5 | quote }}
     spec:
       containers:
-        - name: "{{ .Values.conf.app_name }}"
+        - name: "{{ .Values.conf.appName }}"
           image: "{{ .Values.data.image }}"
           imagePullPolicy: "{{ .Values.data.imagePullPolicy }}"
           envFrom:
@@ -31,9 +31,9 @@ spec:
             - containerPort: 80
           resources:
             requests:
-              cpu: "{{ .Values.data.requests_cpu }}"
-              memory: "{{ .Values.data.requests_memory }}"
+              cpu: "{{ .Values.data.requestsCpu }}"
+              memory: "{{ .Values.data.requestsMemory }}"
             limits:
-              cpu: "{{ .Values.data.limits_cpu }}"
-              memory: "{{ .Values.data.limits_memory }}"
+              cpu: "{{ .Values.data.limitsCpu }}"
+              memory: "{{ .Values.data.limitsMemory }}"
       serviceAccountName: "{{ .Values.data.serviceAccountName }}"
diff --git a/devops/gcp/deploy/templates/service.yaml b/devops/gcp/deploy/templates/service.yaml
index 878a4648aeed37daf8b79573ce6446ebea150d5c..38dba1e522b7a0af8cfd48871ac1627bcea02824 100644
--- a/devops/gcp/deploy/templates/service.yaml
+++ b/devops/gcp/deploy/templates/service.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Values.conf.app_name }}"
+  name: "{{ .Values.conf.appName }}"
   annotations:
     cloud.google.com/neg: '{"ingress": true}'
   namespace: "{{ .Release.Namespace }}"
   labels:
-    app: "{{ .Values.conf.app_name }}"
-    service: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
+    service: "{{ .Values.conf.appName }}"
 spec:
   ports:
     - protocol: TCP
@@ -15,4 +15,4 @@ spec:
       targetPort: 80
       name: http
   selector:
-    app: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
diff --git a/devops/gcp/deploy/templates/virtual-service.yaml b/devops/gcp/deploy/templates/virtual-service.yaml
index 5c61613a8e52659d9e71099f9fa35d09e44637ec..5214685fd1031f71bf3be6b39fb01ee77dfa30c5 100644
--- a/devops/gcp/deploy/templates/virtual-service.yaml
+++ b/devops/gcp/deploy/templates/virtual-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
-  name: "{{ .Values.conf.app_name }}"
+  name: "{{ .Values.conf.appName }}"
   namespace: "{{ .Release.Namespace }}"
 spec:
   hosts:
@@ -20,4 +20,4 @@ spec:
         - destination:
             port:
               number: 80
-            host: "{{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local"
+            host: "{{ .Values.conf.appName }}.{{ .Release.Namespace }}.svc.cluster.local"
diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml
index 9eda104f78a1c24e18472a0438d186fd212c5705..f9e1d01a3f642727755555ca54dd02b448baa6b2 100644
--- a/devops/gcp/deploy/values.yaml
+++ b/devops/gcp/deploy/values.yaml
@@ -1,13 +1,13 @@
 data:
-  requests_cpu: "0.1"
-  requests_memory: "128M"
-  limits_cpu: "1"
-  limits_memory: "1G"
+  requestsCpu: "0.1"
+  requestsMemory: "128M"
+  limitsCpu: "1"
+  limitsMemory: "1G"
   serviceAccountName: ""
   imagePullPolicy: "IfNotPresent"
   image: ""
 
 conf:
   configmap: "policy-config"
-  app_name: "policy"
+  appName: "policy"
   domain: ""
diff --git a/devops/gcp/opa/README.md b/devops/gcp/opa/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..2fadfd6e781709a9cae7b74974b5d18d822e1d74
--- /dev/null
+++ b/devops/gcp/opa/README.md
@@ -0,0 +1,66 @@
+<!--- Deploy -->
+
+# Deploy helm chart
+
+## Introduction
+
+This chart bootstraps a 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 |
+|------|-------------|------|---------|---------|
+**image** | your image name | string | - | yes
+**requestsCpu** | amount of requests CPU | string | 0.1 | yes
+**requestsMemory** | amount of requests memory| string | 128M | yes
+**limitsCpu** | CPU limit | string | 1 | yes
+**limitsMemory** | memory limit | string | 1G | yes
+**serviceAccountName** | name of your service account | string | opa-k8s | yes
+**imagePullPolicy** | when to pull image | string | IfNotPresent | yes
+
+### Config variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**appName** | name of the app | string | opa | yes
+**configmap** | configmap to be used | string | opa-config | yes
+**domain** | your domain | string | - | yes
+
+### Install the helm chart
+
+Run this command from within this directory:
+
+```console
+helm install gcp-opa-deploy .
+```
+
+## Uninstalling the Chart
+
+To uninstall the helm deployment:
+
+```console
+helm uninstall gcp-opa-deploy
+```
+
+[Move-to-Top](#deploy-helm-chart)
diff --git a/devops/gcp/opa/templates/deployment.yaml b/devops/gcp/opa/templates/deployment.yaml
index 352ff305fc9367dd0246f601519e4dcfb4acb418..0ef2a89053a9a74d0b19ad4b13276eacdd68666f 100644
--- a/devops/gcp/opa/templates/deployment.yaml
+++ b/devops/gcp/opa/templates/deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "{{ .Values.conf.app_name }}"
+  name: "{{ .Values.conf.appName }}"
   labels:
-    app: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
   namespace: "{{ .Release.Namespace }}"
 spec:
   replicas: 1
@@ -11,15 +11,15 @@ spec:
     type: Recreate
   selector:
     matchLabels:
-      app: "{{ .Values.conf.app_name }}"
+      app: "{{ .Values.conf.appName }}"
   template:
     metadata:
       labels:
-        app: "{{ .Values.conf.app_name }}"
-      name: "{{ .Values.conf.app_name }}"
+        app: "{{ .Values.conf.appName }}"
+      name: "{{ .Values.conf.appName }}"
     spec:
       containers:
-      - name: "{{ .Values.conf.app_name }}"
+      - name: "{{ .Values.conf.appName }}"
         image: openpolicyagent/opa:latest
         imagePullPolicy: "{{ .Values.data.imagePullPolicy }}"
         ports:
@@ -31,11 +31,11 @@ spec:
         - "--config-file=/config/config.yaml"
         resources:
           requests:
-            cpu: "{{ .Values.data.requests_cpu }}"
-            memory: "{{ .Values.data.requests_memory }}"
+            cpu: "{{ .Values.data.requestsCpu }}"
+            memory: "{{ .Values.data.requestsMemory }}"
           limits:
-            cpu: "{{ .Values.data.limits_cpu }}"
-            memory: "{{ .Values.data.limits_memory }}"
+            cpu: "{{ .Values.data.limitsCpu }}"
+            memory: "{{ .Values.data.limitsMemory }}"
         volumeMounts:
           - mountPath: /config
             name: "{{ .Values.conf.configmap }}"
diff --git a/devops/gcp/opa/templates/service.yaml b/devops/gcp/opa/templates/service.yaml
index d3d3ba2db1c7e2373cb37aa3207438520ab0500c..bcd7ce28752255e0a47c6e2e5b0ae71f3e2fda04 100644
--- a/devops/gcp/opa/templates/service.yaml
+++ b/devops/gcp/opa/templates/service.yaml
@@ -1,9 +1,9 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: "{{ .Values.conf.app_name }}"
+  name: "{{ .Values.conf.appName }}"
   labels:
-    app: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
   namespace: "{{ .Release.Namespace }}"
 spec:
   type: ClusterIP
@@ -13,4 +13,4 @@ spec:
       targetPort: 8181
       name: http
   selector:
-    app: "{{ .Values.conf.app_name }}"
+    app: "{{ .Values.conf.appName }}"
diff --git a/devops/gcp/opa/templates/virtual-service.yaml b/devops/gcp/opa/templates/virtual-service.yaml
index c6a3807792cc0349614b727b3fa65acfc058d799..ae0b2a793e294d04ed4f9fef41c979ca07e94647 100644
--- a/devops/gcp/opa/templates/virtual-service.yaml
+++ b/devops/gcp/opa/templates/virtual-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
-  name: "{{ .Values.conf.app_name }}"
+  name: "{{ .Values.conf.appName }}"
   namespace: "{{ .Release.Namespace }}"
 spec:
   hosts:
@@ -18,6 +18,6 @@ spec:
             prefix: "/v1/policies"
       route:
         - destination:
-            host: "{{ .Values.conf.app_name }}.{{ .Release.Namespace }}.svc.cluster.local"
+            host: "{{ .Values.conf.appName }}.{{ .Release.Namespace }}.svc.cluster.local"
             port:
               number: 8181
diff --git a/devops/gcp/opa/values.yaml b/devops/gcp/opa/values.yaml
index b0e44896766cb8a5e189cb74f6e4fbc642a2564f..5a2c6ef18536e2a9dae4e4cacb601faca3f634c5 100644
--- a/devops/gcp/opa/values.yaml
+++ b/devops/gcp/opa/values.yaml
@@ -3,15 +3,15 @@
 # Declare variables to be passed into your templates.
 
 data:
-  requests_cpu: "0.1"
-  requests_memory: "128M"
-  limits_cpu: "1"
-  limits_memory: "1G"
+  requestsCpu: "0.1"
+  requestsMemory: "128M"
+  limitsCpu: "1"
+  limitsMemory: "1G"
   image: ""
   imagePullPolicy: "IfNotPresent"
   serviceAccountName: "opa-k8s"
 
 conf:
-  app_name: "opa"
+  appName: "opa"
   configmap: "opa-config"
   domain: ""
diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml
index a5d5641dfe018e0d41bb90dc47be79981c15b939..573a4d3a05fcd6b302d63c46b756b292b3c8d66a 100644
--- a/devops/gcp/pipeline/override-stages.yml
+++ b/devops/gcp/pipeline/override-stages.yml
@@ -9,8 +9,8 @@ variables:
   OSDU_GCP_HELM_OPA_CONFIG_DIR: "devops/gcp/configmap_opa"
   # FIXME
   OSDU_GCP_HELM_OPA_CONFIG_SERVICE_VARS: >-
-    --set data.bucket_name=$OSDU_GCP_POLICY_BUCKET
-    --set conf.data_partition_id=osdu
+    --set data.bucketName=$OSDU_GCP_POLICY_BUCKET
+    --set conf.dataPartitionId=osdu
   OSDU_GCP_INT_TEST_TYPE: python
 
 osdu-gcp-helm-charts-master: