diff --git a/devops/core-plus/deploy/values.yaml b/devops/core-plus/deploy/values.yaml
index 20dfd958de54f01be75c68dde7c0e2e97da55131..4c68bf132e159e21388a4858c7bbf826d2a319a3 100644
--- a/devops/core-plus/deploy/values.yaml
+++ b/devops/core-plus/deploy/values.yaml
@@ -11,7 +11,6 @@ data:
   indexerHost: "http://indexer"
   policyId: 'osdu.partition["%s"].search'
   securityHttpsCertificateTrust: "true"
-  servicePolicyEnabled: false
   # Deployments
   requestsCpu: "15m"
   requestsMemory: "400Mi"
diff --git a/search-core-plus/src/main/resources/application.properties b/search-core-plus/src/main/resources/application.properties
index f21247af4d0f377b8a57e1bde0dc2ffd8da5010b..431577f97b64aea4535bdbcb6daa9435e9c5742b 100644
--- a/search-core-plus/src/main/resources/application.properties
+++ b/search-core-plus/src/main/resources/application.properties
@@ -52,7 +52,7 @@ query-limit-maximum=1000
 aggregation-size=1000
 
 #Search service config
-elasticsearchPropertiesPrefix=elasticsearch
+elasticsearchPropertiesPrefix=elasticsearch.8
 spring.jackson.deserialization.fail-on-unknown-properties=true
 security.https.certificate.trust=false
 
@@ -82,7 +82,7 @@ propertyResolver.strategy=partition
 partition-auth-enabled=false
 
 # autocomplete feature flag name
-featureFlag.strategy=appProperty
+featureFlag.strategy=dataPartition
 featureFlag.autocomplete.enabled=false
 SYSTEM_PARTITION_ID=system