diff --git a/ocs_ci/deployment/deployment.py b/ocs_ci/deployment/deployment.py
index 85284138730..95093db6282 100644
--- a/ocs_ci/deployment/deployment.py
+++ b/ocs_ci/deployment/deployment.py
@@ -1058,7 +1058,6 @@ def deploy_ocs_via_operator(self, image=None):
             create_catalog_source(image)
 
         if config.DEPLOYMENT.get("local_storage"):
-            cleanup_nodes_for_lso_install()
             setup_local_storage(storageclass=self.DEFAULT_STORAGECLASS_LSO)
 
         logger.info("Creating namespace and operator group.")
diff --git a/ocs_ci/ocs/ui/deployment_ui.py b/ocs_ci/ocs/ui/deployment_ui.py
index d2d7fcda421..b71bea6d9a8 100644
--- a/ocs_ci/ocs/ui/deployment_ui.py
+++ b/ocs_ci/ocs/ui/deployment_ui.py
@@ -268,18 +268,16 @@ def install_lso_cluster(self):
 
         self.configure_performance()
 
-        if self.operator_name == OCS_OPERATOR:
-            logger.info(f"Select {constants.LOCAL_BLOCK_RESOURCE} storage class")
-            self.choose_expanded_mode(
-                mode=True, locator=self.dep_loc["storage_class_dropdown_lso"]
-            )
-            self.do_click(locator=self.dep_loc["localblock_sc"], enable_screenshot=True)
-            timeout_next = 30
-        else:
-            timeout_next = 600
-        self.do_click(
-            self.dep_loc["next"], enable_screenshot=True, timeout=timeout_next
+        sample = TimeoutSampler(
+            timeout=700,
+            sleep=40,
+            func=self.wait_next_button_lso,
         )
+        if not sample.wait_for_func_status(result=True):
+            self.take_screenshot()
+            raise TimeoutExpiredError(
+                "Next button on LSO is not clickable after 700 seconds"
+            )
 
         self.configure_encryption()
 
@@ -287,6 +285,14 @@ def install_lso_cluster(self):
 
         self.create_storage_cluster()
 
+    def wait_next_button_lso(self):
+        try:
+            self.do_click(self.dep_loc["next"], enable_screenshot=True, timeout=20)
+        except Exception as e:
+            logger.error(f"Next button on LSO error: {e}")
+            return False
+        return True
+
     def install_internal_cluster(self):
         """
         Install Internal Cluster