diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
index cd47358c0..276fcf87f 100644
--- a/pkg/cluster/k8sres.go
+++ b/pkg/cluster/k8sres.go
@@ -77,7 +77,15 @@ func (c *Cluster) statefulSetName() string {
 }
 
 func (c *Cluster) configMapName(role PostgresRole) string {
-	return c.serviceName(role)
+	name := c.Name
+	if role == Master {
+		name = name + "-leader"
+	}
+	if role == Replica {
+		name = name + "-repl"
+	}
+
+	return name
 }
 
 func (c *Cluster) endpointName(role PostgresRole) string {