diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f096205856dbfc4fd7b6aa8618d8355bc5768977..97b1da4f60fd153ceeabd3b224eedee6d7d821f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,11 +13,11 @@ variables:
 
   OSDU_GCP_SERVICE: legal
   OSDU_GCP_VENDOR: gcp
-  OSDU_GCP_APPLICATION_NAME: os-legal
-  OSDU_GCP_ENV_VARS: ENABLE_FULL_BUCKET_NAME=$ENABLE_FULL_BUCKET_NAME,PROJECT_ID=$OSDU_GCP_PROJECT,AUTHORIZE_API=$OSDU_GCP_ENTITLEMENTS_V2_URL,AUDIENCES=$GOOGLE_AUDIENCE,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,REDIS_STORAGE_HOST=$REDIS_STORAGE_HOST,LEGAL_HOSTNAME=$OSDU_GCP_LEGAL_HOSTNAME --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
-  OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
-  OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
-  
+  OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.project_id=$OSDU_GCP_PROJECT --set data.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.redis_group_host=$REDIS_GROUP_HOST --set data.redis_storage_host=$REDIS_STORAGE_HOST --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.log_level=INFO --set enable_full_bucket_name=$ENABLE_FULL_BUCKET_NAME"
+  OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-legal --set data.limits_cpu=1.5 --set data.limits_memory=512M"
+  OSDU_GCP_HELM_CONFIG_SERVICE: legal-config
+  OSDU_GCP_HELM_DEPLOYMENT_SERVICE: legal-deploy
+
   IBM_BUILD_SUBDIR: provider/legal-ibm
   IBM_INT_TEST_SUBDIR: testing/legal-test-ibm
 
@@ -30,7 +30,7 @@ include:
     file: "standard-setup.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-    file: "build/maven.yml"    
+    file: "build/maven.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "scanners/fossa.yml"
@@ -47,19 +47,11 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/azure.yml"
 
-  - project: 'osdu/platform/ci-cd-pipelines'
-    ref:  "master"
-    file: 'cloud-providers/osdu-gcp-cloudrun.yml'
-
-  - project: 'osdu/platform/ci-cd-pipelines'
-    ref: "master"
-    file: 'cloud-providers/gcp.yml'
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/osdu-gcp-gke.yml"
 
-  - project: 'osdu/platform/ci-cd-pipelines'
-    ref: "master"
-    file: 'publishing/pages.yml'
-    
-compile-and-unit-test:
-  variables:
-    GOOGLE_CLOUD_PROJECT: opendes-evt
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "cloud-providers/gcp.yml"
 
+  - project: "osdu/platform/ci-cd-pipelines"
+    file: "publishing/pages.yml"
diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml
index c09a0dc45dfb727fd0c2dc42d7018dd5de6ec3ff..1184869956ec4875776ceae74939bcfec5499337 100644
--- a/devops/gcp/configmap/values.yaml
+++ b/devops/gcp/configmap/values.yaml
@@ -3,9 +3,9 @@
 # Declare variables to be passed into your templates.
 
 data:
-  authorize_api: "http://entitlements.default.svc.cluster.local/api/entitlements/v2"
-  partition_api: "http://partition.default.svc.cluster.local/api/partition/v1"
-  log_level: "INFO"
+  authorize_api: ""
+  partition_api: ""
+  log_level: ""
   enable_full_bucket_name: "true"
   project_id: ""
   google_audiences: ""