diff --git a/.fossa.yml b/.fossa.yml
index 954498fc123efa63377e1e1c2dadb6aadb71362d..245a0c912c8304ba1cc9b40deda4e4249d300f5c 100644
--- a/.fossa.yml
+++ b/.fossa.yml
@@ -8,27 +8,27 @@ cli:
   project: Notification
 analyze:
   modules:
-  - name: os-notification
-    type: mvn
-    target: pom.xml
-    path: .
-  - name: notification-core
-    type: mvn
-    target: notification-core/pom.xml
-    path: .
-  - name: notification-gcp
-    type: mvn
-    target: provider/notification-gcp/pom.xml
-    path: .
-  - name: notification-azure
-    type: mvn
-    target: provider/notification-azure/pom.xml
-    path: .
-  - name: notification-ibm
-    type: mvn
-    target: provider/notification-ibm/pom.xml
-    path: .
-  - name: notification-aws
-    type: mvn
-    target: provider/notification-aws/pom.xml
-    path: .
+    - name: os-notification
+      type: mvn
+      target: pom.xml
+      path: .
+    - name: notification-core
+      type: mvn
+      target: notification-core/pom.xml
+      path: .
+    - name: notification-gc
+      type: mvn
+      target: provider/notification-gc/pom.xml
+      path: .
+    - name: notification-azure
+      type: mvn
+      target: provider/notification-azure/pom.xml
+      path: .
+    - name: notification-ibm
+      type: mvn
+      target: provider/notification-ibm/pom.xml
+      path: .
+    - name: notification-aws
+      type: mvn
+      target: provider/notification-aws/pom.xml
+      path: .
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 062e195b481530863993227d7d28dd565313228b..4ac3f5f533a0b1ec8b79775e0fdf33b55c8cb948 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,9 +19,6 @@ variables:
   IBM_HELM_CONFIG_PATH: devops/ibm/ibm-notification-config
   IBM_HELM_DEPLOY_PATH: devops/ibm/ibm-notification-deploy
 
-  # FIXME remove when all services are migrated to a single helm
-  OSDU_GCP_ENABLE_HELM_CONFIG: "false"
-
 include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "standard-setup.yml"
@@ -39,7 +36,7 @@ include:
     file: "cloud-providers/azure.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
-    file: "cloud-providers/osdu-gcp-global.yml"
+    file: "cloud-providers/gc-global.yml"
 
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/aws-global.yml"
@@ -50,4 +47,4 @@ include:
   - project: "osdu/platform/ci-cd-pipelines"
     file: "cloud-providers/ibm.yml"
 
-  - local: "devops/gcp/pipeline/override-stages.yml"
+  - local: "devops/gc/pipeline/override-stages.yml"
diff --git a/README.md b/README.md
index 40700bd1d24c1de09cb6a4fa8e0d88f1a86194a9..39e9ca1d697f42bc9eba73e035ee4f48926ddbb0 100644
--- a/README.md
+++ b/README.md
@@ -16,42 +16,48 @@ limitations under the License.
 
 The Notification service, with Register service, allow interested consumers to subscribe to data and metadata changes using a publisher/subscriber pattern
 
-##Dependencies needed to run the code locally 
+## Dependencies needed to run the code locally
+
 * JDK11
 * Maven
 * Azure Devops access to slb-des-ext-collaboration organization. You need to generate a PAT that can access dependencies held in the Azure artifacts
 * Working Register service endpoint
 
 ## Build and run service locally
+
 * Build the service and run the unit tests. This step also generates the executable jar file. Run this command from the root folder, where parent pom.xml resides
 
 **Note**: At runtime, you must set a Spring profile so the right runtime configuration gets picked up for your app. Since this is a Spring Boot application, runtime configuration is defined in one of the application properties files under `<provider>->src->main->resources`. You can set the right Spring Boot runtime profile with `-Dspring.profiles.active=test`. Please read [this](https://stackoverflow.com/questions/39738901/how-do-i-activate-a-spring-boot-profile-when-running-from-intellij) for more info.
+
 ```
 mvn clean install
 ```
 
 * To run the service locally, navigate to `provider/notification-<your_provider>/target` directory and execute the spring-boot jar
+
 ```
-java -jar notification-gcp-1.0.0-spring-boot.jar
+java -jar notification-gc-1.0.0-spring-boot.jar
 ```
 
 * To debug service locally, create a remote debug configuration first and then use following command to start service in debug mode
+
 ```
-java -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -jar notification-gcp-1.0.0-spring-boot.jar
+java -Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8000,suspend=n -jar notification-gc-1.0.0-spring-boot.jar
 ```
-    
+
 **Note:**  The port number "8000" in the command should match with the remote debug config settings.
 
-## Access the service:
+## Access the service
+
+The port and path for the service endpoint can be configured in ```application.properties``` as following. If not specified, then  the web container (ex. Tomcat) default is used:
 
-The port and path for the service endpoint can be configured in ```application.properties``` as following. If not specified, then  the web container (ex. Tomcat) default is used: 
 ```bash
 server.servlet.contextPath=/
 server.port=8080
 ```
-# new update
 
+# new update
 
 ## AWS
 
-Instructions for running and testing this service can be found [here](./provider/notification-aws/README.md)
\ No newline at end of file
+Instructions for running and testing this service can be found [here](./provider/notification-aws/README.md)
diff --git a/devops/gcp/deploy/Chart.yaml b/devops/gc/deploy/Chart.yaml
similarity index 95%
rename from devops/gcp/deploy/Chart.yaml
rename to devops/gc/deploy/Chart.yaml
index ef8338da0cf56eaadbf1aaee05d2a3fdcff24f1c..6c22c9bcc61366a660853ac879003174c65c885b 100644
--- a/devops/gcp/deploy/Chart.yaml
+++ b/devops/gc/deploy/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: gcp-notification-deploy
+name: gc-notification-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.16.0"
+appVersion: "1.19.0"
diff --git a/devops/gcp/deploy/README.md b/devops/gc/deploy/README.md
similarity index 97%
rename from devops/gcp/deploy/README.md
rename to devops/gc/deploy/README.md
index d3cfe7b1b63812ebbaac0054d91f0b0789e512e9..3a58224f7afea77d7f94003ede3c23e10f42e827 100644
--- a/devops/gcp/deploy/README.md
+++ b/devops/gc/deploy/README.md
@@ -1,81 +1,81 @@
-<!--- 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
-
-Before installing deploy Helm chart you need to install [configmap Helm chart](../configmap).
-First you need to set variables in **values.yaml** file using any code editor. Some of the values are prefilled, but you need to specify some values as well. You can find more information about them below.
-
-### Configmap variables
-
-| Name | Description | Type | Default |Required |
-|------|-------------|------|---------|---------|
-**logLevel** | logging level | string | INFO | yes
-**springProfilesActive** | active spring profile | string | gcp | yes
-**entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes
-**registerHost** | register service host address | string | `http://register` | yes
-**partitionHost** | partition service host address | string | `http://partition` | yes
-
-### Deployment variables
-
-| Name | Description | Type | Default |Required |
-|------|-------------|------|---------|---------|
-**requestsCpu** | amount of requested CPU | string | `0.1` | yes
-**requestsMemory** | amount of requested memory| string | `256M` | yes
-**limitsCpu** | CPU limit | string | `1` | yes
-**limitsMemory** | memory limit | string | `1.5G` | yes
-**serviceAccountName** | name of your service account | string | `notification` | yes
-**imagePullPolicy** | when to pull image | string | `IfNotPresent` | yes
-**image** | service image | string | - | yes
-
-### Config variables
-
-| Name | Description | Type | Default |Required |
-|------|-------------|------|---------|---------|
-**appName** | Service name | string | `notification` | yes
-**configmap** | configmap to be used | string | `notification-config` | yes
-**rabbitmqSecretName** | secret for rabbitmq | string | `rabbitmq-secret` | yes
-**openidSecretName** | secret for openid | string | `notification-keycloak-secret` | yes
-**onPremEnabled** | whether on-prem is enabled | boolean | false | yes
-**domain** | your domain, ex `example.com` | string | - | yes
-
-### Install the helm chart
-
-Run this command from within this directory:
-
-```console
-helm install gcp-notification-deploy .
-```
-
-## Uninstalling the Chart
-
-To uninstall the helm deployment:
-
-```console
-helm uninstall gcp-notification-deploy
-```
-
-> Do not forget to delete all k8s secrets and PVCs accociated with the Service.
-
-[Move-to-Top](#deploy-helm-chart)
+<!--- 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
+
+Before installing deploy Helm chart you need to install [configmap Helm chart](../configmap).
+First you need to set variables in **values.yaml** file using any code editor. Some of the values are prefilled, but you need to specify some values as well. You can find more information about them below.
+
+### Configmap variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**logLevel** | logging level | string | INFO | yes
+**springProfilesActive** | active spring profile | string | gcp | yes
+**entitlementsHost** | entitlements service host address | string | `http://entitlements` | yes
+**registerHost** | register service host address | string | `http://register` | yes
+**partitionHost** | partition service host address | string | `http://partition` | yes
+
+### Deployment variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**requestsCpu** | amount of requested CPU | string | `0.1` | yes
+**requestsMemory** | amount of requested memory| string | `256M` | yes
+**limitsCpu** | CPU limit | string | `1` | yes
+**limitsMemory** | memory limit | string | `1.5G` | yes
+**serviceAccountName** | name of your service account | string | `notification` | yes
+**imagePullPolicy** | when to pull image | string | `IfNotPresent` | yes
+**image** | service image | string | - | yes
+
+### Config variables
+
+| Name | Description | Type | Default |Required |
+|------|-------------|------|---------|---------|
+**appName** | Service name | string | `notification` | yes
+**configmap** | configmap to be used | string | `notification-config` | yes
+**rabbitmqSecretName** | secret for rabbitmq | string | `rabbitmq-secret` | yes
+**openidSecretName** | secret for openid | string | `notification-keycloak-secret` | yes
+**onPremEnabled** | whether on-prem is enabled | boolean | false | yes
+**domain** | your domain, ex `example.com` | string | - | yes
+
+### Install the helm chart
+
+Run this command from within this directory:
+
+```console
+helm install gcp-notification-deploy .
+```
+
+## Uninstalling the Chart
+
+To uninstall the helm deployment:
+
+```console
+helm uninstall gcp-notification-deploy
+```
+
+> Do not forget to delete all k8s secrets and PVCs accociated with the Service.
+
+[Move-to-Top](#deploy-helm-chart)
diff --git a/devops/gcp/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/configmap.yaml
rename to devops/gc/deploy/templates/configmap.yaml
diff --git a/devops/gcp/deploy/templates/deployment.yaml b/devops/gc/deploy/templates/deployment.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/deployment.yaml
rename to devops/gc/deploy/templates/deployment.yaml
diff --git a/devops/gcp/deploy/templates/service-account.yaml b/devops/gc/deploy/templates/service-account.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/service-account.yaml
rename to devops/gc/deploy/templates/service-account.yaml
diff --git a/devops/gcp/deploy/templates/service.yaml b/devops/gc/deploy/templates/service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/service.yaml
rename to devops/gc/deploy/templates/service.yaml
diff --git a/devops/gcp/deploy/templates/virtual-service.yaml b/devops/gc/deploy/templates/virtual-service.yaml
similarity index 100%
rename from devops/gcp/deploy/templates/virtual-service.yaml
rename to devops/gc/deploy/templates/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..78f557fecbe1aad97f0f654703e6d5fe44a6e639
--- /dev/null
+++ b/devops/gc/pipeline/override-stages.yml
@@ -0,0 +1,20 @@
+variables:
+  GC_SERVICE: notification
+  GC_VENDOR: gc
+  # FIXME remove when all services are migrated to a single helm
+  GC_ENABLE_HELM_CONFIG: "false"
+
+gc-test:
+  variables:
+    ENVIRONMENT: $GC_ENVIRONMENT
+    REGISTER_BASE_URL: $GC_REGISTER_BASE_URL
+
+gc-dev2-test:
+  variables:
+    ENVIRONMENT: $GC_ENVIRONMENT
+    REGISTER_BASE_URL: $GC_REGISTER_BASE_URL
+
+gc-anthos-test:
+  variables:
+    REGISTER_BASE_URL: $GC_REGISTER_BASE_URL
+    GC_VENDOR: anthos
diff --git a/devops/gcp/pipeline/override-stages.yml b/devops/gcp/pipeline/override-stages.yml
deleted file mode 100644
index ae54fdae554acc02d4262150b94cdf247988eac8..0000000000000000000000000000000000000000
--- a/devops/gcp/pipeline/override-stages.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-variables:
-  OSDU_GCP_SERVICE: notification
-  OSDU_GCP_VENDOR: gcp
-
-osdu-gcp-test:
-  variables:
-    ENVIRONMENT: $OSDU_GCP_ENVIRONMENT
-    REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL
-
-osdu-gcp-dev2-test:
- variables:
-   ENVIRONMENT: $OSDU_GCP_ENVIRONMENT
-   REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL
-
-osdu-gcp-anthos-test:
-  variables:
-    REGISTER_BASE_URL: $OSDU_GCP_REGISTER_BASE_URL
-    OSDU_GCP_VENDOR: anthos
diff --git a/pom.xml b/pom.xml
index 29ee7e79c9727ea01a67e4b0058ed9f97881f1fa..1c8565baa144be7409ed1aba920dafb3a5069a2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,7 +134,7 @@
 
 	<modules>
 		<module>notification-core</module>
-		<module>provider/notification-gcp</module>
+		<module>provider/notification-gc</module>
 		<module>provider/notification-azure</module>
 		<module>provider/notification-ibm</module>
 		<module>provider/notification-aws</module>
diff --git a/provider/notification-gcp/README.md b/provider/notification-gc/README.md
similarity index 79%
rename from provider/notification-gcp/README.md
rename to provider/notification-gc/README.md
index 8e437e00d5e0868d60d4f70e14b9a8ec41102c78..91543f3300503859ef1c2be8e2b4e401a05f7a7a 100644
--- a/provider/notification-gcp/README.md
+++ b/provider/notification-gc/README.md
@@ -1,7 +1,9 @@
 # Notification Service
-notification-gcp is a [Spring Boot](https://spring.io/projects/spring-boot) service that allow for interested consumers to subscribe to data and metadata changes using a publish/subscriber pattern.
+
+notification-gc is a [Spring Boot](https://spring.io/projects/spring-boot) service that allow for interested consumers to subscribe to data and metadata changes using a publish/subscriber pattern.
 
 ## Table of Contents <a name="TOC"></a>
+
 * [Getting started](#Getting-started)
 * [Mappers](#Mappers)
 * [Settings and Configuration](#Settings-and-Configuration)
@@ -11,40 +13,47 @@ notification-gcp is a [Spring Boot](https://spring.io/projects/spring-boot) serv
 * [Licence](#License)
 
 ## Getting Started
+
 These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
 
 ## Mappers
+
 This is a universal solution created using EPAM OQM mapper technology.
 It allows you to work with various implementations of message brokers.
 
 For more information about mappers:
-- [OQM Readme](https://community.opengroup.org/osdu/platform/system/lib/cloud/gcp/oqm/-/blob/master/README.md)
+* [OQM Readme](https://community.opengroup.org/osdu/platform/system/lib/cloud/gcp/oqm/-/blob/master/README.md)
 
 In the current version, the OQM mapper is equipped with 2 drivers to the message brokers:
-- Google PubSub;
-- RabbitMQ
+* Google PubSub;
+* RabbitMQ
 
 ## Settings and Configuration
 
 #### Requirements
 
 1. Mandatory
-   - Java 8
+   * Java 8
    -[Maven 3.6.0+](https://maven.apache.org/download.cgi)
 
 2. For Google Cloud only
-   - GCloud command line tool
-   - GCloud access to opendes project
+   * GCloud command line tool
+   * GCloud access to opendes project
+
+### Anthos Service Configuration
+
+[Anthos service configuration](docs/anthos/README.md)
 
-### Anthos Service Configuration:
-[Anthos service configuration ](docs/anthos/README.md)
-### Google Cloud Service Configuration:
-[Google Cloud service configuration ](docs/gcp/README.md)
+### Google Cloud Service Configuration
+
+[Google Cloud service configuration](docs/gc/README.md)
 
 ## Run service
 
 ### Running Locally
+
 Check that maven is installed:
+
 ```bash
 $ mvn --version
 Apache Maven 3.6.0
@@ -77,6 +86,7 @@ $ cat ~/.m2/settings.xml
 ```bash
 gcloud components update
 ```
+
 * Set Google Project Id:
 
 ```bash
@@ -111,40 +121,45 @@ mvn clean install -DskipTests
 After configuring your environment as specified above, you can follow these steps to build and run the application. These steps should be invoked from the *repository root.*
 
 ```bash
-cd provider/notification-gcp/ && mvn spring-boot:run -Dspring-boot.run.profiles=local 
+cd provider/notification-gc/ && mvn spring-boot:run -Dspring-boot.run.profiles=local 
 ```
 
 ## Testing
 
-#### Anthos:
+#### Anthos
+
 [Anthos Testing](docs/anthos/README.md)
-#### Google Cloud:
-[Google Cloud Testing](docs/gcp/README.md)
+
+#### Google Cloud
+
+[Google Cloud Testing](docs/gc/README.md)
 
 ## Tutorial
 
-- [Notification OpenAPI specification ](../../docs/api/notification_openapi.yaml)
-- [Notification tutorial ](../../docs/tutorial/DataNotification.md)
+* [Notification OpenAPI specification](../../docs/api/notification_openapi.yaml)
+* [Notification tutorial](../../docs/tutorial/DataNotification.md)
 
 ## Entitlements groups
+
 Notification service account should have entitlements groups listed below:
-- users
-- users.datalake.editors
-- service.entitlements.user
+* users
+* users.datalake.editors
+* service.entitlements.user
 
 ## License
+
 Copyright © Google LLC
 
 Copyright © EPAM Systems
- 
+
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
- 
+
 [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
- 
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/provider/notification-gcp/cloudbuild/Dockerfile.cloudbuild b/provider/notification-gc/cloudbuild/Dockerfile.cloudbuild
similarity index 100%
rename from provider/notification-gcp/cloudbuild/Dockerfile.cloudbuild
rename to provider/notification-gc/cloudbuild/Dockerfile.cloudbuild
diff --git a/provider/notification-gcp/cloudbuild/cloudbuild.yaml b/provider/notification-gc/cloudbuild/cloudbuild.yaml
similarity index 51%
rename from provider/notification-gcp/cloudbuild/cloudbuild.yaml
rename to provider/notification-gc/cloudbuild/cloudbuild.yaml
index 43e8b4623ed64c4343eeba5d13eb364761902a7b..61563cdfab89df5b11a8244e9f14614472fc013e 100644
--- a/provider/notification-gcp/cloudbuild/cloudbuild.yaml
+++ b/provider/notification-gc/cloudbuild/cloudbuild.yaml
@@ -15,16 +15,22 @@
 # limitations under the License.
 
 steps:
-  - name: 'gcr.io/cloud-builders/docker'
-    args: [
-      'build',
-      '--build-arg', 'PROVIDER_NAME=${_PROVIDER_NAME}',
-      '--build-arg', 'PORT=${_PORT}',
-      '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}',
-      '-t', 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}:latest',
-      '-f', 'provider/${_GCP_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild',
-      '.'
-    ]
+  - name: "gcr.io/cloud-builders/docker"
+    args:
+      [
+        "build",
+        "--build-arg",
+        "PROVIDER_NAME=${_PROVIDER_NAME}",
+        "--build-arg",
+        "PORT=${_PORT}",
+        "-t",
+        "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}:${_SHORT_SHA}",
+        "-t",
+        "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}:latest",
+        "-f",
+        "provider/${_GC_SERVICE}-${_PROVIDER_NAME}/cloudbuild/Dockerfile.cloudbuild",
+        ".",
+      ]
 
 images:
-  - 'gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GCP_SERVICE}-${_PROVIDER_NAME}'
+  - "gcr.io/$PROJECT_ID/${_APPLICATION_NAME}/${_GC_SERVICE}-${_PROVIDER_NAME}"
diff --git a/provider/notification-gcp/docs/anthos/README.md b/provider/notification-gc/docs/anthos/README.md
similarity index 97%
rename from provider/notification-gcp/docs/anthos/README.md
rename to provider/notification-gc/docs/anthos/README.md
index b9c1c9b00a393e115d9c9265c353652ed5489f03..62bc58a79d23fa297855ce402123206127a0167c 100644
--- a/provider/notification-gcp/docs/anthos/README.md
+++ b/provider/notification-gc/docs/anthos/README.md
@@ -48,6 +48,7 @@
 After the service has started it should be accessible via a web browser by visiting [http://localhost:8080/api/notification/v1/swagger-ui.html](http://localhost:8080/swagger-ui.html). If the request does not fail, you can then run the integration tests.
 
 ### Dependencies needed to run the integration tests
+
 * Java 8
 * Maven
 * Values for the following environment variables in Config.java
@@ -63,31 +64,33 @@ After the service has started it should be accessible via a web browser by visit
 | `TEST_NO_ACCESS_OPENID_PROVIDER_CLIENT_ID` | `********` | Client Id for `DE_NO_ACCESS_TESTER` | yes | -- |
 | `TEST_NO_ACCESS_OPENID_PROVIDER_CLIENT_SECRET` | `********` |  | Client secret for `DE_NO_ACCESS_TESTER` | yes | -- |
 | `TEST_OPENID_PROVIDER_URL` | `https://keycloak.com/auth/realms/osdu` | OpenID provider url | yes | -- |
-| `ENVIRONMENT` | `dev` OR `local` OR `dev_gke`| Local for running locally with services url's predefined as http://localhost , Dev & Dev_Gke is configurable environment | no | - |
+| `ENVIRONMENT` | `dev` OR `local` OR `dev_gke`| Local for running locally with services url's predefined as <http://localhost> , Dev & Dev_Gke is configurable environment | no | - |
 | `HMAC_SECRET` | ex`7a786376626e` | String in hex , must match pattern ^[a-zA-Z0-9]{8,30}+$ & be in register variable SUBSCRIBER_SECRET | yes | - |
 | `REGISTER_BASE_URL` | `http://localhost:8081/api/register/v1` | Register service url | no | - |
 | `NOTIFICATION_BASE_URL` | `http://localhost:8080/api/notification/v1/` | Notification service url  | no | - |
 | `CLIENT_TENANT` | ex `opendes` | Client tenant | no | - |
 | `OSDU_TENANT` | ex `osdu` | osdu tenant | no | - |
-| `TOPIC_ID` | ex `records-changed` | PubSub topic id | no | https://console.cloud.google.com/cloudpubsub/topic |
+| `TOPIC_ID` | ex `records-changed` | PubSub topic id | no | <https://console.cloud.google.com/cloudpubsub/topic> |
 | `REGISTER_CUSTOM_PUSH_URL_HMAC` | ex `http://localhost:8081/api/register/v1/test/challenge/hmac-integration-test` | Register testing push url | no | - |
 
 **Entitlements configuration for integration accounts**
 
-| DE_OPS_TESTER | DE_ADMIN_TESTER | DE_EDITOR_TESTER | DE_NO_ACCESS_TESTER | 
+| DE_OPS_TESTER | DE_ADMIN_TESTER | DE_EDITOR_TESTER | DE_NO_ACCESS_TESTER |
 | ---  | ---   | ---  | ---   |
 |notification.pubsub<br/>service.entitlements.user<br/>users<br/>users.datalake.ops</br>| service.entitlements.user<br/>users<br/>users.datalake.admins</br> | service.entitlements.user<br/>users<br/>users.datalake.editors</br> | service.entitlements.user<br/>users<br/>|
 
 Above variables should be configured in the release pipeline to run integration tests. You should also replace them with proper values if you wish to run tests locally.
 
 ### Commands to run tests
+
 * Integration tests are refactored into two pieces: Core and Provider. Core contains business logic for tests and is a dependency for executing the tests from provider module. To build the core module, simply navigate to `notification-test-core` directory and run `mvn clean install`. This will build the core module
 * Next, to execute the integration tests, navigate to the provider module and execute `mvn test`
+
 ```bash
 # (cd testing/notification-test-core/ && mvn clean install)
 # Note: this assumes that the environment variables for integration tests as outlined
 #       above are already exported in your environment.
-$ (cd testing/notification-test-gcp/ && mvn clean test)
+$ (cd testing/notification-test-gc/ && mvn clean test)
 ```
 
 Navigate to notification service's root folder and run all the tests:
diff --git a/provider/notification-gcp/docs/anthos/pics/client.png b/provider/notification-gc/docs/anthos/pics/client.png
similarity index 100%
rename from provider/notification-gcp/docs/anthos/pics/client.png
rename to provider/notification-gc/docs/anthos/pics/client.png
diff --git a/provider/notification-gcp/docs/anthos/pics/rabbit.PNG b/provider/notification-gc/docs/anthos/pics/rabbit.PNG
similarity index 100%
rename from provider/notification-gcp/docs/anthos/pics/rabbit.PNG
rename to provider/notification-gc/docs/anthos/pics/rabbit.PNG
diff --git a/provider/notification-gcp/docs/anthos/pics/sa.png b/provider/notification-gc/docs/anthos/pics/sa.png
similarity index 100%
rename from provider/notification-gcp/docs/anthos/pics/sa.png
rename to provider/notification-gc/docs/anthos/pics/sa.png
diff --git a/provider/notification-gcp/docs/gcp/README.md b/provider/notification-gc/docs/gc/README.md
similarity index 85%
rename from provider/notification-gcp/docs/gcp/README.md
rename to provider/notification-gc/docs/gc/README.md
index 4410de7f11253a29a1c1fc8562585a4bc7e92625..0f65c275f188cf007b58e9552cd8769f085d2231 100644
--- a/provider/notification-gcp/docs/gcp/README.md
+++ b/provider/notification-gc/docs/gc/README.md
@@ -1,10 +1,11 @@
 # Service Configuration for Google Cloud
 
 ## Table of Contents <a name="TOC"></a>
-* [Environment variables](#Environment-variables)
-* [Common properties for all environments](#Common-properties-for-all-environments)
-* [For Mappers to activate drivers](#For-Mappers-to-activate-drivers)
-* [For Google Cloud only](#For-Google-Cloud-only)
+
+* [Environment variables](#environment-variables)
+* [Common properties for all environments](#common-properties-for-all-environments)
+* [For Mappers to activate drivers](#for-mappers-to-activate-drivers)
+* [For Google Cloud only](#for-google-cloud-only)
 * [GCS configuration](#GCS-configuration)
 * [Google cloud service account configuration](#Google-cloud-service-account-configuration)
 
@@ -32,13 +33,14 @@
 | OQMDRIVER | pubsub    | to activate **OQM** driver for **Google PubSub**        |
 | OQMDRIVER | rabbitmq  | to activate **OQM** driver for **Rabbit MQ**            |
 
-
 #### For Google Cloud only
+
 | name                         | value                                 | description                                                        | sensitive? | source                                            |
 |------------------------------|---------------------------------------|--------------------------------------------------------------------|------------|---------------------------------------------------|
 | `APP_PROJECT` | ex `opendes` | Google Cloud Project Id | no | output of infrastructure deployment |
 
 ##### service account IAM roles
+
 Also, the following IAM roles should be assigned to the service's Google service account (SA)
 
 | IAM role | The purpose                                                                   |
@@ -46,48 +48,50 @@ Also, the following IAM roles should be assigned to the service's Google service
 | Service Account Token Creator | To write yourself JWT for requesting neighbor microservices                   |
 | Pub/Sub Editor | To fetch available PubSub topics and subscriptions and be able to create them |
 
-
 ## Testing
 
 After the service has started it should be accessible via a web browser by visiting [http://localhost:8080/api/notification/v1/swagger-ui.html](http://localhost:8080/swagger-ui.html). If the request does not fail, you can then run the integration tests.
 
 ### Dependencies needed to run the integration tests
+
 * Java 8
 * Maven
 * Values for the following environment variables in Config.java
 
 | name | value | description | sensitive? | source |
 | ---  | ---   | ---         | ---        | ---    |
-| `DE_OPS_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already, also **Private key id** of this account must be set in Register service variable SUBSCRIBER_PRIVATE_KEY_ID  | yes | https://console.cloud.google.com/iam-admin/serviceaccounts |
-| `DE_ADMIN_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already | yes | https://console.cloud.google.com/iam-admin/serviceaccounts |
-| `DE_EDITOR_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already  | yes | https://console.cloud.google.com/iam-admin/serviceaccounts |
-| `DE_NO_ACCESS_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already | yes | https://console.cloud.google.com/iam-admin/serviceaccounts |
-| `ENVIRONMENT` | `dev` OR `local` OR `dev_gke`| Local for running locally with services url's predefined as http://localhost , Dev & Dev_Gke is configurable environment | no | - |
+| `DE_OPS_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already, also **Private key id** of this account must be set in Register service variable SUBSCRIBER_PRIVATE_KEY_ID  | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
+| `DE_ADMIN_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
+| `DE_EDITOR_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already  | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
+| `DE_NO_ACCESS_TESTER` | `*****` | Service account base64 encoded string for API calls. Note: this user must have entitlements configured already | yes | <https://console.cloud.google.com/iam-admin/serviceaccounts> |
+| `ENVIRONMENT` | `dev` OR `local` OR `dev_gke`| Local for running locally with services url's predefined as <http://localhost> , Dev & Dev_Gke is configurable environment | no | - |
 | `HMAC_SECRET` | ex`7a786376626e` | String in hex , must match pattern ^[a-zA-Z0-9]{8,30}+$ & be in register variable SUBSCRIBER_SECRET | yes | - |
 | `REGISTER_BASE_URL` | `http://localhost:8081/api/register/v1` | Register service url | no | - |
 | `NOTIFICATION_BASE_URL` | `http://localhost:8080/api/notification/v1/` | Notification service url  | no | - |
 | `CLIENT_TENANT` | ex `opendes` | Client tenant | no | - |
 | `OSDU_TENANT` | ex `osdu` | osdu tenant | no | - |
-| `TOPIC_ID` | ex `records-changed` | PubSub topic id | no | https://console.cloud.google.com/cloudpubsub/topic |
+| `TOPIC_ID` | ex `records-changed` | PubSub topic id | no | <https://console.cloud.google.com/cloudpubsub/topic> |
 | `REGISTER_CUSTOM_PUSH_URL_HMAC` | ex `http://localhost:8081/api/register/v1/test/challenge/hmac-integration-test` | Register testing push url | no | - |
 
 **Entitlements configuration for integration accounts**
 
-| DE_OPS_TESTER | DE_ADMIN_TESTER | DE_EDITOR_TESTER | DE_NO_ACCESS_TESTER | 
+| DE_OPS_TESTER | DE_ADMIN_TESTER | DE_EDITOR_TESTER | DE_NO_ACCESS_TESTER |
 | ---  | ---   | ---  | ---   |
 |notification.pubsub<br/>service.entitlements.user<br/>users<br/>users.datalake.ops</br>| service.entitlements.user<br/>users<br/>users.datalake.admins</br> | service.entitlements.user<br/>users<br/>users.datalake.editors</br> | service.entitlements.user<br/>users<br/>|
 
 Above variables should be configured in the release pipeline to run integration tests. You should also replace them with proper values if you wish to run tests locally.
 
 ### Commands to run tests
+
 * Integration tests are refactored into two pieces: Core and Provider. Core contains business logic for tests and is a dependency for executing the tests from provider module. To build the core module, simply navigate to `notification-test-core` directory and run `mvn clean install`. This will build the core module
 * Next, to execute the integration tests, navigate to the provider module and execute `mvn test`
-* 
+*
+
 ```bash
 # (cd testing/notification-test-core/ && mvn clean install)
 # Note: this assumes that the environment variables for integration tests as outlined
 #       above are already exported in your environment.
-$ (cd testing/notification-test-gcp/ && mvn clean test)
+$ (cd testing/notification-test-gc/ && mvn clean test)
 ```
 
 Navigate to notification service's root folder and run all the tests:
@@ -97,7 +101,7 @@ Navigate to notification service's root folder and run all the tests:
 $ (cd notification-core/ && mvn clean install)
 ```
 
-## PubSub configuration:
+## PubSub configuration
 
 At PubSub should be created topic with name:
 
@@ -105,5 +109,5 @@ At PubSub should be created topic with name:
 
 It can be overridden by:
 
-- through the Spring Boot property `oqm-register-subscriber-control-topic-name`
-- environment variable `OQM_REGISTER_SUBSCRIBER_CONTROL_TOPIC_NAME`
\ No newline at end of file
+* through the Spring Boot property `oqm-register-subscriber-control-topic-name`
+* environment variable `OQM_REGISTER_SUBSCRIBER_CONTROL_TOPIC_NAME`
diff --git a/provider/notification-gcp/docs/gcp/pics/namespace.PNG b/provider/notification-gc/docs/gc/pics/namespace.PNG
similarity index 100%
rename from provider/notification-gcp/docs/gcp/pics/namespace.PNG
rename to provider/notification-gc/docs/gc/pics/namespace.PNG
diff --git a/provider/notification-gcp/pom.xml b/provider/notification-gc/pom.xml
similarity index 97%
rename from provider/notification-gcp/pom.xml
rename to provider/notification-gc/pom.xml
index ca049f724cf099f01e0e7b68591b58c83bd24661..c535b02dbaed652343720369b862814c97eb5bc9 100644
--- a/provider/notification-gcp/pom.xml
+++ b/provider/notification-gc/pom.xml
@@ -17,10 +17,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opengroup.osdu</groupId>
-    <artifactId>notification-gcp</artifactId>
+    <artifactId>notification-gc</artifactId>
     <version>0.19.0-SNAPSHOT</version>
-    <name>notification-gcp</name>
-    <description>GCP implementation for Notification service</description>
+    <name>notification-gc</name>
+    <description>Google Cloud implementation for Notification service</description>
     <packaging>jar</packaging>
 
     <parent>
diff --git a/provider/notification-gcp/src/main/appengine/app.dev.yaml b/provider/notification-gc/src/main/appengine/app.dev.yaml
similarity index 100%
rename from provider/notification-gcp/src/main/appengine/app.dev.yaml
rename to provider/notification-gc/src/main/appengine/app.dev.yaml
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/Application.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/Application.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/Application.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/Application.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/AppProperties.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/AppProperties.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/AppProperties.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/AppProperties.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/OqmConfigurationProperties.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/OqmConfigurationProperties.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/OqmConfigurationProperties.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/OqmConfigurationProperties.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManager.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManager.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManager.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManager.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubHandshakeHandler.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubRequestBodyExtractor.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubRequestBodyExtractor.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubRequestBodyExtractor.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/PubsubRequestBodyExtractor.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmNotificationHandler.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmNotificationHandler.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmNotificationHandler.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmNotificationHandler.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSignatureService.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionCacheFactory.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionCacheFactory.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionCacheFactory.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionCacheFactory.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionHandler.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionHandler.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionHandler.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/OqmSubscriptionHandler.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/README.md b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/README.md
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/README.md
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/di/README.md
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/SecurityConfig.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/SecurityConfig.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/SecurityConfig.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/security/SecurityConfig.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountImpl.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountImpl.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountImpl.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountImpl.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorGenerator.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorGenerator.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorGenerator.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorGenerator.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorImpl.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorImpl.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorImpl.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/GoogleServiceAccountValidatorImpl.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/JwtValidity.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/JwtValidity.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/JwtValidity.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/JwtValidity.java
diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java
similarity index 100%
rename from provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java
rename to provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/util/ServiceAccountJwtGcpClientImpl.java
diff --git a/provider/notification-gcp/src/main/resources/application-anthos.properties b/provider/notification-gc/src/main/resources/application-anthos.properties
similarity index 100%
rename from provider/notification-gcp/src/main/resources/application-anthos.properties
rename to provider/notification-gc/src/main/resources/application-anthos.properties
diff --git a/provider/notification-gcp/src/main/resources/application-gcp.properties b/provider/notification-gc/src/main/resources/application-gcp.properties
similarity index 100%
rename from provider/notification-gcp/src/main/resources/application-gcp.properties
rename to provider/notification-gc/src/main/resources/application-gcp.properties
diff --git a/provider/notification-gcp/src/main/resources/application-local.properties b/provider/notification-gc/src/main/resources/application-local.properties
similarity index 100%
rename from provider/notification-gcp/src/main/resources/application-local.properties
rename to provider/notification-gc/src/main/resources/application-local.properties
diff --git a/provider/notification-gcp/src/main/resources/application.properties b/provider/notification-gc/src/main/resources/application.properties
similarity index 100%
rename from provider/notification-gcp/src/main/resources/application.properties
rename to provider/notification-gc/src/main/resources/application.properties
diff --git a/provider/notification-gcp/src/main/resources/logback.xml b/provider/notification-gc/src/main/resources/logback.xml
similarity index 100%
rename from provider/notification-gcp/src/main/resources/logback.xml
rename to provider/notification-gc/src/main/resources/logback.xml
diff --git a/provider/notification-gcp/src/test/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManagerTest.java b/provider/notification-gc/src/test/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManagerTest.java
similarity index 100%
rename from provider/notification-gcp/src/test/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManagerTest.java
rename to provider/notification-gc/src/test/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriberManagerTest.java
diff --git a/provider/notification-gcp/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorGeneratorTest.java b/provider/notification-gc/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorGeneratorTest.java
similarity index 100%
rename from provider/notification-gcp/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorGeneratorTest.java
rename to provider/notification-gc/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorGeneratorTest.java
diff --git a/provider/notification-gcp/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorImplTests.java b/provider/notification-gc/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorImplTests.java
similarity index 100%
rename from provider/notification-gcp/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorImplTests.java
rename to provider/notification-gc/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccountValidatorImplTests.java
diff --git a/provider/notification-gcp/scripts/deploy.sh b/provider/notification-gcp/scripts/deploy.sh
deleted file mode 100644
index 10205a72ff35eed7d58f74ce27d8f5becea5bbc5..0000000000000000000000000000000000000000
--- a/provider/notification-gcp/scripts/deploy.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# Exit as soon as a command fails
-set -e
-
-BUILD_DEFINITIONNAME="{{definitionName}}"
-BUILD_SOURCEBRANCHNAME="{{sourceBranchName}}"
-BUILD_BUILDNUMBER="{{buildNumber}}"
-SCRIPT_DIR=$(dirname $0)
-
-echo "This script will deploy the app to $GCLOUD_PROJECT"
-
-if [ "$GCLOUD_PROJECT" = "" ]
-then
-    export GCLOUD_PROJECT=$(gcloud config get-value project)
-fi
-
-echo "  Environment = $ENVIRONMENT"
-echo "  Project = $GCLOUD_PROJECT"
-echo "  Build definition = $BUILD_DEFINITIONNAME"
-echo "  Source branch = $BUILD_SOURCEBRANCHNAME"
-echo "  Build number = $BUILD_BUILDNUMBER"
-echo "  Directory = $SCRIPT_DIR"
-
-echo "Print Directory contents"
-ls $SCRIPT_DIR
-
-VERSION_NUMBER=$BUILD_SOURCEBRANCHNAME-$BUILD_BUILDNUMBER
-VERSION_NUMBER=$(echo "$VERSION_NUMBER" | tr _ - | tr '[:upper:]' '[:lower:]')
-## UGLY.. removes '.' from string.
-VERSION_NUMBER=${VERSION_NUMBER//.}
-SERVICE_NAME="os-notification"
-
-count=$(gcloud app services list --project $GCLOUD_PROJECT | grep $SERVICE_NAME | wc -l)
-if [ $count -gt 0 ]; then
-  CURRENT_VERSION=$(gcloud app services describe $SERVICE_NAME --project $GCLOUD_PROJECT --format=json | jq --raw-output '.split.allocations | keys[0]')
-else
-  CURRENT_VERSION=""
-fi
-echo "Current version = $CURRENT_VERSION"
-echo "Version to be deployed = $VERSION_NUMBER"
-
-if [ "$VERSION_NUMBER" != "$CURRENT_VERSION" -o "$BUILD_FORCE_DEPLOY" = "true" -o "$BUILD_FORCE_DEPLOY" = "True" -o "$BUILD_FORCE_DEPLOY" = "TRUE" ]
-then
-    if [ "$BUILD_SOURCEBRANCHNAME" = "master" -o "$BUILD_FORCE_DEPLOY" = "true" -o "$BUILD_FORCE_DEPLOY" = "True" -o "$BUILD_FORCE_DEPLOY" = "TRUE" ]
-    then
-        APPYAML=app.$ENVIRONMENT.yaml
-        cat $APPYAML
-
-        # If the version $VERSION_NUMBER already exists, but not serving traffic, gcloud app deploy will fail. In this case, simply start that version and migrate traffic to it
-        doesVersionExist=`gcloud app versions list --service=$SERVICE_NAME --project=$GCLOUD_PROJECT | grep $VERSION_NUMBER | wc -l`
-        if [ "$doesVersionExist" -eq "1" ]
-        then
-            echo "Starting version $VERSION_NUMBER"
-            gcloud app versions start $VERSION_NUMBER --service=$SERVICE_NAME --project=$GCLOUD_PROJECT --quiet
-            echo "Migrating all traffic to version $VERSION_NUMBER"
-            gcloud app services set-traffic $SERVICE_NAME --splits $VERSION_NUMBER=1 --project=$GCLOUD_PROJECT --quiet
-        else 
-            echo "Deploying service to Google project $GCLOUD_PROJECT"
-            gcloud app deploy --quiet --version=$VERSION_NUMBER --project=$GCLOUD_PROJECT $APPYAML
-            echo "Service deployed successfully"
-            ## delete the current version which serves no more traffic if the deployment succeeded, no way to stop an auto-scaled version in app engine standard
-            if [ $count -gt 0 ]; then
-                echo "Deleting previous version: $CURRENT_VERSION."
-                gcloud app versions delete $CURRENT_VERSION --project=$GCLOUD_PROJECT --quiet
-            fi
-        fi
-    else
-        echo "Not deploying the application because build source branch was not master"
-    fi
-else
-    echo "Not deploying the application because $VERSION_NUMBER is already deployed and force deploy flag is not set to true"
-fi
\ No newline at end of file
diff --git a/testing/README.md b/testing/README.md
index bc7897ee432b9f3792abf2f67c9a3eb51003d5fd..c8ddd83ea9631313dbcce9f3b2cc42380f58bf85 100644
--- a/testing/README.md
+++ b/testing/README.md
@@ -14,9 +14,10 @@ limitations under the License.
 
 # Notification service integration tests
 
-Notification integration tests are refactored so that the business logic for integration tests resides in the `notification-test-core` module and provider specific logic and execution steps reside in provider module (e.g. `notification-test-gcp`). To run the integration tests, the core module is built first and then the provider module is executed. Please read further to know more details.
+Notification integration tests are refactored so that the business logic for integration tests resides in the `notification-test-core` module and provider specific logic and execution steps reside in provider module (e.g. `notification-test-gc`). To run the integration tests, the core module is built first and then the provider module is executed. Please read further to know more details.
+
+### Dependencies needed to run the integration tests
 
-###Dependencies needed to run the integration tests 
 * JDK11
 * Maven
 * Azure Devops access to slb-des-ext-collaboration organization. You need to generate a PAT that can access dependencies held in the Azure artifacts
@@ -31,15 +32,17 @@ Notification integration tests are refactored so that the business logic for int
    HMAC_SECRET (sensitive secret to run HMAC tests)
    REGISTER_BASE_URL (register service endpoint)
    NOTIFICATION_BASE_URL (notification service endpoint)
-   *Only for gcp INTEGRATION_TEST_AUDIENCE (oauth client ID)
+   *Only for Google Cloud INTEGRATION_TEST_AUDIENCE (oauth client ID)
    
    ```
 
   Above variables should be configured in the release pipeline to run integration tests. You should also replace them with proper values if you wish to run tests locally.
 
-###Commands to run tests
+### Commands to run tests
+
 * Integration tests are refactored into two pieces: Core and Provider. Core contains business logic for tests and is a dependency for executing the tests from provider module. To build the core module, simply navigate to `notification-test-core` directory and run `mvn clean install`. This will build the core module
 * Next, to execute the integration tests, navigate to the provider module and execute `mvn test`
 
 ### Google Cloud
-Instructions for running the GC integration tests can be found [here](../provider/notification-gcp/README.md).
\ No newline at end of file
+
+Instructions for running the Google Cloud integration tests can be found [here](../provider/notification-gc/README.md).
diff --git a/testing/notification-test-gcp/pom.xml b/testing/notification-test-gc/pom.xml
similarity index 93%
rename from testing/notification-test-gcp/pom.xml
rename to testing/notification-test-gc/pom.xml
index a4deafd66cbc8c9b6eb371d80f7f9a7803b9dfb1..c0c26f66036c14244977ba6248e4f7429d26592d 100644
--- a/testing/notification-test-gcp/pom.xml
+++ b/testing/notification-test-gc/pom.xml
@@ -25,10 +25,10 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>notification-test-gcp</artifactId>
+    <artifactId>notification-test-gc</artifactId>
     <version>0.19.0-SNAPSHOT</version>
-    <name>notification-test-gcp</name>
-    <description>Integration tests GCP for notification</description>
+    <name>notification-test-gc</name>
+    <description>Integration tests Google Cloud for notification</description>
     <packaging>jar</packaging>
 
     <properties>
diff --git a/testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointGSA.java b/testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointGSA.java
similarity index 100%
rename from testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointGSA.java
rename to testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointGSA.java
diff --git a/testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java b/testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
similarity index 100%
rename from testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
rename to testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/api/TestPubsubEndpointHMAC.java
diff --git a/testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/util/GCPTestUtils.java b/testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/util/GCPTestUtils.java
similarity index 100%
rename from testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/util/GCPTestUtils.java
rename to testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/util/GCPTestUtils.java
diff --git a/testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccount.java b/testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccount.java
similarity index 100%
rename from testing/notification-test-gcp/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccount.java
rename to testing/notification-test-gc/src/test/java/org/opengroup/osdu/notification/util/GoogleServiceAccount.java
diff --git a/testing/notification-test-gcp/src/test/resources/logback-test.xml b/testing/notification-test-gc/src/test/resources/logback-test.xml
similarity index 100%
rename from testing/notification-test-gcp/src/test/resources/logback-test.xml
rename to testing/notification-test-gc/src/test/resources/logback-test.xml
diff --git a/testing/pom.xml b/testing/pom.xml
index 25d83ef6bd388a7c68ceb2be245b33d80bd1ac12..1381be9b51f176b61699654d914150c761c0ce22 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -32,7 +32,7 @@
 	<modules>
 		<module>notification-test-core</module>
 		<module>notification-test-azure</module>
-		<module>notification-test-gcp</module>
+		<module>notification-test-gc</module>
 		<module>notification-test-aws</module>
 		<module>notification-test-ibm</module>
 		<module>notification-test-anthos</module>