diff --git a/pkg/controller/backup-operator/sync.go b/pkg/controller/backup-operator/sync.go
index e5ae56567..9b69be001 100644
--- a/pkg/controller/backup-operator/sync.go
+++ b/pkg/controller/backup-operator/sync.go
@@ -169,10 +169,11 @@ func (b *Backup) removeFinalizerOfPeriodicBackup(eb *api.EtcdBackup) error {
 
 func (b *Backup) periodicRunnerFunc(ctx context.Context, t *time.Ticker, eb *api.EtcdBackup) {
 	defer t.Stop()
+periodicRunnerFunc:
 	for {
 		select {
 		case <-ctx.Done():
-			break
+			break periodicRunnerFunc
 		case <-t.C:
 			var latestEb *api.EtcdBackup
 			var bs *api.BackupStatus
@@ -184,7 +185,7 @@ func (b *Backup) periodicRunnerFunc(ctx context.Context, t *time.Ticker, eb *api
 					if apierrors.IsNotFound(err) {
 						b.logger.Infof("Could not find EtcdBackup. Stopping periodic backup for EtcdBackup CR %v",
 							eb.Name)
-						break
+						break periodicRunnerFunc
 					}
 					b.logger.Warningf("[Attempt: %d/%d] Failed to get latest EtcdBackup %v : (%v)",
 						i, retryLimit, eb.Name, err)
diff --git a/pkg/util/etcdutil/member.go b/pkg/util/etcdutil/member.go
index 8dc74ede4..824a79fea 100644
--- a/pkg/util/etcdutil/member.go
+++ b/pkg/util/etcdutil/member.go
@@ -38,13 +38,17 @@ type Member struct {
 	ClusterDomain string
 }
 
-func (m *Member) Addr() string {
+func (m *Member) ClientAddr() string {
+	return fmt.Sprintf("%s-client.%s.svc%s", clusterNameFromMemberName(m.Name), m.Namespace, m.ClusterDomain)
+}
+
+func (m *Member) PeerAddr() string {
 	return fmt.Sprintf("%s.%s.%s.svc%s", m.Name, clusterNameFromMemberName(m.Name), m.Namespace, m.ClusterDomain)
 }
 
 // ClientURL is the client URL for this member
 func (m *Member) ClientURL() string {
-	return fmt.Sprintf("%s://%s:2379", m.clientScheme(), m.Addr())
+	return fmt.Sprintf("%s://%s:2379", m.clientScheme(), m.ClientAddr())
 }
 
 func (m *Member) clientScheme() string {
@@ -69,7 +73,7 @@ func (m *Member) ListenPeerURL() string {
 }
 
 func (m *Member) PeerURL() string {
-	return fmt.Sprintf("%s://%s:2380", m.peerScheme(), m.Addr())
+	return fmt.Sprintf("%s://%s:2380", m.peerScheme(), m.PeerAddr())
 }
 
 type MemberSet map[string]*Member
diff --git a/pkg/util/k8sutil/k8sutil.go b/pkg/util/k8sutil/k8sutil.go
index 8db36f18a..edcd73adb 100644
--- a/pkg/util/k8sutil/k8sutil.go
+++ b/pkg/util/k8sutil/k8sutil.go
@@ -388,7 +388,7 @@ func newEtcdPod(m *etcdutil.Member, initialCluster []string, clusterName, state,
 				            exit 1
 				        fi
 						sleep 1
-					done`, DNSTimeout, m.Addr())},
+					done`, DNSTimeout, m.PeerAddr())},
 			}},
 			Containers:    []v1.Container{container},
 			RestartPolicy: v1.RestartPolicyNever,