diff --git a/helm/alfresco-content-services/templates/config-repository-infrastructure.yaml b/helm/alfresco-content-services/templates/config-repository-infrastructure.yaml
index aa4a6a33a..7190e2616 100644
--- a/helm/alfresco-content-services/templates/config-repository-infrastructure.yaml
+++ b/helm/alfresco-content-services/templates/config-repository-infrastructure.yaml
@@ -14,11 +14,11 @@ data:
   {{- $db_url := include "alfresco-content-service.database.repo" $ }}
   {{ template "alfresco-repository.db.cm" (dict "url" $db_url "driver" .Values.database.driver) }}
   {{ template "alfresco-repository.mq.cm" (include "alfresco-content-service.mq.url" .) }}
-  {{- if index .Values "alfresco-search" "enabled" }}
+  {{- if eq "solr6" .Values.search.flavor }}
   SEARCH_SECURECOMMS: {{ .Values.global.tracking.auth | default "secret" }}
   SEARCH_HOST: {{ template "alfresco-common.url.host" .Values.search.url }}
   SEARCH_PORT: {{ include "alfresco-common.url.port" .Values.search.url | quote }}
-  SOLR_BASE_URL: {{ include "alfresco-common.url.path" .Values.search.url | default "/solr" }}
+  SOLR_BASE_URL: {{ include "alfresco-common.url.path" .Values.search.url }}
   {{- end }}
   {{- if ne "noindex" .Values.search.flavor }}
   SEARCH_URL: {{ .Values.search.url }}
diff --git a/helm/alfresco-content-services/templates/secret-repository-properties.yaml b/helm/alfresco-content-services/templates/secret-repository-properties.yaml
index a61f73b02..127e13ad5 100644
--- a/helm/alfresco-content-services/templates/secret-repository-properties.yaml
+++ b/helm/alfresco-content-services/templates/secret-repository-properties.yaml
@@ -1,4 +1,5 @@
-{{- if and (index .Values "alfresco-search" "enabled") (eq .Values.global.tracking.auth "secret") }}
+{{- include "alfresco-content-service.search.set.flavor" . }}
+{{- if and (eq "solr6" .Values.search.flavor) (eq .Values.global.tracking.auth "secret") }}
 apiVersion: v1
 kind: Secret
 metadata: