diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml
index aa401e29c69d3124572fa8f73f2e2816af65b7bc..2c25a8dea0b0d634d635cac26e6b06e8689c2e2f 100644
--- a/devops/gc/deploy/templates/configmap-bootstrap.yaml
+++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml
@@ -8,6 +8,8 @@ metadata:
 data:
   PARTITION_HOST: {{ .Values.data.partitionHost | quote }}
   INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
+  EDS_ENABLED: {{ .Values.data.edsEnabled | quote }}
+  POLICY_SERVICE_ENABLED: {{ .Values.data.policyServiceEnabled | quote }}
   PARTITION_SUFFIX: {{ .Values.data.partitionSuffix | quote }}
   DATA_PARTITION_ID: {{ .Values.global.dataPartitionId | quote }}
   {{- if .Values.global.onPremEnabled }}
diff --git a/devops/gc/deploy/values.yaml b/devops/gc/deploy/values.yaml
index a26700b31a5b463ffc3ade67a7e35be9fc197b95..53f06d9993fc6080ae074a359cbde4f4e28a754c 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -18,6 +18,8 @@ data:
   minioExternalEndpoint: "" # use only if external minio is configured
   minioIgnoreCertCheck: "false"
   indexerAugmenterEnabled: "false"
+  policyServiceEnabled: "false"
+  edsEnabled: "true"
   minioUIEndpoint: "http://minio:9001"
   # deployments
   requestsCpu: "5m"
diff --git a/provider/partition-gc/bootstrap/data_baremetal.sh b/provider/partition-gc/bootstrap/data_baremetal.sh
index acd4bafe0aa3f0b427169ee240d57e0c5b9672be..dc170eab7193c62fee2dd62a283f08f0c954a7d7 100644
--- a/provider/partition-gc/bootstrap/data_baremetal.sh
+++ b/provider/partition-gc/bootstrap/data_baremetal.sh
@@ -137,7 +137,7 @@ baremetal_system_partition_data() {
     },
     "policy-service-enabled": {
       "sensitive": false,
-      "value": "false"
+      "value": "${POLICY_SERVICE_ENABLED}"
     },
     "obm.minio.external.endpoint": {
       "sensitive": false,
@@ -183,7 +183,7 @@ baremetal_additional_partition_data() {
     },
     "policy-service-enabled": {
       "sensitive": false,
-      "value": "false"
+      "value": "${POLICY_SERVICE_ENABLED}"
     },
     "obm.minio.external.endpoint": {
       "sensitive": false,
diff --git a/provider/partition-gc/bootstrap/data_gc.sh b/provider/partition-gc/bootstrap/data_gc.sh
index b5a85ab563876a8cfd6ac1022f158f17ab2c6436..affd0426d201ac46be8dbd775f062f9945164a92 100644
--- a/provider/partition-gc/bootstrap/data_gc.sh
+++ b/provider/partition-gc/bootstrap/data_gc.sh
@@ -77,6 +77,10 @@ gc_system_partition_data() {
     "system.schema.bucket.name": {
       "sensitive": false,
       "value": "${PROJECT_ID}-system-schema"
+    },
+    "system.eds.enabled": {
+      "sensitive": false,
+      "value": "${EDS_ENABLED}"
     }
   }
 }
@@ -89,7 +93,7 @@ gc_additional_partition_data() {
   "properties": {
     "policy-service-enabled": {
       "sensitive": false,
-      "value": "false"
+      "value": "${POLICY_SERVICE_ENABLED}"
     },
     "kubernetes-secret-name": {
       "sensitive": false,
@@ -106,6 +110,10 @@ gc_additional_partition_data() {
     "schema.bucket.name": {
       "sensitive": false,
       "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-schema"
+    },
+    "eds.enabled": {
+      "sensitive": false,
+      "value": "${EDS_ENABLED}"
     }
   }
 }