diff --git a/helm/config/dataone-indexer.properties b/helm/config/dataone-indexer.properties
index 4b460b68..48fa1991 100644
--- a/helm/config/dataone-indexer.properties
+++ b/helm/config/dataone-indexer.properties
@@ -4,20 +4,16 @@ index.document.root.directory={{ .Values.idxworker.document_directory }}
 index.tdb.directory={{ .Values.idxworker.tripleDbDirectory }}
 
 #The section for the rabbitMQ configuration
-index.rabbitmq.hostname=
-    {{- if not .Values.rabbitmq.hostname }}
-    {{- .Release.Name }}-rabbitmq-headless
-    {{- else }}
-    {{- .Values.rabbitmq.hostname }}
-    {{- end }}
+index.rabbitmq.hostname={{ include "idxworker.rabbitmq.hostname" . }}
 index.rabbitmq.hostport={{ default .Values.rabbitmq.service.ports.amqp .Values.rabbitmq.hostport }}
 index.rabbitmq.username={{ .Values.rabbitmq.auth.username }}
 ## index.rabbitmq.password will be read from RABBITMQ_PASSWORD env var
 index.rabbitmq.password=${env:RABBITMQ_PASSWORD}
-#If you change the number of the max priority, the existing queue must be deleted. And consumers must use the same number.
+#If changing max priority, existing queue must be deleted, and consumers must use the same number
 index.rabbitmq.max.priority=10
 
-solr.base.uri=http://{{ .Values.solr.hostname }}:{{ .Values.solr.service.ports.http }}/solr/{{ .Values.solr.customCollection }}
+solr.base.uri=http://{{ .Values.solr.hostname }}:
+{{- .Values.solr.service.ports.http }}/solr/{{ .Values.solr.customCollection }}
 solr.query.uri=${solr.base.uri}/select/
 solr.index.uri=${solr.base.uri}/update/?commit=true
 #solr.schema.path can be a url or a file path
@@ -35,16 +31,16 @@ dataone.indexing.performance.logging.enabled=false
 
 D1Client.CN_URL={{ .Values.idxworker.cn_url }}
 
-index.resourcemap.namespace=http://www.w3.org/TR/rdf-syntax-grammar;http://www.openarchives.org/ore/terms
+index.resourcemap.namespace=http://www.w3.org/TR/rdf-syntax-grammar;
+{{- print "" }}http://www.openarchives.org/ore/terms
 
 dataone.mn.registration.serviceType.url={{ .Values.idxworker.d1_serviceType_url }}
 
-
-#The time (millisecond) that the resource map processor waits for the solr doc readiness of its components 
+#Time (milliseconds) that resource map processor waits for solr doc readiness of its components
 index.resourcemap.waitingComponent.time=800
-#The number of the attempts that the resource map processor tries to wait for the solr doc readiness of its components
+#Number of times the resource map processor waits for the solr doc readiness of its components
 index.resourcemap.waitingComponent.max.attempts=25
-#The time (millisecond) that indexer will wait to grab a newer version of solr doc when a version conflict happened 
+#Time (milliseconds) indexer will wait to grab a newer version of solr doc after a version conflict
 index.solr.versionConflict.waiting.time=500
-#The number of the attempts that indexer tries to grab a newer version of solr doc when a version conflict happened 
+#Number of the times the indexer tries to get a newer version of solr doc after a version conflict
 index.solr.versionConflict.max.attempts=5