diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index 97d5d9cc690cfd240e7b5c330fc9ff156d222b56..adf895cf4f1e13620e90a8d9e5ac1f2c3b47c1f7 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -200,6 +200,7 @@ gc-dev2-cleanup-env: # clean-up env after tests
     PARTITION_NAMESPACE: partition-test
     GC_HELM_NAMESPACE: partition-int-test
     GC_SA_EMAIL: $GC_SA_GKE_EMAIL
+    PIP_BREAK_SYSTEM_PACKAGES: 1
   script:
     - !reference [.gc_obtain_credentials, script]
     - !reference [.gc_common_config, script]
diff --git a/provider/partition-gc/bootstrap/data_baremetal.sh b/provider/partition-gc/bootstrap/data_baremetal.sh
index 865a51041f18bf145004d55448e6d30873576088..acd4bafe0aa3f0b427169ee240d57e0c5b9672be 100644
--- a/provider/partition-gc/bootstrap/data_baremetal.sh
+++ b/provider/partition-gc/bootstrap/data_baremetal.sh
@@ -158,6 +158,14 @@ baremetal_system_partition_data() {
     "entitlements.datasource.schema": {
       "sensitive": true,
       "value": "ENT_PG_SCHEMA_${DATA_PARTITION_ID_UPPER}"
+    },
+    "system.schema.bucket.name": {
+      "sensitive": false,
+      "value": "${BUCKET_PREFIX}-system-schema"
+    },
+    "schema.bucket.name": {
+      "sensitive": false,
+      "value": "${BUCKET_PREFIX}-${DATA_PARTITION_ID_VALUE}-schema"
     }
   }
 }
@@ -180,6 +188,10 @@ baremetal_additional_partition_data() {
     "obm.minio.external.endpoint": {
       "sensitive": false,
       "value": "${MINIO_EXTERNAL_ENDPOINT}"
+    },
+    "wellbore-dms-bucket": {
+      "sensitive": false,
+      "value": "${BUCKET_PREFIX}-logstore-osdu"
     }
   }
 }
diff --git a/provider/partition-gc/bootstrap/data_gc.sh b/provider/partition-gc/bootstrap/data_gc.sh
index f3a859f444139aa2167f261a4e2651d962568495..b5a85ab563876a8cfd6ac1022f158f17ab2c6436 100644
--- a/provider/partition-gc/bootstrap/data_gc.sh
+++ b/provider/partition-gc/bootstrap/data_gc.sh
@@ -74,9 +74,9 @@ gc_system_partition_data() {
       "sensitive": true,
       "value": "RESERVOIR_POSTGRES_CONN_STRING${PARTITION_SUFFIX}"
     },
-    "wellbore-dms-bucket": {
+    "system.schema.bucket.name": {
       "sensitive": false,
-      "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-logstore"
+      "value": "${PROJECT_ID}-system-schema"
     }
   }
 }
@@ -98,6 +98,14 @@ gc_additional_partition_data() {
     "index-augmenter-enabled": {
       "sensitive": false,
       "value": "${INDEXER_AUGMENTER_ENABLED}"
+    },
+    "wellbore-dms-bucket": {
+      "sensitive": false,
+      "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-logstore"
+    },
+    "schema.bucket.name": {
+      "sensitive": false,
+      "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-schema"
     }
   }
 }