diff --git a/main.go b/main.go
index 08476a8..331d463 100644
--- a/main.go
+++ b/main.go
@@ -560,7 +560,9 @@ func (c *controller) sync(ctx context.Context) {
 	statefulsets := make(map[string][]*appsv1.StatefulSet)
 
 	for _, obj := range c.ssetInf.GetStore().List() {
+
 		sts, ok := obj.(*appsv1.StatefulSet)
+
 		if !ok {
 			level.Error(c.logger).Log("msg", "failed type assertion from expected StatefulSet")
 		}
@@ -571,9 +573,9 @@ func (c *controller) sync(ctx context.Context) {
 		}
 
 		// If there's an increase in replicas we poll for the new replicas to be ready
-		if _, ok := c.replicas[hashring]; ok && c.replicas[hashring] < *sts.Spec.Replicas {
+		if _, ok := c.replicas[sts.Name]; ok && c.replicas[sts.Name] < *sts.Spec.Replicas {
 			// Iterate over new replicas to wait until they are running
-			for i := c.replicas[hashring]; i < *sts.Spec.Replicas; i++ {
+			for i := c.replicas[sts.Name]; i < *sts.Spec.Replicas; i++ {
 				start := time.Now()
 				podName := fmt.Sprintf("%s-%d", sts.Name, i)
 
@@ -586,21 +588,23 @@ func (c *controller) sync(ctx context.Context) {
 			}
 		}
 
-		c.replicas[hashring] = *sts.Spec.Replicas
+		c.replicas[sts.Name] = *sts.Spec.Replicas
 
 		if _, ok := statefulsets[hashring]; !ok {
 			statefulsets[hashring] = []*appsv1.StatefulSet{}
 		}
 		// Append the new value to the slice associated with the hashring key
 		statefulsets[hashring] = append(statefulsets[hashring], sts.DeepCopy())
-		level.Info(c.logger).Log("Hashring ", hashring, " got a statefulset: ", sts.Name)
+		level.Info(c.logger).Log("msg ", "hashring got a new statefulset", "hashring", hashring, "statefulset", sts.Name)
 
 		time.Sleep(c.options.scaleTimeout) // Give some time for all replicas before they receive hundreds req/s
 	}
 
 	c.populate(ctx, hashrings, statefulsets)
+	level.Info(c.logger).Log("msg", "hashring populated", "hashring", fmt.Sprintf("%+v", hashrings))
 
 	err = c.saveHashring(ctx, hashrings, cm)
+
 	if err != nil {
 		c.reconcileErrors.WithLabelValues(save).Inc()
 		level.Error(c.logger).Log("msg", "failed to save hashrings", "err", err)
@@ -644,7 +648,9 @@ func (c controller) waitForPod(ctx context.Context, name string) error {
 
 func (c *controller) populate(ctx context.Context, hashrings []receive.HashringConfig, statefulsets map[string][]*appsv1.StatefulSet) {
 	for i, h := range hashrings {
+
 		stsList, exists := statefulsets[h.Hashring]
+
 		if !exists {
 			continue
 		}
@@ -676,7 +682,7 @@ func (c *controller) populate(ctx context.Context, hashrings []receive.HashringC
 				endpoint := *c.populateEndpoint(sts, i, err, pod)
 				endpoints = append(endpoints, endpoint)
 
-				level.Info(c.logger).Log("Hashring ", h.Hashring, " got an endpoint: ", endpoint.Address, "with AZ", endpoint.AZ)
+				level.Info(c.logger).Log("msg", "Hashring got an endpoint", "hashring", h.Hashring, "endpoint:", endpoint.Address, "AZ", endpoint.AZ)
 			}
 		}
 
diff --git a/main_test.go b/main_test.go
index cd61c83..69ac393 100644
--- a/main_test.go
+++ b/main_test.go
@@ -430,6 +430,7 @@ func TestControllerConfigmapUpdate(t *testing.T) {
 			if shouldBeUpdated {
 				// Generated configmap should be overfidden by default properties.
 				if cmp.Equal(gcm.Labels, map[string]string{}) {
+					print(cm)
 					t.Errorf("generated configmap should have been updated\ncase:\t%q\noriginal:\t%+v\ngenerated:\t%+v\n", name, cm.Labels, gcm.Labels)
 				}
 			} else {