diff --git a/.gitignore b/.gitignore
index 3e4ab7fd0031a79be17eaf2c2a80149aec5b9e69..ba36cf9c29df26317ec54830fb61586e635a4d71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,4 +52,7 @@ dist/
 
 #ibm helm chart manifest
 devops/ibm/ibm-schema-config/manifests
-devops/ibm/ibm-schema-deploy/manifests
\ No newline at end of file
+devops/ibm/ibm-schema-deploy/manifests
+
+# VS Code
+.vscode/
diff --git a/devops/gc/deploy/templates/configmap.yaml b/devops/gc/deploy/templates/configmap.yaml
index e6de87bc1d8c1a607ff66df91fc4a727c6986149..e08efeab9acc9965ce5ae045f015fcedeb165298 100644
--- a/devops/gc/deploy/templates/configmap.yaml
+++ b/devops/gc/deploy/templates/configmap.yaml
@@ -6,11 +6,9 @@ metadata:
   name: {{ .Values.conf.configmap | quote }}
   namespace: {{ .Release.Namespace | quote }}
 data:
-  SHARED_TENANT_NAME: "system"
   LOG_LEVEL: {{ .Values.data.logLevel | default .Values.global.logLevel | quote }}
   ENTITLEMENTS_HOST: {{ .Values.data.entitlementsHost | quote }}
   SCHEMA_CHANGED_TOPIC_NAME: {{ .Values.data.schemaTopicName | quote }}
   SCHEMA_CHANGED_MESSAGING_ENABLED: {{ .Values.data.schemaChangedMessagingEnabled | quote }}
   PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
-  SPRING_PROFILES_ACTIVE: "gcp"
   _JAVA_OPTIONS: {{ .Values.data.javaOptions | quote }}
diff --git a/provider/schema-gc/src/main/resources/application-gcp.properties b/provider/schema-gc/src/main/resources/application-gcp.properties
deleted file mode 100644
index c53562d99c85263b4d8bc226070586283d2deee2..0000000000000000000000000000000000000000
--- a/provider/schema-gc/src/main/resources/application-gcp.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright 2020-2022 Google LLC
-# Copyright 2020-2022  EPAM Systems, Inc
-#
-# 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
-#
-#     https://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.
-#
-
-service.token.provider=GCP
-partition-auth-enabled=true
-obmDriver=gcs
-osmDriver=datastore
-oqmDriver=pubsub
\ No newline at end of file
diff --git a/provider/schema-gc/src/main/resources/application.properties b/provider/schema-gc/src/main/resources/application.properties
index 01903a086040032449bc2a350f017b4e67118fa6..feb8ee64ca5e99612881431fa5f9d82a19a40907 100644
--- a/provider/schema-gc/src/main/resources/application.properties
+++ b/provider/schema-gc/src/main/resources/application.properties
@@ -16,9 +16,10 @@ partition.properties.system-schema-bucket-name=system.schema.bucket.name
 # Service level config
 
 destination.resolver=partition
+partition-auth-enabled=true
 
 ## Use this property to name your shared tenant name
-shared-tenant-name=${SHARED_TENANT_NAME:osdu}
+shared-tenant-name=${SHARED_TENANT_NAME:system}
 
 ## Status messaging switch
 schema.changed.messaging-enabled=${SCHEMA_CHANGED_MESSAGING_ENABLED:true}
@@ -41,4 +42,4 @@ PARTITION_API=${PARTITION_HOST}${PARTITION_PATH}
 management.server.port=${MANAGEMENT_SERVER_PORT:8081}
 management.endpoints.web.base-path=${MANAGEMENT_ENDPOINTS_WEB_BASE:/}
 management.endpoints.web.exposure.include=health
-management.health.probes.enabled=true
\ No newline at end of file
+management.health.probes.enabled=true