diff --git a/ocs_ci/deployment/deployment.py b/ocs_ci/deployment/deployment.py
index 59a62b22f5a..d880cd27979 100644
--- a/ocs_ci/deployment/deployment.py
+++ b/ocs_ci/deployment/deployment.py
@@ -759,7 +759,12 @@ def post_ocp_deploy(self):
             ibmcloud.label_nodes_region()
         # configure Ingress Node Firewall and restrict SSH access to nodes
         if config.ENV_DATA.get("restrict_ssh_access_to_nodes", False):
-            restrict_ssh_access_to_nodes()
+            try:
+                restrict_ssh_access_to_nodes()
+            except Exception as err:
+                logger.warning(
+                    f"Ingress Node Firewall deployment and SSH access to nodes restriction failed: {err}"
+                )
 
     def label_and_taint_nodes(self):
         """
diff --git a/ocs_ci/deployment/ingress_node_firewall.py b/ocs_ci/deployment/ingress_node_firewall.py
index 5ed23f4764d..d7426ff10fa 100644
--- a/ocs_ci/deployment/ingress_node_firewall.py
+++ b/ocs_ci/deployment/ingress_node_firewall.py
@@ -162,7 +162,7 @@ def verify_csv_status(self):
 
         """
         for csv in TimeoutSampler(
-            timeout=900,
+            timeout=1800,
             sleep=15,
             func=get_csvs_start_with_prefix,
             csv_prefix=constants.INGRESS_NODE_FIREWALL_CSV_NAME,