diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
index 2f4b802a6..8089a7c6e 100644
--- a/helm/alfresco-content-services/README.md
+++ b/helm/alfresco-content-services/README.md
@@ -114,7 +114,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | alfresco-repository.configuration.repository.existingSecrets[1].name | string | `"outbound-email"` |  |
 | alfresco-repository.configuration.repository.existingSecrets[1].purpose | string | `"property:mail.password"` |  |
 | alfresco-repository.configuration.search.existingConfigMap.name | string | `"alfresco-infrastructure"` |  |
-| alfresco-repository.configuration.search.existingSecret.name | string | `"solr-shared-secret"` |  |
+| alfresco-repository.configuration.search.existingSecret.name | string | `"alfresco-search-secret"` |  |
 | alfresco-repository.configuration.search.flavor | string | `"solr6"` |  |
 | alfresco-repository.image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` |  |
 | alfresco-repository.image.tag | string | `"23.1.0-A27"` |  |
@@ -123,7 +123,6 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | alfresco-repository.persistence.baseSize | string | `"20Gi"` |  |
 | alfresco-repository.persistence.enabled | bool | `true` | Persist repository data |
 | alfresco-search-enterprise.ats.existingConfigMap.name | string | `"alfresco-infrastructure"` |  |
-| alfresco-search-enterprise.elasticsearch.enabled | bool | `true` | Enables the embedded elasticsearch cluster |
 | alfresco-search-enterprise.enabled | bool | `false` |  |
 | alfresco-search-enterprise.liveIndexing.content.image.tag | string | `"4.0.0-M1"` |  |
 | alfresco-search-enterprise.liveIndexing.mediation.image.tag | string | `"4.0.0-M1"` |  |
@@ -136,6 +135,8 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | alfresco-search-enterprise.reindexing.enabled | bool | `true` |  |
 | alfresco-search-enterprise.reindexing.image.tag | string | `"4.0.0-M1"` |  |
 | alfresco-search-enterprise.reindexing.repository.existingConfigMap.name | string | `"alfresco-infrastructure"` |  |
+| alfresco-search-enterprise.search.existingConfigMap.name | string | `"alfresco-infrastructure"` |  |
+| alfresco-search-enterprise.search.existingSecret.name | string | `"alfresco-search-secret"` |  |
 | alfresco-search.alfresco-insight-zeppelin.enabled | bool | `false` |  |
 | alfresco-search.enabled | bool | `true` |  |
 | alfresco-search.external.host | string | `nil` | Host dns/ip of the external solr6 instance. |
@@ -149,7 +150,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | alfresco-search.repository.existingConfigMap.keys.securecomms | string | `"SEARCH_SECURECOMMS"` |  |
 | alfresco-search.repository.existingConfigMap.name | string | `"alfresco-infrastructure"` |  |
 | alfresco-search.repository.existingSecret.keys.sharedSecret | string | `"SOLR_SECRET"` |  |
-| alfresco-search.repository.existingSecret.name | string | `"solr-shared-secret"` |  |
+| alfresco-search.repository.existingSecret.name | string | `"alfresco-search-secret"` |  |
 | alfresco-search.searchServicesImage.repository | string | `"quay.io/alfresco/search-services"` |  |
 | alfresco-search.searchServicesImage.tag | string | `"2.0.8.1"` |  |
 | alfresco-sync-service.enabled | bool | `true` | Toggle deployment of Alfresco Sync Service (Desktop-Sync) Check [Alfresco Sync Service Documentation](https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-sync-service) |
@@ -203,6 +204,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | database.secretName | string | `"alfresco-cs-database"` | Name of the secret managed by this chart |
 | database.url | string | `nil` | External Postgresql jdbc url ex: `jdbc:postgresql://oldfashioned-mule-postgresql-acs:5432/alfresco` |
 | database.user | string | `nil` | External Postgresql database user |
+| elasticsearch.enabled | bool | `false` | Enables the embedded elasticsearch cluster |
 | global.ai.enabled | bool | `false` | Enable AI capabilities in ADW AI plugin |
 | global.alfrescoRegistryPullSecrets | string | `nil` | If a private image registry a secret can be defined and passed to kubernetes, see: https://github.com/Alfresco/acs-deployment/blob/a924ad6670911f64f1bba680682d266dd4ea27fb/docs/helm/eks-deployment.md#docker-registry-secret |
 | global.known_urls | list | `["https://localhost","http://localhost"]` | list of trusted URLs. URLs a re used to configure Cross-origin protections Also the first entry is considered the main hosting domain of the platform. |
@@ -211,7 +213,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | global.mail.port | int | `587` | SMTP server port |
 | global.mail.protocol | string | `"smtp"` | SMTP protocol to use. Either smtp or smtps |
 | global.search.flavor | string | `nil` | set the type of search service used externally (solr6 of elasticsearch) |
-| global.search.secretName | string | `"solr-shared-secret"` | Name of the secret managed by this chart |
+| global.search.secretName | string | `"alfresco-search-secret"` | Name of the secret managed by this chart |
 | global.search.securecomms | string | `"secret"` | set the security level used with the external search service (secret, none or https) |
 | global.search.sharedSecret | string | `nil` | Mandatory secret to provide when using Solr search with 'secret' security level |
 | global.search.url | string | `nil` | set this URL if you have an external search service |
diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
index 65ae87891..48f53ee57 100644
--- a/helm/alfresco-content-services/values.yaml
+++ b/helm/alfresco-content-services/values.yaml
@@ -50,7 +50,7 @@ global:
     # -- Mandatory secret to provide when using Solr search with 'secret' security level
     sharedSecret: null
     # -- Name of the secret managed by this chart
-    secretName: &acs_search_secretName solr-shared-secret
+    secretName: &acs_search_secretName alfresco-search-secret
   # -- If a private image registry a secret can be defined and passed to
   # kubernetes, see:
   # https://github.com/Alfresco/acs-deployment/blob/a924ad6670911f64f1bba680682d266dd4ea27fb/docs/helm/eks-deployment.md#docker-registry-secret
@@ -280,12 +280,14 @@ alfresco-search:
     #      - chart-example.local
 alfresco-search-enterprise:
   enabled: false
+  search:
+    existingConfigMap:
+      name: *infrastructure_cmName
+    existingSecret:
+      name: *acs_search_secretName
   ats:
     existingConfigMap:
       name: *infrastructure_cmName
-  elasticsearch:
-    # -- Enables the embedded elasticsearch cluster
-    enabled: true
   messageBroker:
     existingConfigMap:
       name: *infrastructure_cmName
@@ -480,3 +482,6 @@ alfresco-ai-transformer:
 #    region:
 #    s3Bucket:
 #    comprehendRoleARN:
+elasticsearch:
+  # -- Enables the embedded elasticsearch cluster
+  enabled: false