diff --git a/devops/gc/deploy/templates/configmap-bootstrap.yaml b/devops/gc/deploy/templates/configmap-bootstrap.yaml
index f159b3b31faf61825fd4c2e8d4df24e43403888a..3e0c4075f751e074164072dc2fb001c578c13768 100644
--- a/devops/gc/deploy/templates/configmap-bootstrap.yaml
+++ b/devops/gc/deploy/templates/configmap-bootstrap.yaml
@@ -10,6 +10,7 @@ data:
   INDEXER_AUGMENTER_ENABLED: {{ .Values.data.indexerAugmenterEnabled | quote }}
   EDS_ENABLED: {{ .Values.data.edsEnabled | quote }}
   POLICY_SERVICE_ENABLED: {{ .Values.data.policyServiceEnabled | quote }}
+  AUTOCOMPLETE_ENABLED: {{ .Values.data.autocompleteEnabled | 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 b8dc30d1fa8d6374e4e5aa2852ba5652ebf632a0..8d6c683057f16baad260d4ceb90342aeb4901c79 100644
--- a/devops/gc/deploy/values.yaml
+++ b/devops/gc/deploy/values.yaml
@@ -21,6 +21,7 @@ data:
   policyServiceEnabled: "true"
   edsEnabled: "false"
   minioUIEndpoint: "http://minio:9001"
+  autocompleteEnabled: "false"
   # deployments
   requestsCpu: "5m"
   requestsMemory: "350Mi"
diff --git a/provider/partition-gc/bootstrap/data_baremetal.sh b/provider/partition-gc/bootstrap/data_baremetal.sh
index 12347ec5675af4516021a1d123b220563910c6dc..2d383b9bd4d3070bf524049fbc6c0495daac318a 100644
--- a/provider/partition-gc/bootstrap/data_baremetal.sh
+++ b/provider/partition-gc/bootstrap/data_baremetal.sh
@@ -175,6 +175,10 @@ baremetal_system_partition_data() {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
     },
+    "featureFlag.autocomplete.enabled": {
+      "sensitive": false,
+      "value": "${AUTOCOMPLETE_ENABLED}"
+    },
     "wellbore-dms-bucket": {
       "sensitive": false,
       "value": "${BUCKET_PREFIX}-${DATA_PARTITION_ID_VALUE}-wellbore"
diff --git a/provider/partition-gc/bootstrap/data_gc.sh b/provider/partition-gc/bootstrap/data_gc.sh
index ad29afc91cf0362328f8dc8ccc4b409475476a17..8cd6943a23d53eb6a2231727153837eeaf0f0a47 100644
--- a/provider/partition-gc/bootstrap/data_gc.sh
+++ b/provider/partition-gc/bootstrap/data_gc.sh
@@ -85,6 +85,10 @@ gc_system_partition_data() {
     "featureFlag.opa.enabled": {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
+    },
+    "featureFlag.autocomplete.enabled": {
+      "sensitive": false,
+      "value": "${AUTOCOMPLETE_ENABLED}"
     }
   }
 }
@@ -122,6 +126,10 @@ gc_additional_partition_data() {
     "featureFlag.opa.enabled": {
       "sensitive": false,
       "value": "${POLICY_SERVICE_ENABLED}"
+    },
+    "featureFlag.autocomplete.enabled": {
+      "sensitive": false,
+      "value": "${AUTOCOMPLETE_ENABLED}"
     }
   }
 }