diff --git a/app/bundles/providers/gcp/__init__.py b/app/bundles/providers/gc/__init__.py
similarity index 88%
rename from app/bundles/providers/gcp/__init__.py
rename to app/bundles/providers/gc/__init__.py
index 545d042966a656995dcfe258def5e6e61447c8e6..6a5313e4b49524e5b85fcc7db92f62301609a755 100644
--- a/app/bundles/providers/gcp/__init__.py
+++ b/app/bundles/providers/gc/__init__.py
@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from bundles.providers.gcp.storage import GCPBundleStorageClient as storage_client
\ No newline at end of file
+from bundles.providers.gc.storage import GCBundleStorageClient as storage_client
\ No newline at end of file
diff --git a/app/bundles/providers/gcp/storage.py b/app/bundles/providers/gc/storage.py
similarity index 97%
rename from app/bundles/providers/gcp/storage.py
rename to app/bundles/providers/gc/storage.py
index be7163aa332e608a442b97803583776a33546493..333673e44094320df41b318e198fb6d4997a61da 100644
--- a/app/bundles/providers/gcp/storage.py
+++ b/app/bundles/providers/gc/storage.py
@@ -23,7 +23,7 @@ from bundles.storage import BundleStorageClient
 
 logger = logging.getLogger(__name__)
 
-class GCPBundleStorageClient(BundleStorageClient):
+class GCBundleStorageClient(BundleStorageClient):
     def __init__(self) -> None:
         self.client = get_client()
         self.bucket_name = os.environ["POLICY_BUCKET"]
diff --git a/devops/gc/deploy/templates/policy-configmap.yaml b/devops/gc/deploy/templates/policy-configmap.yaml
index c25fc1979ffd655c4f87f20087810bcb54b7927e..405abd48ce47ad46423ca6d8c0a9b78a84e87666 100644
--- a/devops/gc/deploy/templates/policy-configmap.yaml
+++ b/devops/gc/deploy/templates/policy-configmap.yaml
@@ -14,7 +14,7 @@ data:
   POLICY_BUCKET: "{{ .Values.data.bucketName }}"
   USE_BUNDLES: "{{ .Values.data.useBundles }}"
   {{- if not .Values.conf.onPremEnabled }}
-  CLOUD_PROVIDER: "gcp"
+  CLOUD_PROVIDER: "gc"
   {{- else }}
   CLOUD_PROVIDER: "anthos"
   MINIO_ENDPOINT: "{{ .Values.data.minioHost }}"
diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index 441892d8878e8b3a05e4acac91f52adda9193ee1..a0e3104dfb79d910de65620f70e8aba5ec9ada7b 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -16,7 +16,7 @@ gc-test-python:
   image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
   variables:
     POLICY_BUCKET: $GC_POLICY_BUCKET
-    CLOUD_PROVIDER: gcp
+    CLOUD_PROVIDER: gc
     OPA_URL: $GC_OPA_URL
     ENTITLEMENTS_BASE_URL: $HOST
     LEGAL_BASE_URL: $HOST
@@ -26,7 +26,7 @@ gc-dev2-test-python:
   image: gcr.io/google.com/cloudsdktool/cloud-sdk:alpine
   variables:
     POLICY_BUCKET: $GC_POLICY_BUCKET
-    CLOUD_PROVIDER: gcp
+    CLOUD_PROVIDER: gc
     OPA_URL: $GC_OPA_URL
     ENTITLEMENTS_BASE_URL: $HOST
     LEGAL_BASE_URL: $HOST