diff --git a/.gitignore b/.gitignore
index 8f7025a30515c00824016b14b17a4d935cacc3fb..e7712af8d5150cd6dae63334bae1a39a7281823f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ __pycache__/
 
 # Compiled output
 dist/
-build/
 /tmp
 /out-tsc
 /bazel-out
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f979b480dfb95b0fc3d174516881bd54adce521..456c838fba3948710e8934233d8648d657904435 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,13 +64,13 @@ include:
     file: "cloud-providers/ibm-policy-int-test.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-    file: "cloud-providers/osdu-gcp-global.yml"
+    file: "cloud-providers/gc-global.yml"
 
   - local: "/devops/azure/override-stages.yml"
   - local: "/devops/aws/override-stages.yaml"
   - local: "/devops/aws/bootstrap.yaml"
   - local: "/devops/ibm/bootstrap-bundle.yml"
-  - local: "/devops/gcp/pipeline/override-stages.yml"
+  - local: "/devops/gc/pipeline/override-stages.yml"
   - local: "/loadtest/pipeline-loadtest.yml"
 
 # --------------------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 2a75049834b672a86a6dc9cde2dd68b5f671670b..8e4ff67aef88b914fa41257fbe3a951a5ab72944 100644
--- a/NOTICE
+++ b/NOTICE
@@ -22,7 +22,7 @@ The following software have components provided under the terms of this license:
 - google-crc32c (from https://github.com/googleapis/python-crc32c)
 - google-resumable-media (from https://github.com/googleapis/google-resumable-media-python)
 - googleapis-common-protos (from https://github.com/googleapis/python-api-common-protos)
-- packaging (from https://pypi.org/project/packaging/22.0/)
+- packaging (from https://pypi.org/project/packaging/22.0/, https://pypi.org/project/packaging/23.0/)
 - pytest-asyncio (from https://github.com/pytest-dev/pytest-asyncio)
 - pytest-dependency (from https://github.com/RKrahl/pytest-dependency)
 - python-dateutil (from https://github.com/dateutil/dateutil)
@@ -33,6 +33,7 @@ The following software have components provided under the terms of this license:
 - s3transfer (from https://github.com/boto/s3transfer)
 - sniffio (from https://github.com/python-trio/sniffio)
 - tenacity (from https://github.com/jd/tenacity)
+- urllib3 (from https://urllib3.readthedocs.io/)
 
 ========================================================================
 BSD-2-Clause
@@ -40,7 +41,7 @@ BSD-2-Clause
 The following software have components provided under the terms of this license:
 
 - oauthlib (from https://github.com/oauthlib/oauthlib)
-- packaging (from https://pypi.org/project/packaging/22.0/)
+- packaging (from https://pypi.org/project/packaging/22.0/, https://pypi.org/project/packaging/23.0/)
 - pyasn1 (from https://github.com/etingof/pyasn1)
 - pyasn1-modules (from https://github.com/etingof/pyasn1-modules)
 
@@ -58,7 +59,7 @@ The following software have components provided under the terms of this license:
 - isodate (from https://github.com/gweis/isodate/)
 - jinja2
 - oauthlib (from https://github.com/oauthlib/oauthlib)
-- packaging (from https://pypi.org/project/packaging/22.0/)
+- packaging (from https://pypi.org/project/packaging/22.0/, https://pypi.org/project/packaging/23.0/)
 - protobuf (from https://developers.google.com/protocol-buffers/)
 - pycparser (from https://github.com/eliben/pycparser)
 - pyrsistent (from https://github.com/tobgu/pyrsistent/)
@@ -118,10 +119,10 @@ The following software have components provided under the terms of this license:
 - coloredlogs (from https://coloredlogs.readthedocs.io)
 - coverage (from https://github.com/nedbat/coveragepy)
 - exceptiongroup (from https://pypi.org/project/exceptiongroup/1.0.1/, https://pypi.org/project/exceptiongroup/1.1.0/)
-- fastapi (from https://pypi.org/project/fastapi/0.86.0/, https://pypi.org/project/fastapi/0.88.0/)
+- fastapi (from https://pypi.org/project/fastapi/0.86.0/, https://pypi.org/project/fastapi/0.89.1/)
 - h11
 - humanfriendly (from https://humanfriendly.readthedocs.io)
-- iniconfig (from http://github.com/RonnyPfannschmidt/iniconfig)
+- iniconfig (from https://pypi.org/project/iniconfig/2.0.0/)
 - jmespath (from https://github.com/jmespath/jmespath.py)
 - jsonschema
 - msal (from https://github.com/AzureAD/microsoft-authentication-library-for-python)
diff --git a/app/Makefile b/app/Makefile
index 4907ab43afde43ab56c42e997266dad4d345210e..ff4b0f80ea5f47e59ea27e1071be726f472c4fb7 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -142,7 +142,7 @@ gcp_test_docker_suite: gcp_opa_ttab gcp_docker_ttab gcp_test_ttab
 gcp_init: DATA_PARTITION := $(DATA_PARTITION)
 gcp_init: POLICY_BUCKET := $(POLICY_BUCKET)
 gcp_init: 
-	bash tests/gcp_bootstrap_policy.sh
+	bash tests/gc_bootstrap_policy.sh
 	
 gcp_local: OPA_URL := http://localhost:$(OPA_PORT)
 gcp_local: CLOUD_PROVIDER := gcp
@@ -214,7 +214,7 @@ gcp_ci_test: ENTITLEMENTS_BASE_URL := ${GCP_BASE_URL}
 gcp_ci_test: LEGAL_BASE_URL := ${GCP_BASE_URL}
 gcp_ci_test: GOOGLE_APPLICATION_CREDENTIALS := ${SA_FILE_PATH}
 gcp_ci_test: echoenv
-	bash tests/gcp_bootstrap_policy.sh
+	bash tests/gc_bootstrap_policy.sh
 	$(eval TOKEN = $(shell gcloud auth print-access-token --impersonate-service-account=${SERVICE_ACCOUNT}))
 	$(eval DOMAIN = $(shell tests/domain.sh))
 	echo DOMAIN: ${DOMAIN}
diff --git a/app/README.md b/app/README.md
index 584f816ac17e69500b6c1d3d9837e658456465ff..fb0cd43a5e8225057b9670a045f3e8be2c1a3149 100644
--- a/app/README.md
+++ b/app/README.md
@@ -13,9 +13,9 @@ Recently policy service was migrated from Flask to FastAPI, this was done in par
 * OPA
     The [Open Policy Agent](https://www.openpolicyagent.org) (OPA, pronounced “oh-pa”) is an open source, general-purpose policy engine that unifies policy enforcement across the stack. OPA provides a high-level declarative language that lets you specify policy as code and simple APIs to offload policy decision-making from your software. 
     - Min. version 0.44 is recommended
-    - OPA must be configured to poll for new policies in [example init.yaml)(tests/gcp_init.yaml).
+    - OPA must be configured to poll for new policies in [example init.yaml)(tests/gc_init.yaml).
     - For testing purposes a low polling is probably best.
-    - OPA must also be bootstrapped with an initial bundle for instance and data partition. [example](tests/gcp_bootstrap_policy.sh)
+    - OPA must also be bootstrapped with an initial bundle for instance and data partition. [example](tests/gc_bootstrap_policy.sh)
     - Be sure environment variable `OPA_URL` points to the OPA service endpoint. It defaults to `http://localhost:8181` for testing purposes.
     Some of the options for starting OPA include:
     * `opa run --server`
@@ -45,7 +45,7 @@ Recently policy service was migrated from Flask to FastAPI, this was done in par
     * MOCK or undefined
 
     Related Settings/Environmental variables:
-    - `POLICY_BUCKET` - used by AWS, GCP and IBM to determine which bucket is used for providing bundle files. Service identity running policy service needs to have write permission to contents in this bucket. Note us-east-1 is only region supported at this time for AWS.
+    - `POLICY_BUCKET` - used by AWS, Google Cloud and IBM to determine which bucket is used for providing bundle files. Service identity running policy service needs to have write permission to contents in this bucket. Note us-east-1 is only region supported at this time for AWS.
     - `CONTAINER_NAME` - used by Azure to determine which container is used for providing bundle files. Service principal running policy service needs to have write permission to contents in this bucket.
     - `STORAGE_ACCOUNT` - used by Azure to determine which account is used for providing bundle files. Service principal running policy service needs to have write permission to contents in this bucket.
     - `ENDPOINT_URL`, `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` - used by IBM (yes IBM). Please note only region `us-east-1` is currently supported.
@@ -68,7 +68,7 @@ The [test directory](./test) contains pytest unit and integration tests and thei
     * `LOG_LEVEL` if not set will be "INFO"
     * `LOG_LEVEL_TRANSLATE` if not set will be set to the same as LOG_LEVEL
     * CLOUD_PROVIDER
-        * `POLICY_BUCKET` - if `CLOUD_PROVIDER` is set to GCP or IBM
+        * `POLICY_BUCKET` - if `CLOUD_PROVIDER` is set to Google Cloud or IBM
     * conf.ENTITLEMENTS_BASE_URL `ENTITLEMENTS_BASE_URL`
 	* conf.LEGAL_BASE_URL `LEGAL_BASE_URL`
 	* `OPA_URL` for example (http://opahost:port)
@@ -94,7 +94,7 @@ To start tests you might want to consider using the following from parent direct
 - Alternatively you can run use the Docker container.
 - `make gcp_test_suite` will launch configure OPA bundles, deploy OPA, launch policy-service and start automated unit and integration testing. This assumes a Mac with all optional software is installed.
 
-### Developer Google Cloud Platform (GCP) Notes:
+### Developer Google Cloud Platform (GC) Notes:
 - If testing with user credentials, you might need to run `gcloud auth application-default login` and `gsutil config`.
 - If you're using a service account with a json file, `gcloud auth activate-service-account --key-file=auth.json` and `gsutil config -e`
 - You may also need to set SA_FILE_PATH and/or GOOGLE_APPLICATION_CREDENTIALS env variables to the path of the json file.
@@ -130,7 +130,7 @@ For more information on [translate API](./translate/README.md).
         -e ENABLE_ADMIN_UI=1 \
         -e GOOGLE_CLOUD_PROJECT=your_google_project \
         -e CLOUD_PROVIDER=gcp \
-        -e POLICY_BUCKET=your_policy_bucket_in_gcp \
+        -e POLICY_BUCKET=your_policy_bucket_in_google_cloud \
         -v $HOME/.config/gcloud:/root/.config/gcloud \
         --name policy-service -p 8080:8080 policy-service:latest
 ```
diff --git a/app/tests/gcp/run-integration-tests.sh b/app/tests/gc/run-integration-tests.sh
similarity index 54%
rename from app/tests/gcp/run-integration-tests.sh
rename to app/tests/gc/run-integration-tests.sh
index 8b1a29755e0e543f58bffc3872b857b81c95fb8c..3e48a0de3e3ec66d3c6af512166243399c13dc37 100644
--- a/app/tests/gcp/run-integration-tests.sh
+++ b/app/tests/gc/run-integration-tests.sh
@@ -3,10 +3,10 @@ set -ex
 # move to the root of the repo
 cd $CI_PROJECT_DIR
 #auth steps
-echo $OSDU_GCP_INTEGRATION_TESTER | base64 -d > OSDU_GCP_INTEGRATION_TESTER.json
-gcloud auth activate-service-account --key-file OSDU_GCP_INTEGRATION_TESTER.json
-gcloud config set project $OSDU_GCP_PROJECT
-export GOOGLE_APPLICATION_CREDENTIALS="$CI_PROJECT_DIR/OSDU_GCP_INTEGRATION_TESTER.json"
+echo $GC_INTEGRATION_TESTER | base64 -d > GC_INTEGRATION_TESTER.json
+gcloud auth activate-service-account --key-file GC_INTEGRATION_TESTER.json
+gcloud config set project $GC_PROJECT
+export GOOGLE_APPLICATION_CREDENTIALS="$CI_PROJECT_DIR/GC_INTEGRATION_TESTER.json"
 echo $GOOGLE_APPLICATION_CREDENTIALS
 export BEARER_TOKEN=`gcloud auth print-access-token`
 
@@ -18,4 +18,4 @@ cd app
 pip install -r requirements.txt
 
 #run tests
-python3 -m pytest --token=$BEARER_TOKEN --service_url=$HOST --data_partition=$DATA_PARTITION
\ No newline at end of file
+python3 -m pytest --token=$BEARER_TOKEN --service_url=$HOST --data_partition=$DATA_PARTITION
diff --git a/app/tests/gcp_bootstrap_policy.sh b/app/tests/gc_bootstrap_policy.sh
similarity index 100%
rename from app/tests/gcp_bootstrap_policy.sh
rename to app/tests/gc_bootstrap_policy.sh
diff --git a/app/tests/gcp_init.yaml b/app/tests/gc_init.yaml
similarity index 100%
rename from app/tests/gcp_init.yaml
rename to app/tests/gc_init.yaml
diff --git a/build/gcp/Dockerfile b/build/gc/Dockerfile
similarity index 97%
rename from build/gcp/Dockerfile
rename to build/gc/Dockerfile
index 9b12dcb5fb2d75e12f5c2c10178f580023eb8d26..3dabd5864cc91bb999350fbb860eabd75dee0cd3 100644
--- a/build/gcp/Dockerfile
+++ b/build/gc/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /opt
 COPY ./app /opt
 RUN pip install --no-cache-dir --upgrade -r /opt/requirements.txt
 
-# Admin UI POC
+# Admin UI POC tst
 #COPY ./frontend/adminui/dist/policyservice /opt/assets
 
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8080"]
diff --git a/devops/gcp/bootstrap-osdu-module/DataPartitionBundles.py b/devops/gc/bootstrap-osdu-module/DataPartitionBundles.py
similarity index 95%
rename from devops/gcp/bootstrap-osdu-module/DataPartitionBundles.py
rename to devops/gc/bootstrap-osdu-module/DataPartitionBundles.py
index 2d224cf7a01c9c8ed39d2e33775b0e4cbbc32f63..59a33da982f77603a8ee130a19a3248d4e0e2ec5 100644
--- a/devops/gcp/bootstrap-osdu-module/DataPartitionBundles.py
+++ b/devops/gc/bootstrap-osdu-module/DataPartitionBundles.py
@@ -12,7 +12,7 @@ class BootstrapDataPartitionBundles:
         manifest_template_name = "manifest_template.manifest"
         dataauthz_filename = "dataauthz.rego"
         manifest_filename = ".manifest"
-        template_path = "devops/gcp/bootstrap-osdu-module/templates/"
+        template_path = "devops/gc/bootstrap-osdu-module/templates/"
 
         env = Environment(
             loader=FileSystemLoader(template_path),
@@ -40,4 +40,3 @@ if __name__ == '__main__':
     parser.add_argument('--partition', required=True, type=str)
     args = parser.parse_args()
     BootstrapDataPartitionBundles.create_and_upload_dp_bundles(args.partition)
-
diff --git a/devops/gcp/bootstrap-osdu-module/Dockerfile b/devops/gc/bootstrap-osdu-module/Dockerfile
similarity index 58%
rename from devops/gcp/bootstrap-osdu-module/Dockerfile
rename to devops/gc/bootstrap-osdu-module/Dockerfile
index 78cec86cba57d2b0676c7777d83c649fc5651a8f..d607dbdefccc7fd8096342deb2174421ffb028be 100644
--- a/devops/gcp/bootstrap-osdu-module/Dockerfile
+++ b/devops/gc/bootstrap-osdu-module/Dockerfile
@@ -1,12 +1,12 @@
 FROM gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
 
 WORKDIR /opt
-COPY ./requirements_bootstrap.txt ./devops/gcp/bootstrap-osdu-module/*.sh /opt/
+COPY ./requirements_bootstrap.txt ./devops/gc/bootstrap-osdu-module/*.sh /opt/
 COPY ./deployment/ /opt/deployment
-COPY ./devops/gcp/bootstrap-osdu-module /opt/devops/gcp/bootstrap-osdu-module
+COPY ./devops/gc/bootstrap-osdu-module /opt/devops/gc/bootstrap-osdu-module
 
 RUN chmod 775 /opt/bootstrap_policy.sh
 RUN apk add py3-pip
-RUN pip3 install -r /opt/requirements_bootstrap.txt -r /opt/devops/gcp/bootstrap-osdu-module/requirements.txt
+RUN pip3 install -r /opt/requirements_bootstrap.txt -r /opt/devops/gc/bootstrap-osdu-module/requirements.txt
 
 CMD ["/bin/bash", "-c", "/opt/bootstrap_policy.sh && sleep 365d"]
diff --git a/devops/gcp/bootstrap-osdu-module/README.md b/devops/gc/bootstrap-osdu-module/README.md
similarity index 100%
rename from devops/gcp/bootstrap-osdu-module/README.md
rename to devops/gc/bootstrap-osdu-module/README.md
diff --git a/devops/gcp/bootstrap-osdu-module/bootstrap_policy.sh b/devops/gc/bootstrap-osdu-module/bootstrap_policy.sh
similarity index 96%
rename from devops/gcp/bootstrap-osdu-module/bootstrap_policy.sh
rename to devops/gc/bootstrap-osdu-module/bootstrap_policy.sh
index 70209b2e584418ecdf160ab1ea980314de16693c..f98e1cb4e6764e4e7442165b899bb161b894a163 100644
--- a/devops/gcp/bootstrap-osdu-module/bootstrap_policy.sh
+++ b/devops/gc/bootstrap-osdu-module/bootstrap_policy.sh
@@ -20,7 +20,7 @@ create_partition_bundle() {
 
   DATA_PARTITION=$1
   echo "Archiving bundle of policies for parition: ${DATA_PARTITION}..."
-  python3 /opt/devops/gcp/bootstrap-osdu-module/DataPartitionBundles.py --partition "${DATA_PARTITION}"
+  python3 /opt/devops/gc/bootstrap-osdu-module/DataPartitionBundles.py --partition "${DATA_PARTITION}"
   mv /opt/bundle-"${DATA_PARTITION}".tar.gz /opt/policies
   echo "${DATA_PARTITION} partition archive is ready"
 }
diff --git a/devops/gcp/bootstrap-osdu-module/requirements.txt b/devops/gc/bootstrap-osdu-module/requirements.txt
similarity index 100%
rename from devops/gcp/bootstrap-osdu-module/requirements.txt
rename to devops/gc/bootstrap-osdu-module/requirements.txt
diff --git a/devops/gcp/bootstrap-osdu-module/templates/dataauthz_template.rego b/devops/gc/bootstrap-osdu-module/templates/dataauthz_template.rego
similarity index 100%
rename from devops/gcp/bootstrap-osdu-module/templates/dataauthz_template.rego
rename to devops/gc/bootstrap-osdu-module/templates/dataauthz_template.rego
diff --git a/devops/gcp/bootstrap-osdu-module/templates/manifest_template.manifest b/devops/gc/bootstrap-osdu-module/templates/manifest_template.manifest
similarity index 100%
rename from devops/gcp/bootstrap-osdu-module/templates/manifest_template.manifest
rename to devops/gc/bootstrap-osdu-module/templates/manifest_template.manifest
diff --git a/devops/gcp/bootstrap-osdu-module/validate-env.sh b/devops/gc/bootstrap-osdu-module/validate-env.sh
similarity index 100%
rename from devops/gcp/bootstrap-osdu-module/validate-env.sh
rename to devops/gc/bootstrap-osdu-module/validate-env.sh
diff --git a/devops/gcp/deploy/Chart.yaml b/devops/gc/deploy/Chart.yaml
similarity index 96%
rename from devops/gcp/deploy/Chart.yaml
rename to devops/gc/deploy/Chart.yaml
index e48b4c0c028e86b79b6a7781ef1f1f056f4aa2da..294e4885e2a828f8df23fe1a8615cb2ec3548a51 100644
--- a/devops/gcp/deploy/Chart.yaml
+++ b/devops/gc/deploy/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: gcp-policy-deploy
+name: gc-policy-deploy
 description: A Helm chart for Kubernetes
 
 # A chart can be either an 'application' or a 'library' chart.
@@ -21,4 +21,4 @@ version: 0.1.0
 # 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.18.0"
+appVersion: "1.19.0"
diff --git a/devops/gcp/deploy/README.md b/devops/gc/deploy/README.md
similarity index 98%
rename from devops/gcp/deploy/README.md
rename to devops/gc/deploy/README.md
index 2ac7a322b652747e4f71e03e0fb58750911ce8d7..2b0ac34b53d5322972c9a3c87274319ff00e36f2 100644
--- a/devops/gcp/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -100,7 +100,7 @@ First you need to set variables in **values.yaml** file using any code editor. S
 Run this command from within this directory:
 
 ```console
-helm install gcp-policy-deploy .
+helm install gc-policy-deploy .
 ```
 
 ## Uninstalling the Chart
@@ -108,7 +108,7 @@ helm install gcp-policy-deploy .
 To uninstall the helm deployment:
 
 ```console
-helm uninstall gcp-policy-deploy
+helm uninstall gc-policy-deploy
 ```
 
 [Move-to-Top](#gc-policy-service)
diff --git a/devops/gcp/deploy/templates/opa-configmap.yaml b/devops/gc/deploy/templates/opa-configmap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/opa-configmap.yaml
rename to devops/gc/deploy/templates/opa-configmap.yaml
diff --git a/devops/gcp/deploy/templates/opa-deployment.yaml b/devops/gc/deploy/templates/opa-deployment.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/opa-deployment.yaml
rename to devops/gc/deploy/templates/opa-deployment.yaml
diff --git a/devops/gcp/deploy/templates/opa-env-configmap.yaml b/devops/gc/deploy/templates/opa-env-configmap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/opa-env-configmap.yaml
rename to devops/gc/deploy/templates/opa-env-configmap.yaml
diff --git a/devops/gcp/deploy/templates/opa-service-account.yaml b/devops/gc/deploy/templates/opa-service-account.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/opa-service-account.yaml
rename to devops/gc/deploy/templates/opa-service-account.yaml
diff --git a/devops/gcp/deploy/templates/opa-service.yaml b/devops/gc/deploy/templates/opa-service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/opa-service.yaml
rename to devops/gc/deploy/templates/opa-service.yaml
diff --git a/devops/gcp/deploy/templates/opa-virtual-service.yaml b/devops/gc/deploy/templates/opa-virtual-service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/opa-virtual-service.yaml
rename to devops/gc/deploy/templates/opa-virtual-service.yaml
diff --git a/devops/gcp/deploy/templates/policy-configmap-bootstrap.yaml b/devops/gc/deploy/templates/policy-configmap-bootstrap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/policy-configmap-bootstrap.yaml
rename to devops/gc/deploy/templates/policy-configmap-bootstrap.yaml
diff --git a/devops/gcp/deploy/templates/policy-configmap.yaml b/devops/gc/deploy/templates/policy-configmap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/policy-configmap.yaml
rename to devops/gc/deploy/templates/policy-configmap.yaml
diff --git a/devops/gcp/deploy/templates/policy-deployment-bootstrap.yaml b/devops/gc/deploy/templates/policy-deployment-bootstrap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/policy-deployment-bootstrap.yaml
rename to devops/gc/deploy/templates/policy-deployment-bootstrap.yaml
diff --git a/devops/gcp/deploy/templates/policy-deployment.yaml b/devops/gc/deploy/templates/policy-deployment.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/policy-deployment.yaml
rename to devops/gc/deploy/templates/policy-deployment.yaml
diff --git a/devops/gcp/deploy/templates/policy-service-account.yaml b/devops/gc/deploy/templates/policy-service-account.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/policy-service-account.yaml
rename to devops/gc/deploy/templates/policy-service-account.yaml
diff --git a/devops/gcp/deploy/templates/policy-service.yaml b/devops/gc/deploy/templates/policy-service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/policy-service.yaml
rename to devops/gc/deploy/templates/policy-service.yaml
diff --git a/devops/gcp/deploy/templates/policy-virtual-service.yaml b/devops/gc/deploy/templates/policy-virtual-service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/policy-virtual-service.yaml
rename to devops/gc/deploy/templates/policy-virtual-service.yaml
diff --git a/devops/gcp/deploy/values.yaml b/devops/gc/deploy/values.yaml
similarity index 100%
rename from devops/gcp/deploy/values.yaml
rename to devops/gc/deploy/values.yaml
diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f97448e4bb13ed9bec92bbbf4c3f9c9d9926e87e
--- /dev/null
+++ b/devops/gc/pipeline/override-stages.yml
@@ -0,0 +1,48 @@
+variables:
+  BUILD_PATH: "build/$GC_VENDOR/Dockerfile"
+  BUILD_BOOTSTRAP_PATH: "devops/gc/bootstrap-osdu-module/Dockerfile"
+  GC_SERVICE: policy
+  GC_VENDOR: gc
+  GC_ENABLE_BOOTSTRAP: "true"
+  GC_INT_TEST_TYPE: python
+  GC_PYTHON_INT_TEST_SUBDIR: "app/tests/gc"
+  GC_ANTHOS_PYTHON_INT_TEST_SUBDIR: "app/tests/anthos"
+  # FIXME remove when all services are migrated to a single helm
+  GC_ENABLE_HELM_CONFIG: "false"
+
+# Workaround since tests by default extends .maven. Need it for tests when disabling other CSPs
+.maven:
+  variables:
+
+gc-test-python:
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
+  variables:
+    POLICY_BUCKET: $GC_POLICY_BUCKET
+    CLOUD_PROVIDER: gcp
+    OPA_URL: $GC_OPA_URL
+    ENTITLEMENTS_BASE_URL: $HOST
+    LEGAL_BASE_URL: $HOST
+    PARTITION_BASE_URL: $HOST
+
+gc-dev2-test-python:
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
+  variables:
+    POLICY_BUCKET: $GC_POLICY_BUCKET
+    CLOUD_PROVIDER: gcp
+    OPA_URL: $GC_OPA_URL
+    ENTITLEMENTS_BASE_URL: $HOST
+    LEGAL_BASE_URL: $HOST
+    PARTITION_BASE_URL: $HOST
+
+gc-anthos-test-python:
+  image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
+  variables:
+    POLICY_BUCKET: $GC_POLICY_BUCKET
+    CLOUD_PROVIDER: anthos
+    OPA_URL: $GC_OPA_URL
+    ENTITLEMENTS_BASE_URL: $HOST
+    LEGAL_BASE_URL: $HOST
+    PARTITION_BASE_URL: $HOST
+    MINIO_ENDPOINT: $TEST_MINIO_URL
+    MINIO_ACCESS_KEY: $TEST_MINIO_ACCESS_KEY
+    MINIO_SECRET_KEY: $GC_TEST_MINIO_SECRET_KEY
diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml
deleted file mode 100644
index 6ae934042875151683c6ca0f13eca1e78769f96d..0000000000000000000000000000000000000000
--- a/devops/gcp/pipeline/override-stages.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-variables:
-  BUILD_PATH: "build/$OSDU_GCP_VENDOR/Dockerfile"
-  BUILD_BOOTSTRAP_PATH: "devops/gcp/bootstrap-osdu-module/Dockerfile"
-  OSDU_GCP_SERVICE: policy
-  OSDU_GCP_VENDOR: gcp
-  OSDU_GCP_ENABLE_BOOTSTRAP: "true"
-  OSDU_GCP_INT_TEST_TYPE: python
-  OSDU_GCP_PYTHON_INT_TEST_SUBDIR: "app/tests/gcp"
-  OSDU_ANTHOS_PYTHON_INT_TEST_SUBDIR: "app/tests/anthos"
-  # FIXME remove when all services are migrated to a single helm
-  OSDU_GCP_ENABLE_HELM_CONFIG: "false"
-
-osdu-gcp-test-python:
-  image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
-  variables:
-    POLICY_BUCKET: $OSDU_GCP_POLICY_BUCKET
-    CLOUD_PROVIDER: $OSDU_GCP_VENDOR
-    OPA_URL: $OSDU_GCP_OPA_URL
-    ENTITLEMENTS_BASE_URL: $HOST
-    LEGAL_BASE_URL: $HOST
-    PARTITION_BASE_URL: $HOST
-
-osdu-gcp-dev2-test-python:
-  image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
-  variables:
-    POLICY_BUCKET: $OSDU_GCP_POLICY_BUCKET
-    CLOUD_PROVIDER: $OSDU_GCP_VENDOR
-    OPA_URL: $OSDU_GCP_OPA_URL
-    ENTITLEMENTS_BASE_URL: $HOST
-    LEGAL_BASE_URL: $HOST
-    PARTITION_BASE_URL: $HOST
-
-osdu-gcp-anthos-test-python:
-  image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
-  variables:
-    POLICY_BUCKET: $OSDU_GCP_POLICY_BUCKET
-    CLOUD_PROVIDER: anthos
-    OPA_URL: $OSDU_GCP_OPA_URL
-    ENTITLEMENTS_BASE_URL: $HOST
-    LEGAL_BASE_URL: $HOST
-    PARTITION_BASE_URL: $HOST
-    MINIO_ENDPOINT: $TEST_MINIO_URL
-    MINIO_ACCESS_KEY: $TEST_MINIO_ACCESS_KEY
-    MINIO_SECRET_KEY: $OSDU_GCP_TEST_MINIO_SECRET_KEY