diff --git a/cadence/templates/server-configmap.yaml b/cadence/templates/server-configmap.yaml
index b8a2fa29..f57a1faa 100644
--- a/cadence/templates/server-configmap.yaml
+++ b/cadence/templates/server-configmap.yaml
@@ -69,16 +69,16 @@ data:
       name: cadence
       bootstrapMode: dns
       bootstrapHosts:
-        - {{ include "cadence.componentname" (list . "frontend-headless") }}:{{ .Values.server.frontend.service.port }}
-        - {{ include "cadence.componentname" (list . "history-headless") }}:{{ .Values.server.history.service.port }}
-        - {{ include "cadence.componentname" (list . "matching-headless") }}:{{ .Values.server.matching.service.port }}
-        - {{ include "cadence.componentname" (list . "worker-headless") }}:{{ .Values.server.worker.service.port }}
+        - {{ include "cadence.componentname" (list . "frontend-headless") }}:{{ `{{ .Env.FRONTEND_PORT | default .Values.server.frontend.service.port | default 7933 }}` }}
+        - {{ include "cadence.componentname" (list . "history-headless") }}:{{ `{{ .Env.HISTORY_PORT | default .Values.server.history.service.port | default 7934 }}` }}
+        - {{ include "cadence.componentname" (list . "matching-headless") }}:{{ `{{ .Env.MATCHING_PORT | default .Values.server.matching.service.port | default 7935 }}` }}
+        - {{ include "cadence.componentname" (list . "worker-headless") }}:{{ `{{ .Env.WORKER_PORT | default .Values.server.worker.service.port | default 7939 }}` }}
       maxJoinDuration: 30s
 
     services:
       frontend:
         rpc:
-          port: {{ include "cadence.frontend.internalPort" . }}
+          port: {{ `{{ .Env.FRONTEND_PORT | default (include "cadence.frontend.internalPort" .) | default 7933 }}` }}
           bindOnIP: {{ `{{ default .Env.POD_IP "0.0.0.0" }}` }}
         metrics:
           tags:
@@ -94,7 +94,7 @@ data:
 
       history:
         rpc:
-          port: {{ include "cadence.history.internalPort" . }}
+          port: {{ `{{ .Env.HISTORY_PORT | default (include "cadence.history.internalPort" .) | default 7934 }}` }}
           bindOnIP: {{ `{{ default .Env.POD_IP "0.0.0.0" }}` }}
         metrics:
           tags:
@@ -110,7 +110,7 @@ data:
 
       matching:
         rpc:
-          port: {{ include "cadence.matching.internalPort" . }}
+          port: {{ `{{ .Env.MATCHING_PORT | default (include "cadence.matching.internalPort" .) | default 7935 }}` }}
           bindOnIP: {{ `{{ default .Env.POD_IP "0.0.0.0" }}` }}
         metrics:
           tags:
@@ -126,7 +126,7 @@ data:
 
       worker:
         rpc:
-          port: {{ include "cadence.worker.internalPort" . }}
+          port: {{ `{{ .Env.WORKER_PORT | default (include "cadence.worker.internalPort" .) | default 7939 }}` }}
           bindOnIP: {{ `{{ default .Env.POD_IP "0.0.0.0" }}` }}
         metrics:
           tags:
@@ -154,13 +154,13 @@ data:
           enabled: true
           initialFailoverVersion: 0
           rpcName: "cadence-frontend"
-          rpcAddress: {{ `{{ default .Env.PRIMARY_SEEDS "cadence" }}` }}:7933
+          rpcAddress: {{ `{{ .Env.PRIMARY_FRONTEND_SERVICE | default "cadence" }}` }}:{{ `{{ .Env.FRONTEND_PORT | default .Values.server.frontend.service.port | default 7933 }}` }}
       {{- if `{{ .Env.ENABLE_GLOBAL_DOMAIN }}` }}
         secondary:
             enabled: true
             initialFailoverVersion: 2
             rpcName: "cadence-frontend"
-            rpcAddress: {{ `{{ default .Env.SECONDARY_SEEDS "cadence-secondary" }}` }}:7933
+            rpcAddress: {{ `{{ .Env.SECONDARY_FRONTEND_SERVICE | default "cadence-secondary" }}` }}:{{ `{{ .Env.FRONTEND_PORT | default .Values.server.frontend.service.port | default 7933 }}` }}
       {{- end }}
 
     dcRedirectionPolicy:
@@ -171,7 +171,7 @@ data:
       status: "disabled"
 
     publicClient:
-      hostPort: "{{ include "cadence.componentname" (list . "frontend") }}:{{ .Values.server.frontend.service.port }}"
+      hostPort: "{{ `{{ .Env.FRONTEND_SERVICE | default (include "cadence.componentname" (list . "frontend")) | default "127.0.0.1" }}` }}:{{ `{{ .Env.FRONTEND_PORT | default .Values.server.frontend.service.port | default 7933 }}` }}
 
     dynamicConfigClient:
       filepath: "/etc/cadence/config/dynamicconfig/config.yaml"