diff --git a/install.sh b/install.sh
index 2b9e9da821..e4df647456 100755
--- a/install.sh
+++ b/install.sh
@@ -2900,6 +2900,7 @@ FIREEDGE_SUNSTONE_ETC="src/fireedge/etc/sunstone/sunstone-server.conf \
 
 FIREEDGE_SUNSTONE_ETC_VIEW_ADMIN="src/fireedge/etc/sunstone/admin/vm-tab.yaml \
                                 src/fireedge/etc/sunstone/admin/marketplace-app-tab.yaml \
+                                src/fireedge/etc/sunstone/admin/host-tab.yaml \
                                 src/fireedge/etc/sunstone/admin/vm-template-tab.yaml"
 
 FIREEDGE_SUNSTONE_ETC_VIEW_USER="src/fireedge/etc/sunstone/user/vm-tab.yaml \
diff --git a/src/fireedge/src/client/components/Tables/Clusters/row.js b/src/fireedge/src/client/components/Tables/Clusters/row.js
index 2d3775a7f9..f6517c450c 100644
--- a/src/fireedge/src/client/components/Tables/Clusters/row.js
+++ b/src/fireedge/src/client/components/Tables/Clusters/row.js
@@ -26,7 +26,7 @@ const Row = ({ original, value, ...props }) => {
   const { ID, NAME, HOSTS, DATASTORES, VNETS, PROVIDER_NAME } = value
 
   return (
-    <div {...props}>
+    <div data-cy={`cluster-${ID}`} {...props}>
       <div className={classes.main}>
         <div className={classes.title}>
           <Typography component="span">{NAME}</Typography>
diff --git a/src/fireedge/src/client/components/Tables/Hosts/actions.js b/src/fireedge/src/client/components/Tables/Hosts/actions.js
index 0af2008d39..fbb55d28d9 100644
--- a/src/fireedge/src/client/components/Tables/Hosts/actions.js
+++ b/src/fireedge/src/client/components/Tables/Hosts/actions.js
@@ -153,6 +153,7 @@ const Actions = () => {
                 dialogProps: {
                   title: T.Delete,
                   children: MessageToConfirmAction,
+                  dataCy: `modal-host-${HOST_ACTIONS.DELETE}`,
                 },
                 onSubmit: (rows) => async () => {
                   const ids = rows?.map?.(({ original }) => original?.ID)