diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml
index 92ae843752604625a88c452944c9373e91ed75e3..493f633a2291af9db5c320e7ceede6571c16f650 100644
--- a/devops/gc/deploy/templates/configmap-bootstrap.yaml
+++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml
@@ -9,6 +9,7 @@ data:
   PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
   ENVIRONMENT: {{ .Values.data.springProfilesActive | quote }}
   INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
+  PARTITION_SUFFIX: {{ .Values.data.partitionSuffix | quote }}
   {{- if .Values.global.onPremEnabled }}
   DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
   DATA_PARTITION_ID_LIST: ""
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index 94a0b274071415120b316e40c8c6e5be6fce9dcb..e5d7e980a56ca31897df11ffc35ab428d3b5637c 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -13,6 +13,7 @@ data:
   dataProjectId: ""
   partitionHost: "partition"
   partitionNamespace: "partition"
+  partitionSuffix: "_SYSTEM"
   datafierSa: "datafier"
   bucketPrefix: "refi"
   minioExternalEndpoint: "" # use only if external minio is configured
diff --git a/provider/partition-gc/bootstrap/data_baremetal.sh b/provider/partition-gc/bootstrap/data_baremetal.sh
index 81306da22ac783f7de2b6d33fb18e9e65aefca15..aca22d15c0e0e44d5c8e0bfc1e866430fe990cb5 100644
--- a/provider/partition-gc/bootstrap/data_baremetal.sh
+++ b/provider/partition-gc/bootstrap/data_baremetal.sh
@@ -37,15 +37,15 @@ baremetal_system_partition_data() {
     },
     "osm.postgres.datasource.url": {
       "sensitive": true,
-      "value": "POSTGRES_DATASOURCE_URL_${DATA_PARTITION_ID_UPPER}"
+      "value": "POSTGRES_DATASOURCE_URL${PARTITION_SUFFIX}"
     },
     "osm.postgres.datasource.username": {
       "sensitive": true,
-      "value": "POSTGRES_DB_USERNAME_${DATA_PARTITION_ID_UPPER}"
+      "value": "POSTGRES_DB_USERNAME${PARTITION_SUFFIX}"
     },
     "osm.postgres.datasource.password": {
       "sensitive": true,
-      "value": "POSTGRES_DB_PASSWORD_${DATA_PARTITION_ID_UPPER}"
+      "value": "POSTGRES_DB_PASSWORD${PARTITION_SUFFIX}"
     },
     "obm.minio.endpoint": {
       "sensitive": false,
@@ -145,15 +145,15 @@ baremetal_system_partition_data() {
     },
     "entitlements.datasource.url": {
       "sensitive": true,
-      "value": "ENT_PG_URL_${DATA_PARTITION_ID_UPPER}"
+      "value": "ENT_PG_URL${PARTITION_SUFFIX}"
     },
     "entitlements.datasource.username": {
       "sensitive": true,
-      "value": "ENT_PG_USER_${DATA_PARTITION_ID_UPPER}"
+      "value": "ENT_PG_USER${PARTITION_SUFFIX}"
     },
     "entitlements.datasource.password": {
       "sensitive": true,
-      "value": "ENT_PG_PASS_${DATA_PARTITION_ID_UPPER}"
+      "value": "ENT_PG_PASS${PARTITION_SUFFIX}"
     },
     "entitlements.datasource.schema": {
       "sensitive": true,
diff --git a/provider/partition-gc/bootstrap/data_gc.sh b/provider/partition-gc/bootstrap/data_gc.sh
index 32701bfd261ea0331da9f9b83caa8a8562fe0afb..9aa364ce57829d57dacc0bfe2cd95a1f3efe4dff 100644
--- a/provider/partition-gc/bootstrap/data_gc.sh
+++ b/provider/partition-gc/bootstrap/data_gc.sh
@@ -56,15 +56,15 @@ gc_system_partition_data() {
     },
     "entitlements.datasource.url": {
       "sensitive": true,
-      "value": "ENT_PG_URL_${DATA_PARTITION_ID_UPPER}"
+      "value": "ENT_PG_URL${PARTITION_SUFFIX}"
     },
     "entitlements.datasource.username": {
       "sensitive": true,
-      "value": "ENT_PG_USER_${DATA_PARTITION_ID_UPPER}"
+      "value": "ENT_PG_USER${PARTITION_SUFFIX}"
     },
     "entitlements.datasource.password": {
       "sensitive": true,
-      "value": "ENT_PG_PASS_${DATA_PARTITION_ID_UPPER}"
+      "value": "ENT_PG_PASS${PARTITION_SUFFIX}"
     },
     "entitlements.datasource.schema": {
       "sensitive": true,