diff --git a/controllers/rack.go b/controllers/rack.go
index 967b26484..d4661d30b 100644
--- a/controllers/rack.go
+++ b/controllers/rack.go
@@ -688,7 +688,6 @@ func (r *SingleClusterReconciler) upgradeRack(statefulSet *appsv1.StatefulSet, r
 		)
 
 		podNames := getPodNames(podsBatch)
-
 		if err = r.createOrUpdatePodServiceIfNeeded(podNames); err != nil {
 			return nil, reconcileError(err)
 		}
@@ -954,7 +953,7 @@ func (r *SingleClusterReconciler) rollingRestartRack(found *appsv1.StatefulSet,
 	var podsBatchList [][]*corev1.Pod
 
 	if len(failedPods) != 0 {
-		// creating a single batch of all failed pods in a rack, irrespective of batch size
+		// Creating a single batch of all failed pods in a rack, irrespective of batch size
 		r.Log.Info("Skipping batchSize for failed pods")
 
 		podsBatchList = make([][]*corev1.Pod, 1)
@@ -978,13 +977,11 @@ func (r *SingleClusterReconciler) rollingRestartRack(found *appsv1.StatefulSet,
 		)
 
 		podNames := getPodNames(podsBatch)
-
 		if err = r.createOrUpdatePodServiceIfNeeded(podNames); err != nil {
 			return nil, reconcileError(err)
 		}
 
-		res := r.rollingRestartPods(rackState, podsBatch, ignorablePods, restartTypeMap)
-		if !res.isSuccess {
+		if res := r.rollingRestartPods(rackState, podsBatch, ignorablePods, restartTypeMap); !res.isSuccess {
 			return found, res
 		}
 
diff --git a/controllers/reconciler.go b/controllers/reconciler.go
index 002c4f315..b0619c971 100644
--- a/controllers/reconciler.go
+++ b/controllers/reconciler.go
@@ -89,6 +89,17 @@ func (r *SingleClusterReconciler) Reconcile() (ctrl.Result, error) {
 		}
 	}
 
+	if err := r.createOrUpdateSTSHeadlessSvc(); err != nil {
+		r.Log.Error(err, "Failed to create headless service")
+		r.Recorder.Eventf(
+			r.aeroCluster, corev1.EventTypeWarning, "ServiceCreateFailed",
+			"Failed to create Service(Headless) %s/%s",
+			r.aeroCluster.Namespace, r.aeroCluster.Name,
+		)
+
+		return reconcile.Result{}, err
+	}
+
 	// Reconcile all racks
 	if res := r.reconcileRacks(); !res.isSuccess {
 		if res.err != nil {
@@ -102,17 +113,6 @@ func (r *SingleClusterReconciler) Reconcile() (ctrl.Result, error) {
 		return res.getResult()
 	}
 
-	if err := r.createOrUpdateSTSHeadlessSvc(); err != nil {
-		r.Log.Error(err, "Failed to create headless service")
-		r.Recorder.Eventf(
-			r.aeroCluster, corev1.EventTypeWarning, "ServiceCreateFailed",
-			"Failed to create Service(Headless) %s/%s",
-			r.aeroCluster.Namespace, r.aeroCluster.Name,
-		)
-
-		return reconcile.Result{}, err
-	}
-
 	if err := r.createOrUpdateSTSLoadBalancerSvc(); err != nil {
 		r.Log.Error(err, "Failed to create LoadBalancer service")
 		r.Recorder.Eventf(
diff --git a/controllers/service.go b/controllers/service.go
index a8f4b52c3..cb19ce333 100644
--- a/controllers/service.go
+++ b/controllers/service.go
@@ -25,15 +25,20 @@ func (r *SingleClusterReconciler) createOrUpdateSTSHeadlessSvc() error {
 	r.Log.Info("Create or Update headless service for statefulSet")
 
 	serviceName := getSTSHeadLessSvcName(r.aeroCluster)
+	service := &corev1.Service{}
 
-	err := r.updateServicePorts(serviceName, r.aeroCluster.Namespace)
-	if err == nil {
-		return nil
-	}
+	err := r.Client.Get(
+		context.TODO(), types.NamespacedName{
+			Name: serviceName, Namespace: r.aeroCluster.Namespace,
+		}, service,
+	)
+	if err != nil {
+		if !errors.IsNotFound(err) {
+			return err
+		}
 
-	if errors.IsNotFound(err) {
 		ls := utils.LabelsForAerospikeCluster(r.aeroCluster.Name)
-		service := &corev1.Service{
+		service = &corev1.Service{
 			ObjectMeta: metav1.ObjectMeta{
 				// Headless service has the same name as AerospikeCluster
 				Name:      serviceName,
@@ -73,9 +78,11 @@ func (r *SingleClusterReconciler) createOrUpdateSTSHeadlessSvc() error {
 		}
 
 		r.Log.Info("Created new headless service")
+
+		return nil
 	}
 
-	return nil
+	return r.updateServicePorts(service)
 }
 
 func (r *SingleClusterReconciler) createOrUpdateSTSLoadBalancerSvc() error {
@@ -147,8 +154,7 @@ func (r *SingleClusterReconciler) createOrUpdateSTSLoadBalancerSvc() error {
 	}
 
 	if len(service.Spec.Ports) == 1 && service.Spec.Ports[0].Port == servicePort.Port &&
-		service.Spec.Ports[0].TargetPort == servicePort.TargetPort &&
-		service.Spec.Ports[0].Name == servicePort.Name {
+		service.Spec.Ports[0].TargetPort == servicePort.TargetPort {
 		return nil
 	}
 
@@ -164,7 +170,7 @@ func (r *SingleClusterReconciler) createOrUpdateSTSLoadBalancerSvc() error {
 	}
 
 	r.Log.Info(
-		"LoadBalancer Service already exist for cluster. Using existing service",
+		"LoadBalancer Service already exist for cluster. Updated existing service",
 		"name", utils.NamespacedName(service.Namespace, service.Name),
 	)
 
@@ -172,14 +178,20 @@ func (r *SingleClusterReconciler) createOrUpdateSTSLoadBalancerSvc() error {
 }
 
 func (r *SingleClusterReconciler) createOrUpdatePodService(pName, pNamespace string) error {
-	err := r.updateServicePorts(pName, pNamespace)
-	if err == nil {
-		return nil
-	}
+	service := &corev1.Service{}
+
+	err := r.Client.Get(
+		context.TODO(), types.NamespacedName{
+			Name: pName, Namespace: pNamespace,
+		}, service,
+	)
+	if err != nil {
+		if !errors.IsNotFound(err) {
+			return err
+		}
 
-	if errors.IsNotFound(err) {
 		// NodePort will be allocated automatically
-		service := &corev1.Service{
+		service = &corev1.Service{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      pName,
 				Namespace: pNamespace,
@@ -211,9 +223,11 @@ func (r *SingleClusterReconciler) createOrUpdatePodService(pName, pNamespace str
 				"failed to create new service for pod %s: %v", pName, err,
 			)
 		}
+
+		return nil
 	}
 
-	return nil
+	return r.updateServicePorts(service)
 }
 
 func (r *SingleClusterReconciler) deletePodService(pName, pNamespace string) error {
@@ -240,15 +254,7 @@ func (r *SingleClusterReconciler) deletePodService(pName, pNamespace string) err
 	return nil
 }
 
-func (r *SingleClusterReconciler) updateServicePorts(sName, sNamespace string) error {
-	service := &corev1.Service{}
-	if err := r.Client.Get(
-		context.TODO(),
-		types.NamespacedName{Name: sName, Namespace: sNamespace}, service,
-	); err != nil {
-		return err
-	}
-
+func (r *SingleClusterReconciler) updateServicePorts(service *corev1.Service) error {
 	servicePorts := r.getServicePorts()
 
 	servicePortsMap := make(map[string]int32)
@@ -270,7 +276,7 @@ func (r *SingleClusterReconciler) updateServicePorts(sName, sNamespace string) e
 		context.TODO(), service, updateOption,
 	); err != nil {
 		return fmt.Errorf(
-			"failed to update service %s: %v", sName, err,
+			"failed to update service %s: %v", service.Name, err,
 		)
 	}
 
diff --git a/test/batch_restart_pods_test.go b/test/batch_restart_pods_test.go
index 241c4763d..5d53ef76e 100644
--- a/test/batch_restart_pods_test.go
+++ b/test/batch_restart_pods_test.go
@@ -434,9 +434,8 @@ func isBatchRestart(aeroCluster *asdbv1.AerospikeCluster) bool {
 	// Operator should restart batch of pods which will make multiple pods unready
 	for i := 0; i < 100; i++ {
 		readyPods := getReadyPods(aeroCluster)
-		unreadyPods := int(aeroCluster.Spec.Size) - len(readyPods)
-		fmt.Printf("unreadyPods %d\n", unreadyPods)
 
+		unreadyPods := int(aeroCluster.Spec.Size) - len(readyPods)
 		if unreadyPods > 1 {
 			return true
 		}