diff --git a/charts/latest/spdk-csi/templates/config-map.yaml b/charts/latest/spdk-csi/templates/config-map.yaml
index 9e02322..01041f5 100644
--- a/charts/latest/spdk-csi/templates/config-map.yaml
+++ b/charts/latest/spdk-csi/templates/config-map.yaml
@@ -76,8 +76,8 @@ data:
         return []
 
     def activate_cluster_if_needed(cluster_ip, cluster_uuid, cluster_secret, distr_ndcs, distr_npcs):
-        retries = 60
         total_value = distr_ndcs + distr_npcs + 1
+        retries = total_value * 30
         while retries > 0:
             node_statuses = get_node_statuses(cluster_ip, cluster_uuid, cluster_secret)
             online_nodes = [node for node in node_statuses if node.get('status') == 'online']
diff --git a/pkg/spdk/nodeserver.go b/pkg/spdk/nodeserver.go
index 569a040..a8b5588 100644
--- a/pkg/spdk/nodeserver.go
+++ b/pkg/spdk/nodeserver.go
@@ -302,7 +302,6 @@ func (ns *nodeServer) NodeExpandVolume(_ context.Context, req *csi.NodeExpandVol
 
 	volumeID := req.GetVolumeId()
 	volumeMountPath := req.GetVolumePath()
-	updatedSize := req.GetCapacityRange().GetRequiredBytes()
 
 	stagingParentPath := req.GetStagingTargetPath()
 	volumeContext, err := util.LookupVolumeContext(stagingParentPath)
@@ -333,7 +332,7 @@ func (ns *nodeServer) NodeExpandVolume(_ context.Context, req *csi.NodeExpandVol
 		}
 	}
 
-	return &csi.NodeExpandVolumeResponse{CapacityBytes: updatedSize}, nil
+	return &csi.NodeExpandVolumeResponse{}, nil
 }
 
 // must be idempotent