diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html
index d6e09e1ad..928a19393 100644
--- a/app/docker/views/images/build/buildimage.html
+++ b/app/docker/views/images/build/buildimage.html
@@ -209,7 +209,7 @@
           </uib-tab>
           <uib-tab index="1" disable="!buildLogs">
             <uib-tab-heading class="vertical-center"> <pr-icon icon="'file-text'" class="leading-none"></pr-icon> Output </uib-tab-heading>
-            <pre class="log_viewer">
+            <pre class="log_viewer" data-cy="logViewer">
               <div ng-repeat="line in buildLogs track by $index" class="line"><p class="inner_line" ng-click="active=!active" ng-class="{'line_selected': active}">{{ line }}</p></div>
               <div ng-if="!buildLogs.length" class="line"><p class="inner_line">No build output available.</p></div>
             </pre>
diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html
index 17cf83b81..43658b833 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list-item/helm-templates-list-item.html
@@ -1,5 +1,5 @@
 <!-- helm chart -->
-<div ng-class="{ 'blocklist-item--selected': $ctrl.model.Selected }" class="blocklist-item template-item mx-0" ng-click="$ctrl.onSelect($ctrl.model)">
+<div ng-class="{ 'blocklist-item--selected': $ctrl.model.Selected }" class="blocklist-item template-item mx-0" ng-click="$ctrl.onSelect($ctrl.model)" role="listitem">
   <div class="blocklist-item-box">
     <!-- helmchart-image -->
     <span class="shrink-0">
diff --git a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html
index 7a622c042..2fb7cce11 100644
--- a/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html
+++ b/app/kubernetes/components/helm/helm-templates/helm-templates-list/helm-templates-list.html
@@ -30,7 +30,7 @@
     ></beta-alert>
   </div>
 
-  <div class="blocklist !px-0">
+  <div class="blocklist !px-0" role="list">
     <helm-templates-list-item
       ng-repeat="chart in allCharts = ($ctrl.charts | filter:$ctrl.state.textFilter | filter: $ctrl.state.selectedCategory)"
       model="chart"
diff --git a/app/portainer/react/components/index.ts b/app/portainer/react/components/index.ts
index 3b8dcff1c..46482018f 100644
--- a/app/portainer/react/components/index.ts
+++ b/app/portainer/react/components/index.ts
@@ -184,6 +184,7 @@ export const ngModule = angular
       'components',
       'isLoading',
       'noOptionsMessage',
+      'aria-label',
     ])
   )
   .component(
diff --git a/app/react/components/Badge/Badge.tsx b/app/react/components/Badge/Badge.tsx
index a37268ae3..d7d4df4c9 100644
--- a/app/react/components/Badge/Badge.tsx
+++ b/app/react/components/Badge/Badge.tsx
@@ -69,10 +69,13 @@ export function Badge({
   children,
 }: PropsWithChildren<Props>) {
   const baseClasses =
-    'flex w-fit items-center !text-xs font-medium rounded-full px-2 py-0.5';
+    'inline-flex w-fit items-center !text-xs font-medium rounded-full px-2 py-0.5';
 
   return (
-    <span className={clsx(baseClasses, typeClasses[type], className)}>
+    <span
+      className={clsx(baseClasses, typeClasses[type], className)}
+      role="status"
+    >
       {children}
     </span>
   );
diff --git a/app/react/components/Blocklist/BlocklistItem.tsx b/app/react/components/Blocklist/BlocklistItem.tsx
index 15e9e6d57..d4ff4a1c1 100644
--- a/app/react/components/Blocklist/BlocklistItem.tsx
+++ b/app/react/components/Blocklist/BlocklistItem.tsx
@@ -28,6 +28,7 @@ export function BlocklistItem<T extends ElementType>({
           'blocklist-item--selected': isSelected,
         }
       )}
+      role="listitem"
       // eslint-disable-next-line react/jsx-props-no-spreading
       {...props}
     >
diff --git a/app/react/components/datatables/Datatable.tsx b/app/react/components/datatables/Datatable.tsx
index 33354e03b..3d6f4e93a 100644
--- a/app/react/components/datatables/Datatable.tsx
+++ b/app/react/components/datatables/Datatable.tsx
@@ -188,6 +188,7 @@ export function Datatable<D extends DefaultType>({
         isLoading={isLoading}
         onSortChange={handleSortChange}
         data-cy={dataCy}
+        aria-label={`${title} table`}
       />
 
       <DatatableFooter
diff --git a/app/react/components/datatables/DatatableContent.tsx b/app/react/components/datatables/DatatableContent.tsx
index 605f1f4b2..fec0eadd4 100644
--- a/app/react/components/datatables/DatatableContent.tsx
+++ b/app/react/components/datatables/DatatableContent.tsx
@@ -11,6 +11,7 @@ interface Props<D extends DefaultType> extends AutomationTestingProps {
   onSortChange?(colId: string, desc: boolean): void;
   isLoading?: boolean;
   emptyContentLabel?: string;
+  'aria-label'?: string;
 }
 
 export function DatatableContent<D extends DefaultType>({
@@ -20,12 +21,13 @@ export function DatatableContent<D extends DefaultType>({
   isLoading,
   emptyContentLabel,
   'data-cy': dataCy,
+  'aria-label': ariaLabel,
 }: Props<D>) {
   const headerGroups = tableInstance.getHeaderGroups();
   const pageRowModel = tableInstance.getPaginationRowModel();
 
   return (
-    <Table data-cy={dataCy} className="nowrap-cells">
+    <Table data-cy={dataCy} className="nowrap-cells" aria-label={ariaLabel}>
       <thead>
         {headerGroups.map((headerGroup) => (
           <Table.HeaderRow<D>
diff --git a/app/react/components/datatables/NestedDatatable.tsx b/app/react/components/datatables/NestedDatatable.tsx
index 6569435d5..68a4a8ef2 100644
--- a/app/react/components/datatables/NestedDatatable.tsx
+++ b/app/react/components/datatables/NestedDatatable.tsx
@@ -28,6 +28,8 @@ interface Props<D extends DefaultType> {
    * keyword to filter by
    */
   search?: string;
+
+  'aria-label'?: string;
 }
 
 export function NestedDatatable<D extends DefaultType>({
@@ -39,6 +41,7 @@ export function NestedDatatable<D extends DefaultType>({
   isLoading,
   initialSortBy,
   search,
+  'aria-label': ariaLabel,
 }: Props<D>) {
   const tableInstance = useReactTable<D>({
     columns,
@@ -70,6 +73,7 @@ export function NestedDatatable<D extends DefaultType>({
           isLoading={isLoading}
           emptyContentLabel={emptyContentLabel}
           renderRow={(row) => <Table.Row<D> cells={row.getVisibleCells()} />}
+          aria-label={ariaLabel}
         />
       </Table.Container>
     </NestedTable>
diff --git a/app/react/components/datatables/SearchBar.tsx b/app/react/components/datatables/SearchBar.tsx
index d6985324e..b8dab65ea 100644
--- a/app/react/components/datatables/SearchBar.tsx
+++ b/app/react/components/datatables/SearchBar.tsx
@@ -42,6 +42,7 @@ export function SearchBar({
         onChange={(e) => setSearchValue(e.target.value)}
         placeholder={placeholder}
         data-cy={dataCy}
+        aria-label="Search input"
       />
       {children}
       <Button onClick={onClear} icon={X} color="none" disabled={!searchValue} />
diff --git a/app/react/components/datatables/Table.tsx b/app/react/components/datatables/Table.tsx
index 1cde85c41..f0444aa2c 100644
--- a/app/react/components/datatables/Table.tsx
+++ b/app/react/components/datatables/Table.tsx
@@ -1,5 +1,5 @@
 import clsx from 'clsx';
-import { PropsWithChildren } from 'react';
+import { AriaAttributes, PropsWithChildren } from 'react';
 
 import { AutomationTestingProps } from '@/types';
 
@@ -14,23 +14,21 @@ import { TableHeaderCell } from './TableHeaderCell';
 import { TableHeaderRow } from './TableHeaderRow';
 import { TableRow } from './TableRow';
 
-interface Props extends AutomationTestingProps {
+interface Props extends AutomationTestingProps, AriaAttributes {
   className?: string;
 }
 
 function MainComponent({
   children,
   className,
-  'data-cy': dataCy,
+  ...props
 }: PropsWithChildren<Props>) {
   return (
     <div className="table-responsive">
       <table
-        data-cy={dataCy}
-        className={clsx(
-          'table-hover table-filters nowrap-cells table',
-          className
-        )}
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        className={clsx('table-hover table-filters table', className)}
       >
         {children}
       </table>
diff --git a/app/react/components/datatables/TableTitle.tsx b/app/react/components/datatables/TableTitle.tsx
index 419979167..446990a2f 100644
--- a/app/react/components/datatables/TableTitle.tsx
+++ b/app/react/components/datatables/TableTitle.tsx
@@ -23,7 +23,7 @@ export function TableTitle({
     <>
       <div className={clsx('toolBar flex-col', className)} id={id}>
         <div className="flex w-full items-center gap-1 p-0">
-          <div className="toolBarTitle">
+          <h2 className="toolBarTitle m-0 text-2xl">
             {icon && (
               <div className="widget-icon">
                 <Icon icon={icon} className="space-right" />
@@ -31,7 +31,7 @@ export function TableTitle({
             )}
 
             {label}
-          </div>
+          </h2>
           {children}
         </div>
       </div>
diff --git a/app/react/components/datatables/expand-column.tsx b/app/react/components/datatables/expand-column.tsx
index ce011991c..d3eccdac9 100644
--- a/app/react/components/datatables/expand-column.tsx
+++ b/app/react/components/datatables/expand-column.tsx
@@ -17,6 +17,7 @@ export function buildExpandColumn<T extends DefaultType>(): ColumnDef<T> {
             onClick={table.getToggleAllRowsExpandedHandler()}
             color="none"
             icon={table.getIsAllRowsExpanded() ? ChevronDown : ChevronUp}
+            title="Expand all"
           />
         )
       );
@@ -32,6 +33,7 @@ export function buildExpandColumn<T extends DefaultType>(): ColumnDef<T> {
           }}
           color="none"
           icon={row.getIsExpanded() ? ChevronDown : ChevronUp}
+          title={row.getIsExpanded() ? 'Collapse' : 'Expand'}
         />
       ),
     enableColumnFilter: false,
diff --git a/app/react/components/form-components/PortainerSelect.tsx b/app/react/components/form-components/PortainerSelect.tsx
index 81105652b..19088a377 100644
--- a/app/react/components/form-components/PortainerSelect.tsx
+++ b/app/react/components/form-components/PortainerSelect.tsx
@@ -4,6 +4,7 @@ import {
   SelectComponentsConfig,
 } from 'react-select';
 import _ from 'lodash';
+import { AriaAttributes } from 'react';
 
 import { AutomationTestingProps } from '@/types';
 
@@ -20,7 +21,9 @@ type Options<TValue> = OptionsOrGroups<
   GroupBase<Option<TValue>>
 >;
 
-interface SharedProps extends AutomationTestingProps {
+interface SharedProps
+  extends AutomationTestingProps,
+    Pick<AriaAttributes, 'aria-label'> {
   name?: string;
   inputId?: string;
   placeholder?: string;
@@ -87,6 +90,8 @@ export function SingleSelect<TValue = string>({
   components,
   isLoading,
   noOptionsMessage,
+  isMulti,
+  ...aria
 }: SingleProps<TValue>) {
   const selectedValue =
     value || (typeof value === 'number' && value === 0)
@@ -111,6 +116,8 @@ export function SingleSelect<TValue = string>({
       components={components}
       isLoading={isLoading}
       noOptionsMessage={noOptionsMessage}
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      {...aria}
     />
   );
 }
@@ -152,6 +159,7 @@ export function MultiSelect<TValue = string>({
   components,
   isLoading,
   noOptionsMessage,
+  ...aria
 }: Omit<MultiProps<TValue>, 'isMulti'>) {
   const selectedOptions = findSelectedOptions(options, value);
   return (
@@ -174,6 +182,8 @@ export function MultiSelect<TValue = string>({
       components={components}
       isLoading={isLoading}
       noOptionsMessage={noOptionsMessage}
+      // eslint-disable-next-line react/jsx-props-no-spreading
+      {...aria}
     />
   );
 }
diff --git a/app/react/docker/networks/ListView/NestedNetwordsTable.tsx b/app/react/docker/networks/ListView/NestedNetwordsTable.tsx
index 116b23edf..f70802be1 100644
--- a/app/react/docker/networks/ListView/NestedNetwordsTable.tsx
+++ b/app/react/docker/networks/ListView/NestedNetwordsTable.tsx
@@ -16,5 +16,11 @@ export function NestedNetworksDatatable({
   const isSwarm = useIsSwarm(environmentId);
 
   const columns = useColumns(isSwarm);
-  return <NestedDatatable columns={columns} dataset={dataset} />;
+  return (
+    <NestedDatatable
+      columns={columns}
+      dataset={dataset}
+      aria-label="Networks table"
+    />
+  );
 }
diff --git a/app/react/docker/networks/ListView/columns/name.tsx b/app/react/docker/networks/ListView/columns/name.tsx
index 77321a4a9..5da36bb0b 100644
--- a/app/react/docker/networks/ListView/columns/name.tsx
+++ b/app/react/docker/networks/ListView/columns/name.tsx
@@ -1,6 +1,7 @@
 import { truncate } from '@/portainer/filters/filters';
 
 import { Link } from '@@/Link';
+import { Badge } from '@@/Badge';
 
 import { columnHelper } from './helper';
 
@@ -18,12 +19,9 @@ export const name = columnHelper.accessor('Name', {
           {truncate(item.Name, 40)}
         </Link>
         {item.ResourceControl?.System && (
-          <span
-            style={{ marginLeft: '10px' }}
-            className="label label-info image-tag space-left"
-          >
+          <Badge type="info" className="ml-2">
             System
-          </span>
+          </Badge>
         )}
       </>
     );
diff --git a/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx b/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx
index ce264eba2..5292b6f33 100644
--- a/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx
+++ b/app/react/docker/services/ListView/ServicesDatatable/TasksDatatable/TasksDatatable.tsx
@@ -24,6 +24,7 @@ export function TasksDatatable({
       dataset={dataset}
       search={search}
       emptyContentLabel="No task matching filter."
+      aria-label="Tasks table"
     />
   );
 }
diff --git a/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx b/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
index 8b3769409..43e381f07 100644
--- a/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
+++ b/app/react/docker/volumes/ListView/VolumesDatatable/columns/name.tsx
@@ -108,7 +108,9 @@ function Cell({
         </Authorized>
       )}
       {item.dangling && (
-        <span className="label label-warning image-tag ml-2">Unused</span>
+        <span className="label label-warning image-tag ml-2" role="status">
+          Unused
+        </span>
       )}
     </>
   );
diff --git a/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx b/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx
index 7ab88413d..57cd47312 100644
--- a/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx
+++ b/app/react/portainer/HomeView/EnvironmentList/EnvironmentList.tsx
@@ -212,6 +212,7 @@ export function EnvironmentList({ onClickBrowse, onRefresh }: Props) {
           <div
             className="blocklist mt-5 !space-y-2 !p-0"
             data-cy="home-endpointList"
+            role="list"
           >
             {renderItems(
               isLoading,
diff --git a/app/react/portainer/gitops/RefField/RefField.tsx b/app/react/portainer/gitops/RefField/RefField.tsx
index b32c6f9b4..3499d925a 100644
--- a/app/react/portainer/gitops/RefField/RefField.tsx
+++ b/app/react/portainer/gitops/RefField/RefField.tsx
@@ -31,9 +31,10 @@ export function RefField({
   stackId,
 }: Props) {
   const [inputValue, updateInputValue] = useStateWrapper(value, onChange);
-
+  const inputId = 'repository-reference-field';
   return isBE ? (
     <Wrapper
+      inputId={inputId}
       errors={error}
       tip={
         <>
@@ -44,6 +45,7 @@ export function RefField({
       }
     >
       <RefSelector
+        inputId={inputId}
         value={value}
         onChange={onChange}
         model={model}
@@ -53,6 +55,7 @@ export function RefField({
     </Wrapper>
   ) : (
     <Wrapper
+      inputId={inputId}
       errors={error}
       tip={
         <>
@@ -65,6 +68,7 @@ export function RefField({
       }
     >
       <Input
+        id={inputId}
         value={inputValue}
         onChange={(e) => updateInputValue(e.target.value)}
         placeholder="refs/heads/main"
@@ -77,7 +81,8 @@ function Wrapper({
   tip,
   children,
   errors,
-}: PropsWithChildren<{ tip: ReactNode; errors?: string }>) {
+  inputId,
+}: PropsWithChildren<{ tip: ReactNode; errors?: string; inputId: string }>) {
   return (
     <div className="form-group">
       <span className="col-sm-12 mb-2">
@@ -86,7 +91,7 @@ function Wrapper({
       <div className="col-sm-12">
         <FormControl
           label="Repository reference"
-          inputId="stack_repository_reference_name"
+          inputId={inputId}
           required
           errors={errors}
         >
diff --git a/app/react/portainer/gitops/RefField/RefSelector.tsx b/app/react/portainer/gitops/RefField/RefSelector.tsx
index 4a62a4bc0..0b9e520be 100644
--- a/app/react/portainer/gitops/RefField/RefSelector.tsx
+++ b/app/react/portainer/gitops/RefField/RefSelector.tsx
@@ -13,12 +13,14 @@ export function RefSelector({
   onChange,
   isUrlValid,
   stackId,
+  inputId,
 }: {
   model: RefFieldModel;
   value: string;
   stackId?: StackId;
   onChange: (value: string) => void;
   isUrlValid?: boolean;
+  inputId: string;
 }) {
   const creds = getAuthentication(model);
   const payload = {
@@ -64,6 +66,7 @@ export function RefSelector({
 
   return (
     <PortainerSelect
+      inputId={inputId}
       value={value}
       options={refs || [{ value: 'refs/heads/main', label: 'refs/heads/main' }]}
       onChange={(e) => e && onChange(e)}
diff --git a/app/react/portainer/templates/app-templates/AppTemplatesList.tsx b/app/react/portainer/templates/app-templates/AppTemplatesList.tsx
index 1184f34d6..bdef6b03d 100644
--- a/app/react/portainer/templates/app-templates/AppTemplatesList.tsx
+++ b/app/react/portainer/templates/app-templates/AppTemplatesList.tsx
@@ -86,7 +86,7 @@ export function AppTemplatesList({
         }
       />
 
-      <div className="blocklist gap-y-2 !px-[20px] !pb-[20px]">
+      <div className="blocklist gap-y-2 !px-[20px] !pb-[20px]" role="list">
         {pagedTemplates.map((template) => (
           <AppTemplatesListItem
             key={template.Id}
diff --git a/app/react/portainer/templates/app-templates/Filters.tsx b/app/react/portainer/templates/app-templates/Filters.tsx
index d113cafee..706bd8b3f 100644
--- a/app/react/portainer/templates/app-templates/Filters.tsx
+++ b/app/react/portainer/templates/app-templates/Filters.tsx
@@ -55,6 +55,7 @@ export function Filters({
             value={listState.category}
             bindToBody
             isClearable
+            aria-label="Category filter"
           />
         </div>
       )}
@@ -71,6 +72,7 @@ export function Filters({
             value={listState.types}
             bindToBody
             isClearable
+            aria-label="Type filter"
           />
         </div>
       )}
@@ -83,6 +85,7 @@ export function Filters({
           options={orderByFields}
           placeholder="Sort By"
           value={listState.sortBy}
+          aria-label="Sort"
         />
       </div>
     </div>
diff --git a/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesList.tsx b/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesList.tsx
index b76c0b924..ae485479b 100644
--- a/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesList.tsx
+++ b/app/react/portainer/templates/custom-templates/ListView/CustomTemplatesList.tsx
@@ -63,7 +63,7 @@ export function CustomTemplatesList({
         )}
       />
 
-      <div className="blocklist gap-y-2 !px-[20px] !pb-[20px]">
+      <div className="blocklist gap-y-2 !px-[20px] !pb-[20px]" role="list">
         {pagedTemplates.map((template) => (
           <CustomTemplatesListItem
             key={template.Id}
diff --git a/app/react/sidebar/DockerSidebar.tsx b/app/react/sidebar/DockerSidebar.tsx
index 7c8cdeb5a..1e0ad5d2d 100644
--- a/app/react/sidebar/DockerSidebar.tsx
+++ b/app/react/sidebar/DockerSidebar.tsx
@@ -182,7 +182,7 @@ export function DockerSidebar({ environmentId, environment }: Props) {
         icon={setupSubMenuProps.icon}
         to={setupSubMenuProps.to}
         params={{ endpointId: environmentId }}
-        data-cy="portainerSidebar-host"
+        data-cy="portainerSidebar-host-area"
       >
         <SidebarItem
           label="Details"