diff --git a/provider/partition-gc/bootstrap/data_baremetal.sh b/provider/partition-gc/bootstrap/data_baremetal.sh
index 12347ec5675af4516021a1d123b220563910c6dc..dd88470b5e102b73a18544342fc5da52ac50776b 100644
--- a/provider/partition-gc/bootstrap/data_baremetal.sh
+++ b/provider/partition-gc/bootstrap/data_baremetal.sh
@@ -139,7 +139,7 @@ baremetal_system_partition_data() {
       "sensitive": false,
       "value": "${INDEXER_AUGMENTER_ENABLED}"
     },
-    "policy-service-enabled": {
+    "featureFlag.policy.enabled": {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
     },
diff --git a/provider/partition-gc/bootstrap/data_gc.sh b/provider/partition-gc/bootstrap/data_gc.sh
index ad29afc91cf0362328f8dc8ccc4b409475476a17..9b559f044856e392f251b67d9da766de34211120 100644
--- a/provider/partition-gc/bootstrap/data_gc.sh
+++ b/provider/partition-gc/bootstrap/data_gc.sh
@@ -2,7 +2,7 @@
 
 # FIXME (GONRG-7695): Move elastic properties to additional partition when resolved
 gc_system_partition_data() {
-  DATA_PARTITION_ID_UPPER="${DATA_PARTITION_ID_VALUE^^}"
+  DATA_PARTITION_ID_UPPER=$(echo "${DATA_PARTITION_ID_VALUE//-/_}" | tr '[:lower:]' '[:upper:]')
   cat <<EOF
 {
   "properties": {
@@ -78,13 +78,22 @@ gc_system_partition_data() {
       "sensitive": false,
       "value": "${PROJECT_ID}-system-schema"
     },
-    "system.eds.enabled": {
+    "system.featureFlag.eds.enabled": {
       "sensitive": false,
       "value": "${EDS_ENABLED}"
     },
-    "featureFlag.opa.enabled": {
+    "system.featureFlag.opa.enabled": {
+      "sensitive": false,
+      "value": "${POLICY_SERVICE_ENABLED}"
+    },
+    "system.featureFlag.policy.enabled": {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
+    },
+    "system.featureFlag.autocomplete.enabled": {
+      "sensitive": false,
+      "value": "${AUTOCOMPLETE_ENABLED}"
+>>>>>>> 4b06380d (gc: update bootstrap templates)
     }
   }
 }
@@ -95,10 +104,6 @@ gc_additional_partition_data() {
   cat <<EOF
 {
   "properties": {
-    "policy-service-enabled": {
-      "sensitive": false,
-      "value": "${POLICY_SERVICE_ENABLED}"
-    },
     "kubernetes-secret-name": {
       "sensitive": false,
       "value": "eds-${DATA_PARTITION_ID_VALUE}"
@@ -115,13 +120,21 @@ gc_additional_partition_data() {
       "sensitive": false,
       "value": "${PROJECT_ID}-${DATA_PARTITION_ID_VALUE}-schema"
     },
-    "eds.enabled": {
+    "featureFlag.eds.enabled": {
       "sensitive": false,
       "value": "${EDS_ENABLED}"
     },
     "featureFlag.opa.enabled": {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
+    },
+    "featureFlag.policy.enabled": {
+      "sensitive": false,
+      "value": "${POLICY_SERVICE_ENABLED}"
+    },
+    "featureFlag.autocomplete.enabled": {
+      "sensitive": false,
+      "value": "${AUTOCOMPLETE_ENABLED}"
     }
   }
 }