diff --git a/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
index 04a58f294..e823214bc 100644
--- a/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-ports-datatable/applicationsPortsDatatable.html
@@ -20,7 +20,7 @@
         />
       </div>
       <!-- actions -->
-      <div data-cy="k8sApp-tableSettings" class="settings">
+      <div data-cy="k8sApp-portTableSettings" class="settings">
         <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
           <span uib-dropdown-toggle aria-label="Settings">
             <pr-icon icon="'more-vertical'" feather="true" class-name="'icon !mr-0 !h-4'"></pr-icon>
@@ -40,7 +40,7 @@
                       type="checkbox"
                       ng-model="$ctrl.settings.repeater.autoRefresh"
                       ng-change="$ctrl.onSettingsRepeaterChange()"
-                      data-cy="k8sApp-autoRefreshCheckbox"
+                      data-cy="k8sApp-autoRefreshCheckbox-port"
                     />
                     <label for="setting_auto_refresh">Auto refresh</label>
                   </div>
@@ -51,7 +51,7 @@
                       ng-model="$ctrl.settings.repeater.refreshRate"
                       ng-change="$ctrl.onSettingsRepeaterChange()"
                       class="small-select"
-                      data-cy="k8sApp-refreshRateDropdown"
+                      data-cy="k8sApp-refreshRateDropdown-port"
                     >
                       <option value="10">10s</option>
                       <option value="30">30s</option>
diff --git a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
index ebc93c5eb..44892599f 100644
--- a/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
+++ b/app/kubernetes/components/datatables/applications-stacks-datatable/applicationsStacksDatatable.html
@@ -26,12 +26,12 @@
           class="btn btn-sm btn-dangerlight h-fit vertical-center !ml-0"
           ng-disabled="$ctrl.state.selectedItemCount === 0"
           ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
-          data-cy="k8sApp-removeAppButton"
+          data-cy="k8sApp-removeStackButton"
         >
           <pr-icon icon="'trash-2'" feather="true"></pr-icon>
           Remove
         </button>
-        <div class="settings" data-cy="k8sApp-tableSettings">
+        <div class="settings" data-cy="k8sApp-StackTableSettings">
           <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
             <span uib-dropdown-toggle>
               <pr-icon icon="'more-vertical'" feather="true" class-name="'!mr-0 !h-4'"></pr-icon>
@@ -51,7 +51,7 @@
                         type="checkbox"
                         ng-model="$ctrl.settings.repeater.autoRefresh"
                         ng-change="$ctrl.onSettingsRepeaterChange()"
-                        data-cy="k8sApp-autoRefreshCheckbox"
+                        data-cy="k8sApp-autoRefreshCheckbox-stack"
                       />
                       <label for="setting_auto_refresh">Auto refresh</label>
                     </div>
@@ -62,7 +62,7 @@
                         ng-model="$ctrl.settings.repeater.refreshRate"
                         ng-change="$ctrl.onSettingsRepeaterChange()"
                         class="small-select"
-                        data-cy="k8sApp-refreshRateDropdown"
+                        data-cy="k8sApp-refreshRateDropdown-stack"
                       >
                         <option value="10">10s</option>
                         <option value="30">30s</option>