diff --git a/docker/helm/templates/configmap.yaml b/docker/helm/templates/configmap.yaml
index 22f91f8af..df52d912c 100644
--- a/docker/helm/templates/configmap.yaml
+++ b/docker/helm/templates/configmap.yaml
@@ -29,10 +29,10 @@ data:
     {{- $namespace  := .Release.Namespace }}
     rss.ha.enabled=true
     rss.ha.service.id=rss
-    rss.ha.master.hosts={{ range until (.Values.masterReplicas |int) }}shuffleservice-master-{{ . }}.rss-svc.{{ $namespace }}.svc.cluster.local,{{ end }}
+    rss.ha.master.hosts={{ range until (.Values.masterReplicas |int) }}shuffleservice-master-{{ . }}.rss-master-svc.{{ $namespace }}.svc.cluster.local,{{ end }}
     rss.ha.nodes.rss={{ range until (.Values.masterReplicas |int) }}node{{ . }},{{ end }}
     {{- range until (.Values.masterReplicas |int) }}
-    rss.ha.address.rss.node{{ . }}=shuffleservice-master-{{ . }}.rss-svc.{{ $namespace }}.svc.cluster.local
+    rss.ha.address.rss.node{{ . }}=shuffleservice-master-{{ . }}.rss-master-svc.{{ $namespace }}.svc.cluster.local
     {{- end }}
     
   rss-env.sh: |
diff --git a/docker/helm/templates/master-statefulset.yaml b/docker/helm/templates/master-statefulset.yaml
index 17e50a1fe..41a810a11 100644
--- a/docker/helm/templates/master-statefulset.yaml
+++ b/docker/helm/templates/master-statefulset.yaml
@@ -77,7 +77,7 @@ spec:
           - "--"
           - "/bin/sh"
           - '-c'
-          - "until {{ range until (.Values.masterReplicas |int) }}nslookup shuffleservice-master-{{ . }}.rss-svc && {{ end }}true; do echo waiting for master; sleep 2; done && /opt/rss-{{ .Values.rssVersion }}-bin-release/sbin/start-master.sh"
+          - "until {{ range until (.Values.masterReplicas |int) }}nslookup shuffleservice-master-{{ . }}.rss-master-svc && {{ end }}true; do echo waiting for master; sleep 2; done && /opt/rss-{{ .Values.rssVersion }}-bin-release/sbin/start-master.sh"
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         ports:
diff --git a/docker/helm/templates/worker-statefulset.yaml b/docker/helm/templates/worker-statefulset.yaml
index e89fee511..3790e84c7 100644
--- a/docker/helm/templates/worker-statefulset.yaml
+++ b/docker/helm/templates/worker-statefulset.yaml
@@ -77,7 +77,7 @@ spec:
           - "--"
           - "/bin/sh"
           - '-c'
-          - "until {{ range until (.Values.masterReplicas |int) }}nslookup shuffleservice-master-{{ . }}.rss-svc && {{ end }}true; do echo waiting for master; sleep 2; done && /opt/rss-{{ .Values.rssVersion }}-bin-release/sbin/start-worker.sh"
+          - "until {{ range until (.Values.masterReplicas |int) }}nslookup shuffleservice-master-{{ . }}.rss-master-svc && {{ end }}true; do echo waiting for master; sleep 2; done && /opt/rss-{{ .Values.rssVersion }}-bin-release/sbin/start-worker.sh"
         resources:
           {{- toYaml .Values.resources | nindent 12 }}
         ports: