diff --git a/cadence/templates/server-configmap.yaml b/cadence/templates/server-configmap.yaml
index 71c32cc6..d586ff59 100644
--- a/cadence/templates/server-configmap.yaml
+++ b/cadence/templates/server-configmap.yaml
@@ -158,24 +158,13 @@ data:
       enableGlobalDomain: {{ `{{ default .Env.ENABLE_GLOBAL_DOMAIN "true" }}` }}
       failoverVersionIncrement: 10
       masterClusterName: "primary"
-    {{- if `{{ .Env.IS_NOT_PRIMARY }}` }}
-      currentClusterName: "secondary"
-    {{- else }}
       currentClusterName: "primary"
-    {{- end }}
       clusterInformation:
         primary:
           enabled: true
           initialFailoverVersion: 0
           rpcName: "cadence-frontend"
-          rpcAddress: {{ `{{ default .Env.PRIMARY_FRONTEND_SERVICE "cadence" }}` }}:{{ .Values.server.frontend.service.port | default `{{ default .Env.FRONTEND_PORT 7933 }}` }}
-      {{- if `{{ .Env.ENABLE_GLOBAL_DOMAIN }}` }}
-        secondary:
-            enabled: true
-            initialFailoverVersion: 2
-            rpcName: "cadence-frontend"
-            rpcAddress: {{ `{{ default .Env.SECONDARY_FRONTEND_SERVICE "cadence-secondary" }}` }}:{{ .Values.server.frontend.service.port | default `{{ default .Env.FRONTEND_PORT 7933 }}` }}
-      {{- end }}
+          rpcAddress: {{ `{{ default .Env.PRIMARY_FRONTEND_SERVICE "cadence" }}` }}:{{ .Values.server.frontend.service.port }}
     {{- end }}
 
     dcRedirectionPolicy:
@@ -186,7 +175,7 @@ data:
       status: "disabled"
 
     publicClient:
-      hostPort: "{{ include "cadence.componentname" (list . "frontend") | default `{{ default .Env.FRONTEND_SERVICE "127.0.0.1" }}` }}:{{ .Values.server.frontend.service.port | default `{{ default .Env.FRONTEND_PORT 7933 }}` }}"
+      hostPort: "{{ include "cadence.componentname" (list . "frontend") }}:{{ .Values.server.frontend.service.port }}"
 
     dynamicConfigClient:
       filepath: "/etc/cadence/config/dynamicconfig/config.yaml"
diff --git a/cadence/values.yaml b/cadence/values.yaml
index 7687bcae..836c3578 100644
--- a/cadence/values.yaml
+++ b/cadence/values.yaml
@@ -75,15 +75,15 @@ server:
       # i*failoverVersionIncrement) **MUST** result in a unique value.
       failoverVersionIncrement: 10
 
-      # masterClusterName is the name of the only cluster which can register
-      # and update a domain, although each cluster can do domain failover.
-      #
-      # WARNING: This value **MUST NOT** be changed after launching the Cadence
-      # cluster group.
+      # masterClusterName is the name of the only cluster which can register a
+      # domain, although each cluster can update domains and do domain failover.
       masterClusterName: "cluster-0"
 
       # currentClusterName is the name of the current active cluster for the
       # global domain.
+      #
+      # WARNING: This value **MUST NOT** be changed manually after launching the
+      # Cadence cluster group.
       currentClusterName: "cluster-0"
       
       # clusterInformation contains the information about each cluster which
@@ -109,7 +109,7 @@ server:
           rpcName: cadence-frontend
           # rpcAddress defines the address (host:port, host can be a DNS name)
           # of the Cadence frontend remote service to use in a Cadence cluster.
-          rpcAddress: cadence:7933
+          rpcAddress: cadence-frontend:7933
         # cluster-1:
         #   enabled: true
         #   initialFailoverVersion: 1