diff --git a/lib/rules/web/admin_console/4.2/goto.xyaml b/lib/rules/web/admin_console/4.2/goto.xyaml
index 24e8017763..5de8cff4b6 100644
--- a/lib/rules/web/admin_console/4.2/goto.xyaml
+++ b/lib/rules/web/admin_console/4.2/goto.xyaml
@@ -193,6 +193,7 @@ goto_machineconfig_pools_page:
   url: k8s/cluster/machineconfiguration.openshift.io~v1~MachineConfigPool
 goto_machine_sets_page:
   url: k8s/ns/openshift-machine-api/machine.openshift.io~v1beta1~MachineSet
+  action: wait_box_loaded
 goto_machineautoscaler_list_page:
   url: k8s/ns/openshift-machine-api/autoscaling.openshift.io~v1beta1~MachineAutoscaler
 goto_one_machineautoscaler_page:
diff --git a/lib/rules/web/admin_console/4.3/goto.xyaml b/lib/rules/web/admin_console/4.3/goto.xyaml
index c54acd3b6b..97bf87627e 100644
--- a/lib/rules/web/admin_console/4.3/goto.xyaml
+++ b/lib/rules/web/admin_console/4.3/goto.xyaml
@@ -232,6 +232,7 @@ goto_machineconfig_pools_page:
   url: k8s/cluster/machineconfiguration.openshift.io~v1~MachineConfigPool
 goto_machine_sets_page:
   url: k8s/ns/openshift-machine-api/machine.openshift.io~v1beta1~MachineSet
+  action: wait_box_loaded
 goto_machineautoscaler_list_page:
   url: k8s/ns/openshift-machine-api/autoscaling.openshift.io~v1beta1~MachineAutoscaler
 goto_one_machineautoscaler_page:
diff --git a/lib/rules/web/admin_console/4.4/goto.xyaml b/lib/rules/web/admin_console/4.4/goto.xyaml
index 748f023ddb..c3f44cb806 100644
--- a/lib/rules/web/admin_console/4.4/goto.xyaml
+++ b/lib/rules/web/admin_console/4.4/goto.xyaml
@@ -260,6 +260,7 @@ goto_machineconfig_pools_page:
   url: k8s/cluster/machineconfiguration.openshift.io~v1~MachineConfigPool
 goto_machine_sets_page:
   url: k8s/ns/openshift-machine-api/machine.openshift.io~v1beta1~MachineSet
+  action: wait_box_loaded
 goto_machineautoscaler_list_page:
   url: k8s/ns/openshift-machine-api/autoscaling.openshift.io~v1beta1~MachineAutoscaler
 goto_one_machineautoscaler_page:
diff --git a/lib/rules/web/admin_console/4.5/goto.xyaml b/lib/rules/web/admin_console/4.5/goto.xyaml
index d83b905949..212841f107 100644
--- a/lib/rules/web/admin_console/4.5/goto.xyaml
+++ b/lib/rules/web/admin_console/4.5/goto.xyaml
@@ -268,6 +268,7 @@ goto_machineconfig_pools_page:
   url: k8s/cluster/machineconfiguration.openshift.io~v1~MachineConfigPool
 goto_machine_sets_page:
   url: k8s/ns/openshift-machine-api/machine.openshift.io~v1beta1~MachineSet
+  action: wait_box_loaded
 goto_machineautoscaler_list_page:
   url: k8s/ns/openshift-machine-api/autoscaling.openshift.io~v1beta1~MachineAutoscaler
 goto_one_machineautoscaler_page:
diff --git a/lib/rules/web/admin_console/4.6/goto.xyaml b/lib/rules/web/admin_console/4.6/goto.xyaml
index 9eab2ab351..46cd7d89d9 100644
--- a/lib/rules/web/admin_console/4.6/goto.xyaml
+++ b/lib/rules/web/admin_console/4.6/goto.xyaml
@@ -290,6 +290,7 @@ goto_machineconfig_pools_page:
   url: k8s/cluster/machineconfiguration.openshift.io~v1~MachineConfigPool
 goto_machine_sets_page:
   url: k8s/ns/openshift-machine-api/machine.openshift.io~v1beta1~MachineSet
+  action: wait_box_loaded
 goto_machineautoscaler_list_page:
   url: k8s/ns/openshift-machine-api/autoscaling.openshift.io~v1beta1~MachineAutoscaler
 goto_one_machineautoscaler_page:
diff --git a/lib/rules/web/admin_console/4.7/common_ui_elements.xyaml b/lib/rules/web/admin_console/4.7/common_ui_elements.xyaml
index b600516c04..1bd3f3dfc8 100644
--- a/lib/rules/web/admin_console/4.7/common_ui_elements.xyaml
+++ b/lib/rules/web/admin_console/4.7/common_ui_elements.xyaml
@@ -765,7 +765,7 @@ wait_table_loaded:
   element:
     selector:
       xpath: //table//tr
-    timeout: 30
+    timeout: 40
 skip_dev_perspective_tour:
   elements:
   - selector:
diff --git a/lib/rules/web/admin_console/4.7/goto.xyaml b/lib/rules/web/admin_console/4.7/goto.xyaml
index 5f4d9143e2..580c9d161b 100644
--- a/lib/rules/web/admin_console/4.7/goto.xyaml
+++ b/lib/rules/web/admin_console/4.7/goto.xyaml
@@ -295,6 +295,7 @@ goto_machineconfig_pools_page:
   action: wait_box_loaded
 goto_machine_sets_page:
   url: k8s/ns/openshift-machine-api/machine.openshift.io~v1beta1~MachineSet
+  action: wait_box_loaded
 goto_machineautoscaler_list_page:
   url: k8s/ns/openshift-machine-api/autoscaling.openshift.io~v1beta1~MachineAutoscaler
 goto_one_machineautoscaler_page:
diff --git a/lib/rules/web/admin_console/4.7/machine.xyaml b/lib/rules/web/admin_console/4.7/machine.xyaml
index c71064054b..b2390d7ba6 100644
--- a/lib/rules/web/admin_console/4.7/machine.xyaml
+++ b/lib/rules/web/admin_console/4.7/machine.xyaml
@@ -12,12 +12,12 @@ click_machine_tab:
   action: click_tab
 check_desired_count_on_machineset_page:
   params:
-    key: Desired Count
+    key: Desired count
     value: <machine_count>
   action: check_resource_details_key_and_value
 edit_machine_count:
   params:
-    item: Edit Machine Count
+    item: Edit Machine count
   action: click_one_dropdown_action
   action: update_resource_count
 delete_machineset_from_action:
@@ -47,4 +47,4 @@ check_unhealthy_health_check_status:
   action: check_status_text
   action: click_health_status_card
   action: check_health_condition
-  action: check_alert_description  
\ No newline at end of file
+  action: check_alert_description