diff --git a/changelogs/unreleased/5154-axe-compliance-testing.yml b/changelogs/unreleased/5154-axe-compliance-testing.yml
new file mode 100644
index 000000000..5e5d39f67
--- /dev/null
+++ b/changelogs/unreleased/5154-axe-compliance-testing.yml
@@ -0,0 +1,6 @@
+description: "Automate axe compliance testing."
+issue-nr: 5154
+change-type: patch
+destination-branches: [master, iso7]
+sections:
+  minor-improvement: "{{description}}"
diff --git a/cypress/e2e/scenario-1-environment.cy.js b/cypress/e2e/scenario-1-environment.cy.js
index 930cb583d..7da929be4 100644
--- a/cypress/e2e/scenario-1-environment.cy.js
+++ b/cypress/e2e/scenario-1-environment.cy.js
@@ -317,31 +317,31 @@ describe("Environment", () => {
       '[aria-label="EnumInput-agent_trigger_method_on_auto_deployFilterInput"]',
     ).click();
     cy.get('[role="option"]').contains("push_full_deploy").click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-agent_trigger_method_on_auto_deploy"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get(
       '[aria-label="EnumInput-agent_trigger_method_on_auto_deployFilterInput"]',
     ).should("have.value", "push_full_deploy");
 
     //Change auto_deploy
     cy.get('[aria-label="Row-auto_deploy"]').find(".pf-v5-c-switch").click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-auto_deploy"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
 
     //Change auto_full_compile
     cy.get('[aria-label="Row-auto_full_compile"]').clear();
     cy.get('[aria-label="Row-auto_full_compile"]').type("1 2 3 4 5");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-auto_full_compile"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-auto_full_compile"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "1 2 3 4 5");
@@ -350,11 +350,11 @@ describe("Environment", () => {
     cy.get('[aria-label="Row-autostart_agent_deploy_interval"]')
       .find(".pf-v5-c-form-control")
       .type("{selectAll}610");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-autostart_agent_deploy_interval"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-autostart_agent_deploy_interval"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "610");
@@ -363,11 +363,11 @@ describe("Environment", () => {
     cy.get('[aria-label="Row-autostart_agent_deploy_splay_time"]')
       .find(".pf-v5-c-form-control")
       .type("{selectAll}20");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-autostart_agent_deploy_splay_time"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-autostart_agent_deploy_splay_time"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "20");
@@ -379,11 +379,11 @@ describe("Environment", () => {
         return $el.value === "local:";
       })
       .type("{selectAll}{backspace}new value");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-autostart_agent_map"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-autostart_agent_map"]')
       .find('[aria-label="editEntryValue"]')
       .should("have.value", "new value");
@@ -392,11 +392,11 @@ describe("Environment", () => {
     cy.get('[aria-label="Row-autostart_agent_repair_interval"]')
       .find(".pf-v5-c-form-control")
       .type("{selectAll}86410");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-autostart_agent_repair_interval"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-autostart_agent_repair_interval"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "86410");
@@ -405,11 +405,11 @@ describe("Environment", () => {
     cy.get('[aria-label="Row-autostart_agent_repair_splay_time"]')
       .find(".pf-v5-c-form-control")
       .type("{selectAll}610");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-autostart_agent_repair_splay_time"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-autostart_agent_repair_splay_time"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "610");
@@ -418,21 +418,21 @@ describe("Environment", () => {
     cy.get('[aria-label="Row-autostart_on_start"]')
       .find(".pf-v5-c-switch")
       .click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-autostart_on_start"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
 
     //Change available_versions_to_keep
     cy.get('[aria-label="Row-available_versions_to_keep"]')
       .find(".pf-v5-c-form-control")
       .type("{selectAll}110");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-available_versions_to_keep"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-available_versions_to_keep"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "110");
@@ -442,11 +442,11 @@ describe("Environment", () => {
       '[aria-label="EnumInput-environment_agent_trigger_methodFilterInput"]',
     ).click();
     cy.get('[role="option"]').contains("push_full_deploy").click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-environment_agent_trigger_method"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get(
       '[aria-label="EnumInput-environment_agent_trigger_methodFilterInput"]',
     ).should("have.value", "push_full_deploy");
@@ -458,22 +458,22 @@ describe("Environment", () => {
         .find(".pf-v5-c-switch")
         .click();
 
-      cy.get('[aria-label="Warning"]').should("exist");
+      cy.get('[data-testid="Warning"]').should("exist");
       cy.get('[aria-label="Row-lsm_partial_compile"]')
         .find('[aria-label="SaveAction"]')
         .click();
-      cy.get('[aria-label="Warning"]').should("not.exist");
+      cy.get('[data-testid="Warning"]').should("not.exist");
     }
 
     //change notification_retention
     cy.get('[aria-label="Row-notification_retention"]')
       .find(".pf-v5-c-form-control")
       .type("{selectAll}375");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-notification_retention"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-notification_retention"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "375");
@@ -482,52 +482,52 @@ describe("Environment", () => {
     cy.get('[aria-label="Row-protected_environment"]')
       .find(".pf-v5-c-switch")
       .click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-protected_environment"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
 
     //Change push_on_auto_deploy
     cy.get('[aria-label="Row-push_on_auto_deploy"]')
       .find(".pf-v5-c-switch")
       .click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-push_on_auto_deploy"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
 
     //Change resource_action_logs_retention
     cy.get('[aria-label="Row-resource_action_logs_retention"]')
       .find(".pf-v5-c-form-control")
       .type("{selectAll}8");
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-resource_action_logs_retention"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
     cy.get('[aria-label="Row-resource_action_logs_retention"]')
       .find(".pf-v5-c-form-control input")
       .should("have.value", "8");
 
     //change server_compile
     cy.get('[aria-label="Row-server_compile"]').find(".pf-v5-c-switch").click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-server_compile"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
 
     //re-enable to delete env
     cy.get('[aria-label="Row-protected_environment"]')
       .find(".pf-v5-c-switch")
       .click();
-    cy.get('[aria-label="Warning"]').should("exist");
+    cy.get('[data-testid="Warning"]').should("exist");
     cy.get('[aria-label="Row-protected_environment"]')
       .find('[aria-label="SaveAction"]')
       .click();
-    cy.get('[aria-label="Warning"]').should("not.exist");
+    cy.get('[data-testid="Warning"]').should("not.exist");
 
     cy.get(".pf-v5-c-tabs__list")
       .find("button")
diff --git a/cypress/e2e/scenario-2.4-expert-mode.cy.js b/cypress/e2e/scenario-2.4-expert-mode.cy.js
index c0f9467c4..0f6ce48db 100644
--- a/cypress/e2e/scenario-2.4-expert-mode.cy.js
+++ b/cypress/e2e/scenario-2.4-expert-mode.cy.js
@@ -114,11 +114,11 @@ if (Cypress.env("edition") === "iso") {
       cy.get('[aria-label="Row-enable_lsm_expert_mode"]')
         .find(".pf-v5-c-switch")
         .click();
-      cy.get('[aria-label="Warning"]').should("exist");
+      cy.get('[data-testid="Warning"]').should("exist");
       cy.get('[aria-label="Row-enable_lsm_expert_mode"]')
         .find('[aria-label="SaveAction"]')
         .click();
-      cy.get('[aria-label="Warning"]').should("not.exist");
+      cy.get('[data-testid="Warning"]').should("not.exist");
       cy.get("[id='expert-mode-banner']")
         .should("exist")
         .and("contain", "LSM expert mode is enabled, proceed with caution.");
@@ -353,11 +353,11 @@ if (Cypress.env("edition") === "iso") {
       cy.get('[aria-label="Row-enable_lsm_expert_mode"]')
         .find(".pf-v5-c-switch")
         .click();
-      cy.get('[aria-label="Warning"]').should("exist");
+      cy.get('[data-testid="Warning"]').should("exist");
       cy.get('[aria-label="Row-enable_lsm_expert_mode"]')
         .find('[aria-label="SaveAction"]')
         .click();
-      cy.get('[aria-label="Warning"]').should("not.exist");
+      cy.get('[data-testid="Warning"]').should("not.exist");
       cy.get("[id='expert-mode-banner']").should("not.exist");
     });
   });
diff --git a/cypress/e2e/scenario-4-desired-state.cy.js b/cypress/e2e/scenario-4-desired-state.cy.js
index fbf6665d6..88eaf8918 100644
--- a/cypress/e2e/scenario-4-desired-state.cy.js
+++ b/cypress/e2e/scenario-4-desired-state.cy.js
@@ -128,7 +128,7 @@ describe("Scenario 4 Desired State", () => {
     } else {
       cy.get('[aria-label="DesiredStatesView-Success"]', { timeout: 60000 })
         .find("tbody", { timeout: 60000 })
-        .should("have.length", 2);
+        .should("have.length", 3);
       cy.get("tbody")
         .eq(0)
         .should("contain", "lsm_export")
@@ -198,7 +198,7 @@ describe("Scenario 4 Desired State", () => {
       cy.get(".pf-v5-c-description-list__group")
         .eq(1)
         .find(".pf-v5-c-description-list__description")
-        .should("have.text", "3");
+        .should("have.text", "4");
 
       cy.get(".pf-v5-c-description-list__group")
         .eq(2)
@@ -313,7 +313,7 @@ describe("Scenario 4 Desired State", () => {
 
       // the first element in the table shouldn't be available to promote, since it is already active.
       cy.get("tbody").eq(0).find('[aria-label="actions-toggle"]').click();
-      cy.get('[aria-label="promote"]').find("button").should("be.disabled");
+      cy.get('[data-testid="promote"]').find("button").should("be.disabled");
     });
 
     // Update the settings to disable the auto-deploy setting.
@@ -400,14 +400,14 @@ describe("Scenario 4 Desired State", () => {
     );
     cy.get('[aria-label="DiffItemList"]').within(() => {
       if (isIso) {
-        cy.get("#toggle-button").eq(0).click();
-        cy.get("#toggle-button").eq(1).click();
+        cy.get('[aria-label="Details"]').eq(0).click();
+        cy.get('[aria-label="Details"]').eq(1).click();
       } else {
-        cy.get("#toggle-button").eq(0).click();
-        cy.get("#toggle-button").eq(1).click();
-        cy.get("#toggle-button").eq(2).click();
-        cy.get("#toggle-button").eq(3).click();
-        cy.get("#toggle-button").eq(4).click();
+        cy.get('[aria-label="Details"]').eq(0).click();
+        cy.get('[aria-label="Details"]').eq(1).click();
+        cy.get('[aria-label="Details"]').eq(2).click();
+        cy.get('[aria-label="Details"]').eq(3).click();
+        cy.get('[aria-label="Details"]').eq(4).click();
       }
     });
 
@@ -469,14 +469,14 @@ describe("Scenario 4 Desired State", () => {
     );
     cy.get('[aria-label="DiffItemList"]').within(() => {
       if (isIso) {
-        cy.get("#toggle-button").eq(0).click();
-        cy.get("#toggle-button").eq(1).click();
+        cy.get('[aria-label="Details"]').eq(0).click();
+        cy.get('[aria-label="Details"]').eq(1).click();
       } else {
-        cy.get("#toggle-button").eq(0).click();
-        cy.get("#toggle-button").eq(1).click();
-        cy.get("#toggle-button").eq(2).click();
-        cy.get("#toggle-button").eq(3).click();
-        cy.get("#toggle-button").eq(4).click();
+        cy.get('[aria-label="Details"]').eq(0).click();
+        cy.get('[aria-label="Details"]').eq(1).click();
+        cy.get('[aria-label="Details"]').eq(2).click();
+        cy.get('[aria-label="Details"]').eq(3).click();
+        cy.get('[aria-label="Details"]').eq(4).click();
       }
     });
 
@@ -538,13 +538,13 @@ describe("Scenario 4 Desired State", () => {
     cy.get('[aria-label="StatusFilter"]').click();
 
     cy.get('[aria-label="DiffItemList"]').within(() => {
-      cy.get("#toggle-button").eq(0).click();
-      cy.get("#toggle-button").eq(1).click();
+      cy.get('[aria-label="Details"]').eq(0).click();
+      cy.get('[aria-label="Details"]').eq(1).click();
 
       if (!isIso) {
-        cy.get("#toggle-button").eq(2).click();
-        cy.get("#toggle-button").eq(3).click();
-        cy.get("#toggle-button").eq(4).click();
+        cy.get('[aria-label="Details"]').eq(2).click();
+        cy.get('[aria-label="Details"]').eq(3).click();
+        cy.get('[aria-label="Details"]').eq(4).click();
       }
     });
     // expect the view to still contain the diff of the last dry-run comparison
diff --git a/cypress/e2e/scenario-6-resources.cy.js b/cypress/e2e/scenario-6-resources.cy.js
index 44744a89e..7088b0c45 100644
--- a/cypress/e2e/scenario-6-resources.cy.js
+++ b/cypress/e2e/scenario-6-resources.cy.js
@@ -231,7 +231,9 @@ describe("Scenario 6 : Resources", () => {
       );
 
       // make sure the default is 100 instead of 20 like on other pages with pagination.
-      cy.get('[aria-label="PaginationWidget"] .pf-v5-c-menu-toggle').click();
+      cy.get(
+        '[aria-label="PaginationWidget-top"] .pf-v5-c-menu-toggle',
+      ).click();
       cy.contains(".pf-v5-c-menu__list-item", "100")
         .find("svg")
         .should("exist");
@@ -568,38 +570,38 @@ describe("Scenario 6 : Resources", () => {
         "49",
       );
 
-      cy.get("#options-menu-top-toggle > span > b")
-        .eq(0)
-        .should("have.text", "1 - 20");
+      cy.get(
+        "#PaginationWidget-top-top-toggle > .pf-v5-c-menu-toggle__text > b:first-of-type",
+      ).should("have.text", "1 - 20");
 
       //Go to next page
       cy.get('[aria-label="Go to next page"]').first().click();
       cy.get('[aria-label="ResourcesView-Success"]').should("be.visible");
-      cy.get("#options-menu-top-toggle > span > b")
-        .eq(0)
-        .should("have.text", "21 - 40");
+      cy.get(
+        "#PaginationWidget-top-top-toggle > .pf-v5-c-menu-toggle__text > b:first-of-type",
+      ).should("have.text", "21 - 40");
 
       //Go to last page
       cy.get('[aria-label="Go to next page"]').first().click();
       cy.get('[aria-label="ResourcesView-Success"]').should("be.visible");
-      cy.get("#options-menu-top-toggle > span > b")
-        .eq(0)
-        .should("have.text", "41 - 49");
+      cy.get(
+        "#PaginationWidget-top-top-toggle > .pf-v5-c-menu-toggle__text > b:first-of-type",
+      ).should("have.text", "41 - 49");
 
       //Go to previous page
       cy.get('[aria-label="Go to previous page"]').first().click();
       cy.get('[aria-label="ResourcesView-Success"]').should("be.visible");
 
-      cy.get("#options-menu-top-toggle > span > b")
-        .eq(0)
-        .should("have.text", "21 - 40");
+      cy.get(
+        "#PaginationWidget-top-top-toggle > .pf-v5-c-menu-toggle__text > b:first-of-type",
+      ).should("have.text", "21 - 40");
 
       //Change page and come back to check if we are at the same page as we was
       cy.get(".pf-v5-c-nav__link").contains("Dashboard").click();
       cy.go("back");
-      cy.get("#options-menu-top-toggle > span > b")
-        .eq(0)
-        .should("have.text", "21 - 40");
+      cy.get(
+        "#PaginationWidget-top-top-toggle > .pf-v5-c-menu-toggle__text > b:first-of-type",
+      ).should("have.text", "21 - 40");
     });
   } else {
     it("6.6 Resources for OSS", () => {
@@ -721,7 +723,9 @@ describe("Scenario 6 : Resources", () => {
       );
 
       // make sure the default is 100 instead of 20 like on other pages with pagination.
-      cy.get('[aria-label="PaginationWidget"] .pf-v5-c-menu-toggle').click();
+      cy.get(
+        '[aria-label="PaginationWidget-top"] .pf-v5-c-menu-toggle',
+      ).click();
       cy.contains(".pf-v5-c-menu__list-item", "100")
         .find("svg")
         .should("exist");
diff --git a/package.json b/package.json
index a39ff10b2..435f1ace9 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "@types/fetch-mock": "^7.3.8",
     "@types/file-saver": "^2.0.7",
     "@types/jest": "^29.5.12",
+    "@types/jest-axe": "^3.5.9",
     "@types/json-bigint": "^1.0.3",
     "@types/loadable__component": "^5",
     "@types/lodash": "^4.14.202",
@@ -100,6 +101,7 @@
     "husky": "^9.0.11",
     "imagemin": "^8.0.1",
     "jest": "^29.7.0",
+    "jest-axe": "^8.0.0",
     "jest-environment-jsdom": "^29.6.4",
     "jest-fetch-mock": "^3.0.3",
     "jest-junit": "^16.0.0",
diff --git a/src/Data/Managers/GetInstanceResources/QueryManager.test.tsx b/src/Data/Managers/GetInstanceResources/QueryManager.test.tsx
index d74259923..f9ba87cd8 100644
--- a/src/Data/Managers/GetInstanceResources/QueryManager.test.tsx
+++ b/src/Data/Managers/GetInstanceResources/QueryManager.test.tsx
@@ -105,7 +105,7 @@ test("Given the InstanceResourcesQueryManager When initial request fails with 40
   expect(apiHelper.pendingRequests).toEqual([resourcesRequest(1)]);
   await act(resolveAs.resourcesConflict);
   expect(
-    await screen.findByRole("generic", { name: "Dummy-Loading" }),
+    await screen.findByRole("region", { name: "Dummy-Loading" }),
   ).toBeVisible();
 
   expect(apiHelper.pendingRequests).toEqual([instanceRequest()]);
@@ -125,13 +125,13 @@ test("Given the InstanceResourcesQueryManager When instance fails Then error is
   expect(apiHelper.pendingRequests).toEqual([resourcesRequest(1)]);
   await act(resolveAs.resourcesConflict);
   expect(
-    await screen.findByRole("generic", { name: "Dummy-Loading" }),
+    await screen.findByRole("region", { name: "Dummy-Loading" }),
   ).toBeVisible();
 
   expect(apiHelper.pendingRequests).toEqual([instanceRequest()]);
   await act(resolveAs.error);
   expect(
-    await screen.findByRole("generic", { name: "Dummy-Failed" }),
+    await screen.findByRole("region", { name: "Dummy-Failed" }),
   ).toBeVisible();
 });
 
@@ -144,7 +144,7 @@ test("Given the InstanceResourcesQueryManager When it keeps failing Then it stop
   expect(apiHelper.pendingRequests).toEqual([resourcesRequest(1)]);
   await act(resolveAs.resourcesConflict);
   expect(
-    await screen.findByRole("generic", { name: "Dummy-Loading" }),
+    await screen.findByRole("region", { name: "Dummy-Loading" }),
   ).toBeVisible();
 
   // 1st instance
@@ -156,7 +156,7 @@ test("Given the InstanceResourcesQueryManager When it keeps failing Then it stop
   await act(resolveAs.resourcesConflict);
 
   expect(
-    await screen.findByRole("generic", { name: "Dummy-Loading" }),
+    await screen.findByRole("region", { name: "Dummy-Loading" }),
   ).toBeVisible();
 
   // 2nd instance
@@ -167,7 +167,7 @@ test("Given the InstanceResourcesQueryManager When it keeps failing Then it stop
   expect(apiHelper.pendingRequests).toEqual([resourcesRequest(3)]);
   await act(resolveAs.resourcesConflict);
   expect(
-    await screen.findByRole("generic", { name: "Dummy-Failed" }),
+    await screen.findByRole("region", { name: "Dummy-Failed" }),
   ).toBeVisible();
   expect(apiHelper.pendingRequests).toHaveLength(0);
 });
diff --git a/src/Slices/AgentProcess/UI/Page.test.tsx b/src/Slices/AgentProcess/UI/Page.test.tsx
index 39e57bcb7..20bd814f4 100644
--- a/src/Slices/AgentProcess/UI/Page.test.tsx
+++ b/src/Slices/AgentProcess/UI/Page.test.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { MemoryRouter } from "react-router-dom";
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   getStoreInstance,
@@ -12,6 +13,14 @@ import { DeferredApiHelper, dependencies, StaticScheduler } from "@/Test";
 import { DependencyProvider } from "@/UI/Dependency";
 import * as AgentProcessMock from "@S/AgentProcess/Core/Mock";
 import { Page } from "./Page";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const store = getStoreInstance();
@@ -39,14 +48,19 @@ test("Agent Process Page shows failed view", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "AgentProcessView-Loading" }),
+    await screen.findByRole("region", { name: "AgentProcessView-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "AgentProcessView-Failed" }),
+    await screen.findByRole("region", { name: "AgentProcessView-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Agent Process Page shows success view", async () => {
@@ -54,7 +68,7 @@ test("Agent Process Page shows success view", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "AgentProcessView-Loading" }),
+    await screen.findByRole("region", { name: "AgentProcessView-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: AgentProcessMock.data }));
@@ -62,4 +76,9 @@ test("Agent Process Page shows success view", async () => {
   expect(
     await screen.findByRole("generic", { name: "AgentProcessView-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Agents/UI/Agents.test.tsx b/src/Slices/Agents/UI/Agents.test.tsx
index a601073e7..417dbdf1b 100644
--- a/src/Slices/Agents/UI/Agents.test.tsx
+++ b/src/Slices/Agents/UI/Agents.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, Maybe, RemoteData } from "@/Core";
 import {
   QueryResolverImpl,
@@ -22,6 +23,14 @@ import { words } from "@/UI";
 import { DependencyProvider } from "@/UI/Dependency";
 import * as AgentsMock from "@S/Agents/Core/Mock";
 import { Page } from "./Page";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const apiHelper = new DeferredApiHelper();
@@ -60,7 +69,7 @@ test("AgentsView shows empty table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "AgentsView-Loading" }),
+    await screen.findByRole("region", { name: "AgentsView-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -74,6 +83,11 @@ test("AgentsView shows empty table", async () => {
   expect(
     await screen.findByRole("generic", { name: "AgentsView-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("AgentsView shows failed table", async () => {
@@ -81,14 +95,19 @@ test("AgentsView shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "AgentsView-Loading" }),
+    await screen.findByRole("region", { name: "AgentsView-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "AgentsView-Failed" }),
+    await screen.findByRole("region", { name: "AgentsView-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("AgentsView shows success table", async () => {
@@ -96,7 +115,7 @@ test("AgentsView shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "AgentsView-Loading" }),
+    await screen.findByRole("region", { name: "AgentsView-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right(AgentsMock.response));
@@ -104,6 +123,11 @@ test("AgentsView shows success table", async () => {
   expect(
     await screen.findByRole("grid", { name: "AgentsView-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the name filter then only the matching agents should be fetched and shown", async () => {
@@ -121,7 +145,7 @@ test("When using the name filter then only the matching agents should be fetched
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -162,6 +186,11 @@ test("When using the name filter then only the matching agents should be fetched
     name: "Agents Table Row",
   });
   expect(rowsAfter).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the process name filter then only the matching agents should be fetched and shown", async () => {
@@ -179,7 +208,7 @@ test("When using the process name filter then only the matching agents should be
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -219,6 +248,11 @@ test("When using the process name filter then only the matching agents should be
     name: "Agents Table Row",
   });
   expect(rowsAfter).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the status filter with the 'up' option then the agents in the 'up' state should be fetched and shown", async () => {
@@ -236,7 +270,7 @@ test("When using the status filter with the 'up' option then the agents in the '
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -255,6 +289,11 @@ test("When using the status filter with the 'up' option then the agents in the '
     await userEvent.click(input);
   });
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   const option = await screen.findByRole("option", {
     name: words("agent.tests.up"),
   });
@@ -336,6 +375,11 @@ test("Given the Agents view with filters, When pausing an agent, then the correc
   });
   expect(apiHelper.resolvedRequests).toHaveLength(4);
   expect(apiHelper.pendingRequests).toHaveLength(0);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the Agents view with filters, When unpausing an agent, then the correct request is fired", async () => {
@@ -370,6 +414,11 @@ test("Given the Agents view with filters, When unpausing an agent, then the corr
     await userEvent.click(unpauseAgentButton);
   });
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   expect(apiHelper.pendingRequests).toHaveLength(1);
   const request = apiHelper.pendingRequests[0];
   expect(request).toEqual({
@@ -409,6 +458,11 @@ test("Given the Agents view When pausing an agent results in an error, then the
     name: words("agents.actions.pause"),
   });
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(pauseAgentButton);
   });
@@ -469,6 +523,11 @@ test("Given the Agents view with the environment halted, When setting keep_pause
   });
 
   expect(apiHelper.pendingRequests).toHaveLength(0);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the Agents view with the environment halted, When setting unpause_on_resume on an agent, Then the correct request is fired", async () => {
@@ -479,6 +538,11 @@ test("Given the Agents view with the environment halted, When setting unpause_on
   });
   render(component);
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await apiHelper.resolve(Either.right(AgentsMock.response));
   });
@@ -529,6 +593,11 @@ test("Given the Agents view with the environment NOT halted, THEN the on resume
     (header) => header.textContent === "On resume",
   );
   expect(onResumeColumnHeader).toBeUndefined();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the Agents view with the environment halted, THEN the on resume column should be shown", async () => {
@@ -551,4 +620,9 @@ test("Given the Agents view with the environment halted, THEN the on resume colu
     (header) => header.textContent === "On resume",
   );
   expect(onResumeColumnHeader).toBeDefined();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Agents/UI/Components/ActionButton.tsx b/src/Slices/Agents/UI/Components/ActionButton.tsx
index 8c78b5cbd..daeb53516 100644
--- a/src/Slices/Agents/UI/Components/ActionButton.tsx
+++ b/src/Slices/Agents/UI/Components/ActionButton.tsx
@@ -36,7 +36,7 @@ export const ActionButton: React.FC<Props> = ({ name, paused }) => {
   return (
     <ActionDisabledTooltip
       isDisabled={isHalted}
-      ariaLabel={"agentAction"}
+      testingId={"agentAction"}
       tooltipContent={words("environment.halt.tooltip")}
     >
       <Button
diff --git a/src/Slices/Agents/UI/FilterWidget/AgentsFilterWidget.tsx b/src/Slices/Agents/UI/FilterWidget/AgentsFilterWidget.tsx
index d35f4be4c..86848dc7e 100644
--- a/src/Slices/Agents/UI/FilterWidget/AgentsFilterWidget.tsx
+++ b/src/Slices/Agents/UI/FilterWidget/AgentsFilterWidget.tsx
@@ -42,7 +42,7 @@ export const AgentsFilterWidget: React.FC<Props> = ({ filter, setFilter }) => {
     });
 
   return (
-    <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+    <ToolbarGroup variant="filter-group" aria-label="FilterBar" role="toolbar">
       <FilterPicker
         setFilterKind={setFilterKind}
         filterKind={filterKind}
diff --git a/src/Slices/CompileDetails/UI/CompileDetails.test.tsx b/src/Slices/CompileDetails/UI/CompileDetails.test.tsx
index 2e3887202..1ef62a58f 100644
--- a/src/Slices/CompileDetails/UI/CompileDetails.test.tsx
+++ b/src/Slices/CompileDetails/UI/CompileDetails.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { MemoryRouter } from "react-router-dom";
 import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   getStoreInstance,
@@ -13,6 +14,14 @@ import { DependencyProvider } from "@/UI/Dependency";
 import { UrlManagerImpl } from "@/UI/Utils";
 import * as Mock from "@S/CompileDetails/Core/Mock";
 import { CompileDetails } from "./CompileDetails";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const apiHelper = new DeferredApiHelper();
@@ -43,7 +52,7 @@ test("CompileDetailsView shows failed view", async () => {
   await render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "CompileDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "CompileDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -51,7 +60,7 @@ test("CompileDetailsView shows failed view", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "CompileDetailsView-Failed" }),
+    await screen.findByRole("region", { name: "CompileDetailsView-Failed" }),
   ).toBeInTheDocument();
 });
 
@@ -60,7 +69,7 @@ test("CompileDetailsView shows completed table with success: true", async () =>
   await render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "CompileDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "CompileDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -71,6 +80,11 @@ test("CompileDetailsView shows completed table with success: true", async () =>
     await screen.findByRole("generic", { name: "CompileDetailsView-Success" }),
   ).toBeInTheDocument();
   expect(await screen.findAllByLabelText("done-state")).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("CompileDetailsView shows completed table with success: false, error indication should appear", async () => {
@@ -78,7 +92,7 @@ test("CompileDetailsView shows completed table with success: false, error indica
   await render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "CompileDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "CompileDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -90,4 +104,9 @@ test("CompileDetailsView shows completed table with success: false, error indica
   ).toBeInTheDocument();
 
   expect(await screen.findByLabelText("error-state")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/CompileDetails/UI/CompileStageReportTable.tsx b/src/Slices/CompileDetails/UI/CompileStageReportTable.tsx
index aa27f4b41..ae002b0ab 100644
--- a/src/Slices/CompileDetails/UI/CompileStageReportTable.tsx
+++ b/src/Slices/CompileDetails/UI/CompileStageReportTable.tsx
@@ -37,7 +37,7 @@ export const CompileStageReportTable: React.FC<Props> = ({
     <Table {...props} variant={TableVariant.compact}>
       <Thead>
         <Tr>
-          <Th key="toggle" />
+          <Th aria-hidden key="toggle" />
           {heads}
         </Tr>
       </Thead>
diff --git a/src/Slices/CompileReports/UI/FilterWidget/CompileReportsFilterWidget.tsx b/src/Slices/CompileReports/UI/FilterWidget/CompileReportsFilterWidget.tsx
index 9c51ff748..03ded3f14 100644
--- a/src/Slices/CompileReports/UI/FilterWidget/CompileReportsFilterWidget.tsx
+++ b/src/Slices/CompileReports/UI/FilterWidget/CompileReportsFilterWidget.tsx
@@ -33,7 +33,7 @@ export const CompileReportsFilterWidget: React.FC<Props> = ({
     });
 
   return (
-    <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+    <ToolbarGroup variant="filter-group" aria-label="FilterBar" role="toolbar">
       <FilterPicker
         setFilterKind={setFilterKind}
         filterKind={filterKind}
diff --git a/src/Slices/CompileReports/UI/Page.test.tsx b/src/Slices/CompileReports/UI/Page.test.tsx
index 3db13b4bc..ace714aee 100644
--- a/src/Slices/CompileReports/UI/Page.test.tsx
+++ b/src/Slices/CompileReports/UI/Page.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, RemoteData } from "@/Core";
 import {
   QueryResolverImpl,
@@ -24,6 +25,14 @@ import { DependencyProvider } from "@/UI/Dependency";
 import { PrimaryRouteManager } from "@/UI/Routing";
 import * as Mock from "@S/CompileReports/Core/Mock";
 import { Page } from "./Page";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const apiHelper = new DeferredApiHelper();
@@ -81,7 +90,7 @@ test("CompileReportsView shows empty table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "CompileReportsView-Loading" }),
+    await screen.findByRole("region", { name: "CompileReportsView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -97,6 +106,11 @@ test("CompileReportsView shows empty table", async () => {
   expect(
     await screen.findByRole("generic", { name: "CompileReportsView-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("CompileReportsView shows failed table", async () => {
@@ -108,7 +122,7 @@ test("CompileReportsView shows failed table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "CompileReportsView-Loading" }),
+    await screen.findByRole("region", { name: "CompileReportsView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -116,8 +130,13 @@ test("CompileReportsView shows failed table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "CompileReportsView-Failed" }),
+    await screen.findByRole("region", { name: "CompileReportsView-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("CompileReportsView shows success table", async () => {
@@ -129,7 +148,7 @@ test("CompileReportsView shows success table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "CompileReportsView-Loading" }),
+    await screen.findByRole("region", { name: "CompileReportsView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -139,6 +158,11 @@ test("CompileReportsView shows success table", async () => {
   expect(
     await screen.findByRole("grid", { name: "CompileReportsView-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("CompileReportsView shows updated table", async () => {
@@ -150,7 +174,7 @@ test("CompileReportsView shows updated table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "CompileReportsView-Loading" }),
+    await screen.findByRole("region", { name: "CompileReportsView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -179,6 +203,11 @@ test("CompileReportsView shows updated table", async () => {
   expect(
     await screen.findByRole("grid", { name: "CompileReportsView-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the status filter with the Success option then the successful compile reports should be fetched and shown", async () => {
@@ -201,7 +230,7 @@ test("When using the status filter with the Success option then the successful c
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -240,6 +269,11 @@ test("When using the status filter with the Success option then the successful c
     name: "Compile Reports Table Row",
   });
   expect(rowsAfter).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the status filter with the In Progress opiton then the compile reports of in progress compiles should be fetched and shown", async () => {
@@ -262,7 +296,7 @@ test("When using the status filter with the In Progress opiton then the compile
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -308,6 +342,11 @@ test("When using the status filter with the In Progress opiton then the compile
     name: "Compile Reports Table Row",
   });
   expect(rowsAfter).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 it("When using the Date filter then the compile reports within the range selected range should be fetched and shown", async () => {
@@ -330,7 +369,7 @@ it("When using the Date filter then the compile reports within the range selecte
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -393,6 +432,11 @@ it("When using the Date filter then the compile reports within the range selecte
   expect(
     await screen.findByText("to | 2021/09/30 00:00:00", { exact: false }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given CompileReportsView When recompile is triggered Then table is updated", async () => {
@@ -411,6 +455,11 @@ test("Given CompileReportsView When recompile is triggered Then table is updated
 
   expect(button).toBeEnabled();
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(button);
   });
diff --git a/src/Slices/ComplianceCheck/UI/Components/SelectReportAction.tsx b/src/Slices/ComplianceCheck/UI/Components/SelectReportAction.tsx
index f6fd499dc..fca207a63 100644
--- a/src/Slices/ComplianceCheck/UI/Components/SelectReportAction.tsx
+++ b/src/Slices/ComplianceCheck/UI/Components/SelectReportAction.tsx
@@ -4,6 +4,7 @@ import {
   MenuToggle,
   MenuToggleElement,
   Select,
+  SelectList,
   SelectOption,
   Spinner,
   ToolbarGroup,
@@ -97,11 +98,13 @@ const Picker: React.FC<PickerProps> = ({
       onOpenChange={(isOpen) => setIsOpen(isOpen)}
       aria-label="ReportList"
     >
-      {reportsData.value.map((report) => (
-        <SelectOption key={report.id} value={report.id}>
-          <Progress report={report} /> {datePresenter.getFull(report.date)}
-        </SelectOption>
-      ))}
+      <SelectList aria-label="ReportSelectOptions">
+        {reportsData.value.map((report) => (
+          <SelectOption key={report.id} value={report.id}>
+            <Progress report={report} /> {datePresenter.getFull(report.date)}
+          </SelectOption>
+        ))}
+      </SelectList>
     </Select>
   );
 };
diff --git a/src/Slices/ComplianceCheck/UI/Page.test.tsx b/src/Slices/ComplianceCheck/UI/Page.test.tsx
index fe200468e..12584c534 100644
--- a/src/Slices/ComplianceCheck/UI/Page.test.tsx
+++ b/src/Slices/ComplianceCheck/UI/Page.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   CommandManagerResolverImpl,
@@ -13,11 +14,18 @@ import {
 } from "@/Data";
 import { DeferredApiHelper, dependencies, StaticScheduler } from "@/Test";
 import { words } from "@/UI";
-
 import { DependencyProvider } from "@/UI/Dependency";
 import { MomentDatePresenter } from "@/UI/Utils";
 import * as Mock from "@S/ComplianceCheck/Data/Mock";
 import { View } from "./Page";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const apiHelper = new DeferredApiHelper();
@@ -84,12 +92,22 @@ test("GIVEN ComplianceCheck page THEN user sees latest dry run report", async ()
 
   const blocks = await screen.findAllByTestId("DiffBlock");
   expect(blocks).toHaveLength(11);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ComplianceCheck page When a report is selected from the list THEN the user sees the selected dry run report", async () => {
   const { component, apiHelper } = setup();
   render(component);
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await apiHelper.resolve(Either.right(Mock.listResponse));
   });
@@ -161,6 +179,11 @@ test("GIVEN ComplianceCheck page When a report is selected from the list THEN th
     "aria-selected",
     "true",
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ComplianceCheck page WHEN user clicks on 'Perform dry run' THEN new dry run is selected", async () => {
@@ -247,6 +270,11 @@ test("GIVEN ComplianceCheck page WHEN StatusFilter = 'Added' THEN only 'Added' r
     screen.getAllByRole("listitem", { name: "DiffSummaryListItem" }),
   ).toHaveLength(11);
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   expect(await screen.findAllByTestId("DiffBlock")).toHaveLength(11);
 
   expect(
@@ -287,6 +315,11 @@ test("GIVEN ComplianceCheck page WHEN StatusFilter = 'Added' THEN only 'Added' r
   ).toHaveLength(2);
 
   expect(await screen.findAllByTestId("DiffBlock")).toHaveLength(2);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ComplianceCheck page WHEN SearchFilter is used, ONLY show the resources matching the search value", async () => {
@@ -307,6 +340,11 @@ test("GIVEN ComplianceCheck page WHEN SearchFilter is used, ONLY show the resour
     );
   });
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   expect(
     screen.getAllByRole("listitem", { name: "DiffSummaryListItem" }),
   ).toHaveLength(11);
@@ -338,4 +376,9 @@ test("GIVEN ComplianceCheck page WHEN SearchFilter is used, ONLY show the resour
   });
 
   expect(await screen.findAllByTestId("DiffBlock")).toHaveLength(11);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/CreateEnvironment/UI/CreateEnvironmentForm.test.tsx b/src/Slices/CreateEnvironment/UI/CreateEnvironmentForm.test.tsx
index ae67eba79..0a14a8a12 100644
--- a/src/Slices/CreateEnvironment/UI/CreateEnvironmentForm.test.tsx
+++ b/src/Slices/CreateEnvironment/UI/CreateEnvironmentForm.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   CommandResolverImpl,
@@ -21,6 +22,14 @@ import {
 } from "@/Test";
 import { DependencyProvider } from "@/UI/Dependency";
 import { Page } from "./Page";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const apiHelper = new DeferredApiHelper();
@@ -62,6 +71,11 @@ test("Given CreateEnvironmentForm When project and environment are not set Then
   });
 
   expect(await screen.findByRole("button", { name: "submit" })).toBeDisabled();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given CreateEnvironmentForm When no projects are known, THEN cannot add empty project name", async () => {
@@ -103,6 +117,11 @@ test("Given CreateEnvironmentForm When no projects are known, THEN cannot add em
   });
 
   expect(screen.getByRole("option")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test(`Given CreateEnvironmentForm When an existing project and valid environment are set and submit is clicked Then sends the correct request`, async () => {
@@ -136,6 +155,12 @@ test(`Given CreateEnvironmentForm When an existing project and valid environment
   await act(async () => {
     await userEvent.type(textBox, `dev{enter}`);
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(
       await screen.findByRole("button", { name: "submit" }),
@@ -207,6 +232,11 @@ test(`Given CreateEnvironmentForm When an existing project, a valid environment
     await userEvent.type(urlTextBox, repository);
   });
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(
       await screen.findByRole("button", { name: "submit" }),
@@ -261,6 +291,12 @@ test(`Given CreateEnvironmentForm When a new project and valid environment are s
       screen.getByRole("option", { name: 'Create "new-project"' }),
     );
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   const request = apiHelper.pendingRequests[0];
   expect(request).toEqual({
     method: "PUT",
diff --git a/src/Slices/CreateEnvironment/UI/Page.tsx b/src/Slices/CreateEnvironment/UI/Page.tsx
index 40652d0b6..7511f8a27 100644
--- a/src/Slices/CreateEnvironment/UI/Page.tsx
+++ b/src/Slices/CreateEnvironment/UI/Page.tsx
@@ -15,12 +15,9 @@ export const Page: React.FC = () => {
       {RemoteData.fold(
         {
           notAsked: () => null,
-          loading: () => <LoadingView aria-label="CreateEnvironment-Loading" />,
+          loading: () => <LoadingView ariaLabel="CreateEnvironment-Loading" />,
           failed: (message) => (
-            <ErrorView
-              message={message}
-              aria-label="CreateEnvironment-Failed"
-            />
+            <ErrorView message={message} ariaLabel="CreateEnvironment-Failed" />
           ),
           success: (projects) => (
             <CreateEnvironmentForm
diff --git a/src/Slices/CreateInstance/UI/CreateInstance.test.tsx b/src/Slices/CreateInstance/UI/CreateInstance.test.tsx
index b09e602e5..945840729 100644
--- a/src/Slices/CreateInstance/UI/CreateInstance.test.tsx
+++ b/src/Slices/CreateInstance/UI/CreateInstance.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { render, screen, act, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   CommandManagerResolverImpl,
@@ -23,6 +24,14 @@ import { InterServiceRelations } from "@/Test/Data/Service";
 import { words } from "@/UI";
 import { DependencyProvider } from "@/UI/Dependency";
 import { CreateInstance } from "./CreateInstance";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup(service) {
   const store = getStoreInstance();
@@ -80,6 +89,11 @@ test("Given the CreateInstance View When creating an instance with attributes Th
   const networkField = screen.getByText("network");
   expect(networkField).toBeValid();
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(
       screen.getByRole("button", { name: words("confirm") }),
@@ -159,6 +173,11 @@ test("Given the CreateInstance View When creating an instance with Inter-service
 
   expect(options[0]).toHaveClass("pf-m-selected");
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(
       screen.getByRole("button", { name: words("confirm") }),
@@ -293,6 +312,11 @@ test("Given the CreateInstance View When creating entity with default values The
   const { component } = setup(Service.ServiceWithAllAttrs);
   render(component);
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   //check if direct attributes have correct default value
   expect(screen.queryByLabelText("TextInput-string")).toHaveValue(
     "default_string",
diff --git a/src/Slices/Dashboard/UI/Charts/LineChart.tsx b/src/Slices/Dashboard/UI/Charts/LineChart.tsx
index d057746e9..140566b83 100644
--- a/src/Slices/Dashboard/UI/Charts/LineChart.tsx
+++ b/src/Slices/Dashboard/UI/Charts/LineChart.tsx
@@ -78,6 +78,7 @@ export const LineChart: React.FC<LineChartProps> = ({
     <div ref={ref}>
       <Chart
         ariaDesc={title}
+        title={title}
         containerComponent={
           <CursorVoronoiContainer
             labels={({ datum }) => chooseWhichLabelToUse(datum)}
diff --git a/src/Slices/Dashboard/UI/Dashboard.tsx b/src/Slices/Dashboard/UI/Dashboard.tsx
index 6ec9f816f..1e5e91a49 100644
--- a/src/Slices/Dashboard/UI/Dashboard.tsx
+++ b/src/Slices/Dashboard/UI/Dashboard.tsx
@@ -31,12 +31,12 @@ export const Dashboard: React.FC = () => {
       {RemoteData.fold(
         {
           notAsked: () => null,
-          loading: () => <LoadingView aria-label="Metrics-Loading" />,
+          loading: () => <LoadingView ariaLabel="Metrics-Loading" />,
           failed: (error) => (
             <ErrorView
               message={error}
               retry={retry}
-              aria-label="Metrics-Failed"
+              ariaLabel="Metrics-Failed"
             />
           ),
           success: (metrics) => (
diff --git a/src/Slices/Dashboard/UI/GraphCard.test.tsx b/src/Slices/Dashboard/UI/GraphCard.test.tsx
index 25e0f343f..742be6dbe 100644
--- a/src/Slices/Dashboard/UI/GraphCard.test.tsx
+++ b/src/Slices/Dashboard/UI/GraphCard.test.tsx
@@ -1,10 +1,20 @@
 import React from "react";
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { words } from "@/UI";
 import { MetricName } from "../Core/Domain";
 import { mockedMetrics } from "../Core/Mock";
 import { GraphCard } from "./GraphCard";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 describe("Test GraphCard with LineChart component", () => {
   it("Line Chart version", async () => {
     const availableKeys = Object.keys(mockedMetrics.metrics);
@@ -27,6 +37,11 @@ describe("Test GraphCard with LineChart component", () => {
 
     // eslint-disable-next-line testing-library/no-node-access
     expect(await container.querySelector(".pf-v5-c-chart")).toBeVisible();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   });
 
   it("Area Chart version", async () => {
@@ -49,5 +64,10 @@ describe("Test GraphCard with LineChart component", () => {
 
     // eslint-disable-next-line testing-library/no-node-access
     expect(await container.querySelector(".pf-v5-c-chart")).toBeVisible();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   });
 });
diff --git a/src/Slices/Dashboard/UI/Page.test.tsx b/src/Slices/Dashboard/UI/Page.test.tsx
index c00649fba..b60d2c067 100644
--- a/src/Slices/Dashboard/UI/Page.test.tsx
+++ b/src/Slices/Dashboard/UI/Page.test.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { MemoryRouter } from "react-router";
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import { getStoreInstance, QueryResolverImpl } from "@/Data";
 import { GetMetricsQueryManager } from "@/Data/Managers/GetMetrics";
@@ -16,6 +17,14 @@ import {
 import { words } from "@/UI";
 import { DependencyProvider } from "@/UI/Dependency";
 import { Page } from "./Page";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const store = getStoreInstance();
@@ -58,14 +67,19 @@ test("Home view shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Dashboard-Loading" }),
+    await screen.findByRole("region", { name: "Dashboard-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "Dashboard-Failed" }),
+    await screen.findByRole("region", { name: "Dashboard-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Home View shows success table", async () => {
@@ -73,7 +87,7 @@ test("Home View shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Dashboard-Loading" }),
+    await screen.findByRole("region", { name: "Dashboard-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -86,4 +100,9 @@ test("Home View shows success table", async () => {
       words("dashboard.title")(EnvironmentDetails.a.name),
     ),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Dashboard/UI/Page.tsx b/src/Slices/Dashboard/UI/Page.tsx
index d2b53d09c..b78d6ded4 100644
--- a/src/Slices/Dashboard/UI/Page.tsx
+++ b/src/Slices/Dashboard/UI/Page.tsx
@@ -19,12 +19,12 @@ export const Page: React.FC = () => {
       {RemoteData.fold(
         {
           notAsked: () => null,
-          loading: () => <LoadingView aria-label="Dashboard-Loading" />,
+          loading: () => <LoadingView ariaLabel="Dashboard-Loading" />,
           failed: (error) => (
             <ErrorView
               message={error}
               retry={retry}
-              aria-label="Dashboard-Failed"
+              ariaLabel="Dashboard-Failed"
             />
           ),
           success: (value) => (
diff --git a/src/Slices/DesiredState/UI/Components/FilterWidget.tsx b/src/Slices/DesiredState/UI/Components/FilterWidget.tsx
index c41c68543..83f487142 100644
--- a/src/Slices/DesiredState/UI/Components/FilterWidget.tsx
+++ b/src/Slices/DesiredState/UI/Components/FilterWidget.tsx
@@ -47,7 +47,7 @@ export const FilterWidget: React.FC<Props> = ({ filter, setFilter }) => {
     });
 
   return (
-    <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+    <ToolbarGroup variant="filter-group" aria-label="FilterBar" role="toolbar">
       <FilterPicker
         setFilterKind={setFilterKind}
         filterKind={filterKind}
diff --git a/src/Slices/DesiredState/UI/Components/PromoteAction.tsx b/src/Slices/DesiredState/UI/Components/PromoteAction.tsx
index 1f83d7ed2..2cb9c80a2 100644
--- a/src/Slices/DesiredState/UI/Components/PromoteAction.tsx
+++ b/src/Slices/DesiredState/UI/Components/PromoteAction.tsx
@@ -38,7 +38,7 @@ export const PromoteAction: React.FC<Props> = ({ version, isDisabled }) => {
   return (
     <ActionDisabledTooltip
       isDisabled={isDisabled || isHalted}
-      ariaLabel={"promote"}
+      testingId={"promote"}
       tooltipContent={
         isHalted
           ? words("environment.halt.tooltip")
diff --git a/src/Slices/DesiredState/UI/Page.test.tsx b/src/Slices/DesiredState/UI/Page.test.tsx
index 9580f6b9d..c8b76e17b 100644
--- a/src/Slices/DesiredState/UI/Page.test.tsx
+++ b/src/Slices/DesiredState/UI/Page.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, Maybe } from "@/Core";
 import {
   QueryResolverImpl,
@@ -30,6 +31,15 @@ import {
 import * as DesiredStateVersions from "@S/DesiredState/Data/Mock";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -85,7 +95,7 @@ test("DesiredStatesView shows empty table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "DesiredStatesView-Loading" }),
+    await screen.findByRole("region", { name: "DesiredStatesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -101,6 +111,11 @@ test("DesiredStatesView shows empty table", async () => {
   expect(
     await screen.findByRole("generic", { name: "DesiredStatesView-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("DesiredStatesView shows failed table", async () => {
@@ -112,7 +127,7 @@ test("DesiredStatesView shows failed table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "DesiredStatesView-Loading" }),
+    await screen.findByRole("region", { name: "DesiredStatesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -120,8 +135,13 @@ test("DesiredStatesView shows failed table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "DesiredStatesView-Failed" }),
+    await screen.findByRole("region", { name: "DesiredStatesView-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("AgentsView shows success table", async () => {
@@ -133,7 +153,7 @@ test("AgentsView shows success table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "DesiredStatesView-Loading" }),
+    await screen.findByRole("region", { name: "DesiredStatesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -143,6 +163,11 @@ test("AgentsView shows success table", async () => {
   expect(
     await screen.findByRole("grid", { name: "DesiredStatesView-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the status filter then only the matching desired states should be fetched and shown", async () => {
@@ -165,7 +190,7 @@ test("When using the status filter then only the matching desired states should
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -212,6 +237,11 @@ test("When using the status filter then only the matching desired states should
   });
 
   expect(rowsAfter).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the Date filter then the desired state versions within the range selected range should be fetched and shown", async () => {
@@ -234,7 +264,7 @@ test("When using the Date filter then the desired state versions within the rang
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -296,6 +326,11 @@ test("When using the Date filter then the desired state versions within the rang
   expect(
     await screen.findByText("to | 2021/12/07 00:00:00", { exact: false }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the Version filter then the desired state versions within the range selected range should be fetched and shown", async () => {
@@ -318,7 +353,7 @@ test("When using the Version filter then the desired state versions within the r
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -378,6 +413,11 @@ test("When using the Version filter then the desired state versions within the r
 
   expect(await screen.findByText("from | 3", { exact: false })).toBeVisible();
   expect(await screen.findByText("to | 5", { exact: false })).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the Desired states view When promoting a version, then the correct request is be fired", async () => {
@@ -455,6 +495,11 @@ test("Given the Desired states view When promoting a version, then the correct r
 
   expect(apiHelper.resolvedRequests).toHaveLength(4);
   expect(apiHelper.pendingRequests).toHaveLength(0);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the Desired states view with filters When promoting a version, then the correct request is be fired", async () => {
@@ -471,7 +516,7 @@ test("Given the Desired states view with filters When promoting a version, then
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -550,6 +595,11 @@ test("Given the Desired states view with filters When promoting a version, then
 
   expect(apiHelper.resolvedRequests).toHaveLength(5);
   expect(apiHelper.pendingRequests).toHaveLength(0);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the Desired states view When promoting a version results in an error, then the error is shown", async () => {
@@ -642,7 +692,13 @@ describe("DeleteModal ", () => {
     ).toBeVisible();
     expect(await screen.findByText("Yes")).toBeVisible();
     expect(await screen.findByText("No")).toBeVisible();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   });
+
   it("Closes modal when cancelled(both cancel buttons scenario)", async () => {
     const { component, apiHelper } = setup();
     render(component);
@@ -695,7 +751,13 @@ describe("DeleteModal ", () => {
     });
 
     expect(screen.queryByText("Yes")).not.toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   });
+
   it("Sends request when submitted then request is executed and modal closed", async () => {
     const { component, apiHelper } = setup();
     render(component);
@@ -740,5 +802,10 @@ describe("DeleteModal ", () => {
     });
 
     expect(screen.queryByText("No")).not.toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   });
 });
diff --git a/src/Slices/DesiredStateCompare/UI/Page.test.tsx b/src/Slices/DesiredStateCompare/UI/Page.test.tsx
index a327a3bfc..4d1d1f02b 100644
--- a/src/Slices/DesiredStateCompare/UI/Page.test.tsx
+++ b/src/Slices/DesiredStateCompare/UI/Page.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import { FileFetcherImpl, getStoreInstance, QueryResolverImpl } from "@/Data";
 import {
@@ -16,6 +17,14 @@ import {
   GetDesiredStateDiffStateHelper,
 } from "@S/DesiredStateCompare/Data";
 import { View } from "./Page";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup() {
   const store = getStoreInstance();
@@ -58,6 +67,11 @@ test("GIVEN DesiredStateCompare THEN shows list of diff blocks", async () => {
 
   const blocks = await screen.findAllByTestId("DiffBlock");
   expect(blocks).toHaveLength(11);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN DesiredStateCompare THEN shows 'Jump To' action with dropdown", async () => {
@@ -86,6 +100,11 @@ test("GIVEN DesiredStateCompare THEN shows 'Jump To' action with dropdown", asyn
     name: "DiffSummaryListItem",
   });
   expect(items).toHaveLength(11);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN DesiredStateCompare WHEN StatusFilter = 'Added' THEN only 'Added' resources are shown", async () => {
@@ -147,6 +166,11 @@ test("GIVEN DesiredStateCompare WHEN StatusFilter = 'Added' THEN only 'Added' re
   ).toHaveLength(2);
 
   expect(await screen.findAllByTestId("DiffBlock")).toHaveLength(2);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN DesiredStateCompare WHEN File Resource THEN it shows prompt that can fetch file content", async () => {
@@ -224,6 +248,11 @@ test("GIVEN DesiredStateCompare WHEN File Resource THEN it shows prompt that can
   expect(
     within(blocks[1]).getByRole("generic", { name: "ErrorDiffView" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN DesiredStateCompare page WHEN SearchFilter is used, ONLY show the resources matching the search value", async () => {
@@ -271,4 +300,9 @@ test("GIVEN DesiredStateCompare page WHEN SearchFilter is used, ONLY show the re
   });
 
   expect(await screen.findAllByTestId("DiffBlock")).toHaveLength(11);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/DesiredStateDetails/UI/Page.test.tsx b/src/Slices/DesiredStateDetails/UI/Page.test.tsx
index 4619dccb0..a436a81ec 100644
--- a/src/Slices/DesiredStateDetails/UI/Page.test.tsx
+++ b/src/Slices/DesiredStateDetails/UI/Page.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { MemoryRouter } from "react-router-dom";
 import { render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { act } from "react-dom/test-utils";
 import { Either } from "@/Core";
 import { getStoreInstance, QueryResolverImpl } from "@/Data";
@@ -19,6 +20,15 @@ import {
 } from "@S/DesiredStateDetails/Data";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -59,8 +69,13 @@ test("GIVEN DesiredStateDetails page THEN shows loading resource table", async (
   ]);
 
   expect(
-    screen.getByRole("generic", { name: "VersionResourcesTable-Loading" }),
+    screen.getByRole("region", { name: "VersionResourcesTable-Loading" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN DesiredStateDetails page WHEN api returns no items THEN shows empty resource table", async () => {
@@ -76,6 +91,11 @@ test("GIVEN DesiredStateDetails page WHEN api returns no items THEN shows empty
   expect(
     screen.getByRole("generic", { name: "VersionResourcesTable-Empty" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN DesiredStateDetails page WHEN api returns error THEN shows error", async () => {
@@ -87,8 +107,13 @@ test("GIVEN DesiredStateDetails page WHEN api returns error THEN shows error", a
   });
 
   expect(
-    screen.getByRole("generic", { name: "VersionResourcesTable-Failed" }),
+    screen.getByRole("region", { name: "VersionResourcesTable-Failed" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN DesiredStateDetails page WHEN api returns items THEN shows success resource table", async () => {
@@ -102,4 +127,9 @@ test("GIVEN DesiredStateDetails page WHEN api returns items THEN shows success r
   expect(
     screen.getByRole("grid", { name: "VersionResourcesTable-Success" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/DesiredStateResourceDetails/UI/DetailsProvider.test.tsx b/src/Slices/DesiredStateResourceDetails/UI/DetailsProvider.test.tsx
index 36f2d736a..210eaefaf 100644
--- a/src/Slices/DesiredStateResourceDetails/UI/DetailsProvider.test.tsx
+++ b/src/Slices/DesiredStateResourceDetails/UI/DetailsProvider.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { MemoryRouter } from "react-router-dom";
 import { render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { act } from "react-dom/test-utils";
 import { Either } from "@/Core";
 import {
@@ -14,6 +15,15 @@ import { DependencyProvider } from "@/UI/Dependency";
 import * as VersionedResourceDetails from "@S/DesiredStateResourceDetails/Data/Mock";
 import { DetailsProvider } from "./DetailsProvider";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -54,4 +64,9 @@ test("GIVEN DesiredStateResourceDetails page WHEN api returns details THEN shows
     screen.getByRole("generic", { name: "ResourceDetails-Success" }),
   ).toBeVisible();
   expect(screen.getByText("requires")).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Diagnose/UI/Diagnose.test.tsx b/src/Slices/Diagnose/UI/Diagnose.test.tsx
index 53607ec34..dcace8d36 100644
--- a/src/Slices/Diagnose/UI/Diagnose.test.tsx
+++ b/src/Slices/Diagnose/UI/Diagnose.test.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { MemoryRouter } from "react-router-dom";
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import { QueryResolverImpl, getStoreInstance } from "@/Data";
 import {
@@ -19,6 +20,15 @@ import {
 import * as Diagnose from "@S/Diagnose/Data/Mock";
 import { Diagnose as DiagnoseComponent } from "./Diagnose";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -55,7 +65,7 @@ test("Diagnose View shows empty table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Diagnostics-Loading" }),
+    await screen.findByRole("region", { name: "Diagnostics-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: { failures: [], rejections: [] } }));
@@ -63,6 +73,11 @@ test("Diagnose View shows empty table", async () => {
   expect(
     await screen.findByRole("generic", { name: "Diagnostics-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Diagnose View shows failed table", async () => {
@@ -70,14 +85,19 @@ test("Diagnose View shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Diagnostics-Loading" }),
+    await screen.findByRole("region", { name: "Diagnostics-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "Diagnostics-Failed" }),
+    await screen.findByRole("region", { name: "Diagnostics-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Diagnose View shows success table", async () => {
@@ -85,7 +105,7 @@ test("Diagnose View shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Diagnostics-Loading" }),
+    await screen.findByRole("region", { name: "Diagnostics-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: Diagnose.failure }));
@@ -93,6 +113,11 @@ test("Diagnose View shows success table", async () => {
   expect(
     await screen.findByRole("generic", { name: "Diagnostics-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Diagnose View shows updated table", async () => {
@@ -100,7 +125,7 @@ test("Diagnose View shows updated table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Diagnostics-Loading" }),
+    await screen.findByRole("region", { name: "Diagnostics-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: { rejections: [], failures: [] } }));
@@ -116,4 +141,9 @@ test("Diagnose View shows updated table", async () => {
   expect(
     await screen.findByRole("generic", { name: "Diagnostics-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/DuplicateInstance/UI/DuplicateInstancePage.test.tsx b/src/Slices/DuplicateInstance/UI/DuplicateInstancePage.test.tsx
index 4406d9cf5..baf1c44f3 100644
--- a/src/Slices/DuplicateInstance/UI/DuplicateInstancePage.test.tsx
+++ b/src/Slices/DuplicateInstance/UI/DuplicateInstancePage.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   CommandManagerResolverImpl,
@@ -26,6 +27,15 @@ import { words } from "@/UI";
 import { DependencyProvider } from "@/UI/Dependency";
 import { DuplicateInstancePage } from "./DuplicateInstancePage";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup(entity = "a") {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -73,14 +83,19 @@ test("Duplicate Instance View shows failed state", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "DuplicateInstance-Loading" }),
+    await screen.findByRole("region", { name: "DuplicateInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "DuplicateInstance-Failed" }),
+    await screen.findByRole("region", { name: "DuplicateInstance-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("DuplicateInstance View shows success form", async () => {
@@ -89,7 +104,7 @@ test("DuplicateInstance View shows success form", async () => {
   const { service_entity } = ServiceInstance.a;
 
   expect(
-    await screen.findByRole("generic", { name: "DuplicateInstance-Loading" }),
+    await screen.findByRole("region", { name: "DuplicateInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.a }));
@@ -108,6 +123,11 @@ test("DuplicateInstance View shows success form", async () => {
     await userEvent.click(screen.getByText(words("confirm")));
   });
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   expect(apiHelper.pendingRequests).toHaveLength(1);
 
   expect(apiHelper.pendingRequests[0]).toEqual({
@@ -168,7 +188,7 @@ test("Given the DuplicateInstance View When changing a embedded entity Then the
   const { service_entity } = ServiceInstance.a;
 
   expect(
-    await screen.findByRole("generic", { name: "DuplicateInstance-Loading" }),
+    await screen.findByRole("region", { name: "DuplicateInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.a }));
@@ -177,6 +197,11 @@ test("Given the DuplicateInstance View When changing a embedded entity Then the
     await screen.findByRole("generic", { name: "DuplicateInstance-Success" }),
   ).toBeInTheDocument();
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(screen.getByRole("button", { name: "circuits" }));
   });
@@ -265,7 +290,7 @@ test("Given the DuplicateInstance View When changing an embedded entity Then the
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "DuplicateInstance-Loading" }),
+    await screen.findByRole("region", { name: "DuplicateInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.allAttrs }));
diff --git a/src/Slices/EditInstance/UI/EditInstancePage.test.tsx b/src/Slices/EditInstance/UI/EditInstancePage.test.tsx
index aa76b34eb..ce3d1c6d9 100644
--- a/src/Slices/EditInstance/UI/EditInstancePage.test.tsx
+++ b/src/Slices/EditInstance/UI/EditInstancePage.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { cloneDeep } from "lodash";
 import { Either } from "@/Core";
 import {
@@ -27,6 +28,31 @@ import { DependencyProvider } from "@/UI/Dependency";
 import { TriggerInstanceUpdateCommandManager } from "@S/EditInstance/Data";
 import { EditInstancePage } from "./EditInstancePage";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
+/**
+ * @note This configuration for the two last tests cases.
+ * Because of redundant data with same id, we need to disable the duplicate-id-aria rule.
+ * The fields are already tested in the previous tests.
+ * The id's and aria-labels are set by the API and assumedly, are unique.
+ *
+ * Todo: Remove this configuration when the test data is updated.
+ */
+const axeLimited = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+    "duplicate-id-aria": { enabled: false },
+  },
+});
+
 function setup(entity = "a") {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -74,14 +100,19 @@ test("Edit Instance View shows failed state", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "EditInstance-Loading" }),
+    await screen.findByRole("region", { name: "EditInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "EditInstance-Failed" }),
+    await screen.findByRole("region", { name: "EditInstance-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("EditInstance View shows success form", async () => {
@@ -90,7 +121,7 @@ test("EditInstance View shows success form", async () => {
   const { service_entity, id, version } = ServiceInstance.a;
 
   expect(
-    await screen.findByRole("generic", { name: "EditInstance-Loading" }),
+    await screen.findByRole("region", { name: "EditInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.a }));
@@ -120,6 +151,11 @@ test("EditInstance View shows success form", async () => {
     },
     environment: "env",
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the EditInstance View When changing a v1 embedded entity Then the correct request is fired", async () => {
@@ -128,7 +164,7 @@ test("Given the EditInstance View When changing a v1 embedded entity Then the co
   const { service_entity, id, version } = ServiceInstance.a;
 
   expect(
-    await screen.findByRole("generic", { name: "EditInstance-Loading" }),
+    await screen.findByRole("region", { name: "EditInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.a }));
@@ -168,6 +204,11 @@ test("Given the EditInstance View When changing a v1 embedded entity Then the co
     },
     environment: "env",
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the EditInstance View When changing a v2 embedded entity Then the correct request  with correct body is fired", async () => {
@@ -176,7 +217,7 @@ test("Given the EditInstance View When changing a v2 embedded entity Then the co
   const { service_entity, id, version } = ServiceInstance.d;
 
   expect(
-    await screen.findByRole("generic", { name: "EditInstance-Loading" }),
+    await screen.findByRole("region", { name: "EditInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.d }));
@@ -241,6 +282,11 @@ test("Given the EditInstance View When changing a v2 embedded entity Then the co
     },
     environment: "env",
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the EditInstance View When changing an embedded entity Then the inputs are displayed correctly", async () => {
@@ -248,7 +294,7 @@ test("Given the EditInstance View When changing an embedded entity Then the inpu
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "EditInstance-Loading" }),
+    await screen.findByRole("region", { name: "EditInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.allAttrs }));
@@ -483,6 +529,11 @@ test("Given the EditInstance View When changing an embedded entity Then the inpu
   expect(
     within(nested_editableOptionalEmbedded_base).queryByText("Delete"),
   ).toBeEnabled();
+
+  await act(async () => {
+    const results = await axeLimited(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the EditInstance View When adding new nested embedded entity Then the inputs for it are displayed correctly", async () => {
@@ -490,7 +541,7 @@ test("Given the EditInstance View When adding new nested embedded entity Then th
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "EditInstance-Loading" }),
+    await screen.findByRole("region", { name: "EditInstance-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: ServiceInstance.allAttrs }));
@@ -651,4 +702,9 @@ test("Given the EditInstance View When adding new nested embedded entity Then th
   expect(
     within(nested_editableOptionalEmbedded_base).queryByText("Delete"),
   ).toBeEnabled();
+
+  await act(async () => {
+    const results = await axeLimited(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Events/UI/Events.test.tsx b/src/Slices/Events/UI/Events.test.tsx
index c1ccdbf4b..40feae525 100644
--- a/src/Slices/Events/UI/Events.test.tsx
+++ b/src/Slices/Events/UI/Events.test.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { MemoryRouter } from "react-router";
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, InstanceEvent } from "@/Core";
 import { QueryResolverImpl, getStoreInstance } from "@/Data";
 import {
@@ -15,6 +16,15 @@ import { DependencyProvider } from "@/UI/Dependency";
 import { EventsQueryManager, EventsStateHelper } from "@S/Events/Data";
 import { Events } from "./Events";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -46,7 +56,7 @@ test("EventsView shows empty table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "EventTable-Loading" }),
+    await screen.findByRole("region", { name: "EventTable-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -60,6 +70,11 @@ test("EventsView shows empty table", async () => {
   expect(
     await screen.findByRole("generic", { name: "EventTable-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("EventsView shows failed table", async () => {
@@ -67,14 +82,19 @@ test("EventsView shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "EventTable-Loading" }),
+    await screen.findByRole("region", { name: "EventTable-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "EventTable-Failed" }),
+    await screen.findByRole("region", { name: "EventTable-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("EventsView shows success table", async () => {
@@ -82,7 +102,7 @@ test("EventsView shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "EventTable-Loading" }),
+    await screen.findByRole("region", { name: "EventTable-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -113,6 +133,11 @@ test("EventsView shows success table", async () => {
   expect(
     await screen.findByRole("grid", { name: "EventTable-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("EventsView shows updated table", async () => {
@@ -120,7 +145,7 @@ test("EventsView shows updated table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "EventTable-Loading" }),
+    await screen.findByRole("region", { name: "EventTable-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -165,4 +190,9 @@ test("EventsView shows updated table", async () => {
   expect(
     await screen.findByRole("grid", { name: "EventTable-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Events/UI/FilterWidget/EventsFilterWidget.tsx b/src/Slices/Events/UI/FilterWidget/EventsFilterWidget.tsx
index e4ec7380c..c7023b725 100644
--- a/src/Slices/Events/UI/FilterWidget/EventsFilterWidget.tsx
+++ b/src/Slices/Events/UI/FilterWidget/EventsFilterWidget.tsx
@@ -54,7 +54,7 @@ export const EventsFilterWidget: React.FC<Props> = ({
       timestamp: timestampFilters.length > 0 ? timestampFilters : undefined,
     });
   return (
-    <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+    <ToolbarGroup variant="filter-group" aria-label="FilterBar" role="toolbar">
       <FilterPicker
         setFilterKind={setFilterKind}
         filterKind={filterKind}
diff --git a/src/Slices/Events/UI/Spec/EventsPageIntegration.test.ts b/src/Slices/Events/UI/Spec/EventsPageIntegration.test.ts
index b5afaeec5..63bd8e5f3 100644
--- a/src/Slices/Events/UI/Spec/EventsPageIntegration.test.ts
+++ b/src/Slices/Events/UI/Spec/EventsPageIntegration.test.ts
@@ -44,7 +44,7 @@ describe("Given the Events Page", () => {
 
       await act(async () => {
         await userEvent.click(
-          within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+          within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
             "button",
             { name: "FilterPicker" },
           ),
@@ -112,7 +112,7 @@ describe("Given the Events Page", () => {
 
     await act(async () => {
       await userEvent.click(
-        within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+        within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
           "button",
           { name: "FilterPicker" },
         ),
@@ -201,7 +201,7 @@ describe("Given the Events Page", () => {
 
       await act(async () => {
         await userEvent.click(
-          within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+          within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
             "button",
             { name: "FilterPicker" },
           ),
diff --git a/src/Slices/Facts/UI/Page.test.tsx b/src/Slices/Facts/UI/Page.test.tsx
index 8a381a6e7..7cef5d0dd 100644
--- a/src/Slices/Facts/UI/Page.test.tsx
+++ b/src/Slices/Facts/UI/Page.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   QueryResolverImpl,
@@ -15,6 +16,8 @@ import { DependencyProvider } from "@/UI/Dependency";
 import { Mock } from "@S/Facts/Test";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
 function setup() {
   const apiHelper = new DeferredApiHelper();
   const scheduler = new StaticScheduler();
@@ -70,6 +73,11 @@ test("GIVEN Facts page THEN shows table", async () => {
   expect(
     within(rows[0]).getByRole("cell", { name: "2021/03/18 18:10:43" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN Facts page THEN sets sorting parameters correctly on click", async () => {
@@ -95,6 +103,11 @@ test("GIVEN Facts page THEN sets sorting parameters correctly on click", async (
     await userEvent.click(resourceIdButton);
   });
   expect(apiHelper.pendingRequests[0].url).toContain("&sort=resource_id.asc");
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test.each`
@@ -153,5 +166,10 @@ test.each`
     expect(
       await screen.findAllByRole("row", { name: "FactsRow" }),
     ).toHaveLength(4);
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   },
 );
diff --git a/src/Slices/Home/UI/CardView.tsx b/src/Slices/Home/UI/CardView.tsx
index 03f6a3255..ef08baac9 100644
--- a/src/Slices/Home/UI/CardView.tsx
+++ b/src/Slices/Home/UI/CardView.tsx
@@ -88,7 +88,7 @@ const EnvironmentCard: React.FC<EnvironmentCardProps> = ({
         aria-label={"Environment card"}
         data-testid="Environment card"
       >
-        <StyledTitle component="h4">
+        <StyledTitle component="h3">
           {environment.icon ? (
             <StyledIcon
               src={`data:${environment.icon}`}
diff --git a/src/Slices/Home/UI/FilterToolbar.tsx b/src/Slices/Home/UI/FilterToolbar.tsx
index 75a903e7c..f4a49bfdd 100644
--- a/src/Slices/Home/UI/FilterToolbar.tsx
+++ b/src/Slices/Home/UI/FilterToolbar.tsx
@@ -28,7 +28,11 @@ export const FilterToolbar: React.FC<Props> = ({
   return (
     <Toolbar clearAllFilters={clearFilters}>
       <ToolbarContent>
-        <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+        <ToolbarGroup
+          variant="filter-group"
+          aria-label="FilterBar"
+          role="toolbar"
+        >
           <ToolbarItem variant="search-filter">
             <SimpleFreeTextFilter
               isVisible={true}
@@ -57,7 +61,11 @@ export const FilterToolbar: React.FC<Props> = ({
 export const EmptyFilterToolbar: React.FC = () => (
   <Toolbar>
     <ToolbarContent>
-      <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+      <ToolbarGroup
+        variant="filter-group"
+        aria-label="FilterBar"
+        role="toolbar"
+      >
         <ToolbarItem style={{ height: "36px" }} />
       </ToolbarGroup>
     </ToolbarContent>
diff --git a/src/Slices/Home/UI/Page.test.tsx b/src/Slices/Home/UI/Page.test.tsx
index 71a9a325b..592b099b6 100644
--- a/src/Slices/Home/UI/Page.test.tsx
+++ b/src/Slices/Home/UI/Page.test.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { MemoryRouter } from "react-router";
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import { getStoreInstance, QueryResolverImpl } from "@/Data";
 import {
@@ -18,6 +19,15 @@ import {
 import { DependencyProvider } from "@/UI/Dependency";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const apiHelper = new DeferredApiHelper();
@@ -53,14 +63,19 @@ test("Home view shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Overview-Loading" }),
+    await screen.findByRole("region", { name: "Overview-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "Overview-Failed" }),
+    await screen.findByRole("region", { name: "Overview-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Home View shows success table", async () => {
@@ -68,7 +83,7 @@ test("Home View shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Overview-Loading" }),
+    await screen.findByRole("region", { name: "Overview-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -80,4 +95,9 @@ test("Home View shows success table", async () => {
   expect(
     await screen.findByRole("generic", { name: "Overview-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Home/UI/Page.tsx b/src/Slices/Home/UI/Page.tsx
index ec2b943a8..bc1345fa9 100644
--- a/src/Slices/Home/UI/Page.tsx
+++ b/src/Slices/Home/UI/Page.tsx
@@ -23,7 +23,7 @@ export const Page: React.FC = () => {
             <>
               <EmptyFilterToolbar />
               <PageSection isFilled>
-                <LoadingView aria-label="Overview-Loading" />
+                <LoadingView ariaLabel="Overview-Loading" />
               </PageSection>
             </>
           ),
@@ -34,7 +34,7 @@ export const Page: React.FC = () => {
                 <ErrorView
                   title={words("error")}
                   message={words("error.general")(error)}
-                  aria-label="Overview-Failed"
+                  ariaLabel="Overview-Failed"
                 />
               </PageSection>
             </>
diff --git a/src/Slices/Login/Page.test.tsx b/src/Slices/Login/Page.test.tsx
index 2fa72242c..5ea243d50 100644
--- a/src/Slices/Login/Page.test.tsx
+++ b/src/Slices/Login/Page.test.tsx
@@ -3,6 +3,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { screen } from "@testing-library/dom";
 import { act, render, waitFor } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { PrimaryAuthController } from "@/Data";
@@ -11,6 +12,8 @@ import { dependencies } from "@/Test";
 import { DependencyProvider } from "@/UI";
 import { Login } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
 const mockedUsedNavigate = jest.fn();
 
 jest.mock("react-router-dom", () => ({
@@ -35,17 +38,27 @@ const setup = () => {
 };
 
 describe("Login", () => {
-  it("if open-login event isn't triggered return null", () => {
+  it("if open-login event isn't triggered return null", async () => {
     render(setup());
     expect(screen.queryByLabelText("input-username")).not.toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   });
-  it("if open-login event is triggered return login form", () => {
+  it("if open-login event is triggered return login form", async () => {
     render(setup());
     act(() => {
       document.dispatchEvent(new Event("open-login"));
     });
 
     expect(screen.getByLabelText("input-username")).toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   });
   it("if user login with valid credentials we should set the cookie and reload the page", async () => {
     const spiedCreateCookie = jest.spyOn(CookieHelper, "createCookie");
@@ -115,6 +128,12 @@ describe("Login", () => {
       ),
     );
     await waitFor(() => expect(mockedUsedNavigate).toHaveBeenCalledWith(0));
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
     server.close();
   });
 
@@ -165,6 +184,11 @@ describe("Login", () => {
       );
     });
 
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
     server.close();
   });
 
@@ -204,6 +228,12 @@ describe("Login", () => {
         "Access to this resource is unauthorized",
       );
     });
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
     server.close();
   });
 });
diff --git a/src/Slices/Notification/UI/Center/Page.test.tsx b/src/Slices/Notification/UI/Center/Page.test.tsx
index 273a4fac6..da811b9eb 100644
--- a/src/Slices/Notification/UI/Center/Page.test.tsx
+++ b/src/Slices/Notification/UI/Center/Page.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   CommandManagerResolverImpl,
@@ -17,6 +18,8 @@ import { DependencyProvider } from "@/UI/Dependency";
 import * as Mock from "@S/Notification/Core/Mock";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
 const setup = (entries?: string[]) => {
   const apiHelper = new DeferredApiHelper();
   const scheduler = new StaticScheduler();
@@ -60,6 +63,11 @@ test("Given Notification Center page Then fetches notifications", async () => {
   expect(
     screen.getAllByRole("listitem", { name: "NotificationItem" }),
   ).toHaveLength(4);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Notification Center page When user filters on severity Then executes correct request", async () => {
@@ -104,6 +112,11 @@ test("Given Notification Center page When user filters on severity Then executes
   });
 
   expect(apiHelper.pendingRequests).toEqual([request("?limit=20")]);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Notification Center page When user filters on read Then executes correct request", async () => {
@@ -149,6 +162,11 @@ test("Given Notification Center page When user filters on read Then executes cor
     );
   });
   expect(apiHelper.pendingRequests).toEqual([request("?limit=20")]);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Notification Center page When user filters on message Then executes correct request", async () => {
@@ -185,6 +203,11 @@ test("Given Notification Center page When user filters on message Then executes
     await userEvent.click(screen.getByRole("button", { name: "close abc" }));
   });
   expect(apiHelper.pendingRequests).toEqual([request("?limit=20")]);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Notification Center page When user filters on title Then executes correct request", async () => {
@@ -220,6 +243,11 @@ test("Given Notification Center page When user filters on title Then executes co
     await userEvent.click(screen.getByRole("button", { name: "close abc" }));
   });
   expect(apiHelper.pendingRequests).toEqual([request("?limit=20")]);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Notification Center page When user clicks next page Then fetches next page", async () => {
@@ -256,4 +284,9 @@ test("Given Notification Center page When user clicks next page Then fetches nex
       name: "NotificationItem",
     }),
   ).toHaveLength(2);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Notification/UI/Drawer/Drawer.test.tsx b/src/Slices/Notification/UI/Drawer/Drawer.test.tsx
index 2fd66678b..e013a8f98 100644
--- a/src/Slices/Notification/UI/Drawer/Drawer.test.tsx
+++ b/src/Slices/Notification/UI/Drawer/Drawer.test.tsx
@@ -5,6 +5,7 @@ import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
 import { createMemoryHistory } from "history";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, Maybe } from "@/Core";
 import {
   CommandManagerResolverImpl,
@@ -21,6 +22,15 @@ import * as Mock from "@S/Notification/Core/Mock";
 import { Badge } from "@S/Notification/UI/Badge";
 import { Drawer } from "./Drawer";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const apiHelper = new DeferredApiHelper();
   const history = createMemoryHistory();
@@ -102,6 +112,11 @@ test("Given Drawer Then a list of notifications are shown", async () => {
   expect(
     screen.getAllByRole("listitem", { name: "NotificationItem" }),
   ).toHaveLength(4);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Drawer When clicking on 'Clear all' Then all notifications are cleared", async () => {
@@ -145,6 +160,11 @@ test("Given Drawer When clicking on 'Clear all' Then all notifications are clear
   expect(
     screen.queryByRole("listitem", { name: "NotificationItem" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Drawer When user clicks on 'Read all' Then all notifications are read", async () => {
@@ -195,6 +215,11 @@ test("Given Drawer When user clicks on 'Read all' Then all notifications are rea
   expect(
     screen.getAllByRole("listitem", { name: "NotificationItem" }),
   ).toHaveLength(4);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Drawer When user clicks a notification Then it becomes read", async () => {
@@ -229,6 +254,11 @@ test("Given Drawer When user clicks a notification Then it becomes read", async
   expect(
     screen.getAllByRole("listitem", { name: "NotificationItem" }),
   ).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Drawer When user clicks a notification with an uri then go to the uri", async () => {
@@ -238,6 +268,11 @@ test("Given Drawer When user clicks a notification with an uri then go to the ur
     await apiHelper.resolve(Either.right(Mock.response));
   });
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   const items = screen.getAllByRole("listitem", { name: "NotificationItem" });
   await act(async () => {
     await userEvent.click(items[0]);
@@ -256,6 +291,12 @@ test("Given Drawer When user clicks a notification without an uri then nothing h
   });
 
   const items = screen.getAllByRole("listitem", { name: "NotificationItem" });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(items[3]);
   });
@@ -273,6 +314,12 @@ test("Given Drawer When user clicks a notification toggle with an uri then do no
   const items = screen.getAllByRole("button", {
     name: "NotificationListActions",
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(items[0]);
   });
@@ -322,6 +369,11 @@ test("Given Drawer When user clicks on 'unread' for 1 notification Then it becom
   expect(
     screen.getAllByRole("listitem", { name: "NotificationItem" }),
   ).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given Drawer When user clicks on 'Clear' for 1 notification Then it is cleared", async () => {
@@ -365,4 +417,9 @@ test("Given Drawer When user clicks on 'Clear' for 1 notification Then it is cle
   expect(
     screen.getAllByRole("listitem", { name: "NotificationItem" }),
   ).toHaveLength(2);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/OrderDetails/UI/OrderDetailsTable.tsx b/src/Slices/OrderDetails/UI/OrderDetailsTable.tsx
index 355569521..017fe8db9 100644
--- a/src/Slices/OrderDetails/UI/OrderDetailsTable.tsx
+++ b/src/Slices/OrderDetails/UI/OrderDetailsTable.tsx
@@ -41,7 +41,7 @@ export const OrderDetailsTable: React.FC<Props> = ({
     <Table {...props} variant={TableVariant.compact}>
       <Thead>
         <Tr>
-          <Th style={{ width: "15px" }}></Th>
+          <Th style={{ width: "15px" }} aria-hidden />
           {heads}
         </Tr>
       </Thead>
diff --git a/src/Slices/OrderDetails/UI/OrderStateDetails.tsx b/src/Slices/OrderDetails/UI/OrderStateDetails.tsx
index 8a7ede1a6..d4859f27e 100644
--- a/src/Slices/OrderDetails/UI/OrderStateDetails.tsx
+++ b/src/Slices/OrderDetails/UI/OrderStateDetails.tsx
@@ -66,17 +66,21 @@ export const OrderStateDetails: React.FC<Props> = ({ state }) => {
             </DescriptionListGroup>
           )}
           {state.validation_compile_id && (
-            <Link
-              target="_blank"
-              to={{
-                pathname: routeManager.getUrl("CompileDetails", {
-                  id: state.validation_compile_id,
-                }),
-                search: location.search,
-              }}
-            >
-              {words("orders.row.compilerReport")}
-            </Link>
+            <DescriptionListGroup>
+              <DescriptionListDescription>
+                <Link
+                  target="_blank"
+                  to={{
+                    pathname: routeManager.getUrl("CompileDetails", {
+                      id: state.validation_compile_id,
+                    }),
+                    search: location.search,
+                  }}
+                >
+                  {words("orders.row.compilerReport")}
+                </Link>
+              </DescriptionListDescription>
+            </DescriptionListGroup>
           )}
         </PaddedDescriptionList>
       </CardBody>
diff --git a/src/Slices/OrderDetails/UI/Page.test.tsx b/src/Slices/OrderDetails/UI/Page.test.tsx
index 977cc9ea7..8c12d5d83 100644
--- a/src/Slices/OrderDetails/UI/Page.test.tsx
+++ b/src/Slices/OrderDetails/UI/Page.test.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import { baseSetup } from "@/Test/Utils/base-setup";
 import {
@@ -11,6 +12,8 @@ import {
 } from "../Data/Mock";
 import { OrderDetailsPage } from ".";
 
+expect.extend(toHaveNoViolations);
+
 const DetailsPage = <OrderDetailsPage />;
 
 test("OrderDetailsView shows failed view", async () => {
@@ -18,7 +21,7 @@ test("OrderDetailsView shows failed view", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrderDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "OrderDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -28,8 +31,13 @@ test("OrderDetailsView shows failed view", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "OrderDetailsView-Failed" }),
+    await screen.findByRole("region", { name: "OrderDetailsView-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("OrderDetailsView shows view for a failed order", async () => {
@@ -37,7 +45,7 @@ test("OrderDetailsView shows view for a failed order", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrderDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "OrderDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -64,6 +72,11 @@ test("OrderDetailsView shows view for a failed order", async () => {
     name: "ServiceOrderDetailsRow",
   });
   expect(serviceOrderItemRows).toHaveLength(1);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("OrderDetailsView shows view for a partial order", async () => {
@@ -71,7 +84,7 @@ test("OrderDetailsView shows view for a partial order", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrderDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "OrderDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -112,6 +125,11 @@ test("OrderDetailsView shows view for a partial order", async () => {
 
   const rowDependencies = await screen.findByLabelText("Expanded-Dependencies");
   expect(rowDependencies).not.toHaveTextContent(/Empty/);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("OrderDetailsView shows view for a in progress order", async () => {
@@ -119,7 +137,7 @@ test("OrderDetailsView shows view for a in progress order", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrderDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "OrderDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -158,6 +176,11 @@ test("OrderDetailsView shows view for a in progress order", async () => {
 
   const rowDependencies = await screen.findByLabelText("Expanded-Dependencies");
   expect(rowDependencies).toHaveTextContent(/Empty/);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("OrderDetailsView shows view for completed order", async () => {
@@ -165,7 +188,7 @@ test("OrderDetailsView shows view for completed order", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrderDetailsView-Loading" }),
+    await screen.findByRole("region", { name: "OrderDetailsView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -205,4 +228,9 @@ test("OrderDetailsView shows view for completed order", async () => {
 
   const rowDependencies = await screen.findByLabelText("Expanded-Dependencies");
   expect(rowDependencies).toHaveTextContent(/Empty/);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Orders/UI/OrdersTable.tsx b/src/Slices/Orders/UI/OrdersTable.tsx
index 0fd02a1e1..d53f0e502 100644
--- a/src/Slices/Orders/UI/OrdersTable.tsx
+++ b/src/Slices/Orders/UI/OrdersTable.tsx
@@ -73,9 +73,9 @@ export const OrdersTable: React.FC<Props> = ({
   return (
     <Table {...props} variant={TableVariant.compact}>
       <Thead>
-        <Tr>
+        <Tr aria-hidden>
           {heads}
-          <Th></Th>
+          <Th />
         </Tr>
       </Thead>
       {rows.map((row) => (
diff --git a/src/Slices/Orders/UI/Page.test.tsx b/src/Slices/Orders/UI/Page.test.tsx
index ab019a886..197b5d42d 100644
--- a/src/Slices/Orders/UI/Page.test.tsx
+++ b/src/Slices/Orders/UI/Page.test.tsx
@@ -1,10 +1,13 @@
 import React from "react";
 import { act, render, screen } from "@testing-library/react";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import { baseSetup } from "@/Test/Utils/base-setup";
 import { emptyResponse, orderResponse } from "../Data/Mock";
 import { OrdersPage } from ".";
 
+expect.extend(toHaveNoViolations);
+
 const OrderPage = <OrdersPage />;
 
 test("OrdersView shows empty table", async () => {
@@ -12,7 +15,7 @@ test("OrdersView shows empty table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrdersView-Loading" }),
+    await screen.findByRole("region", { name: "OrdersView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -29,6 +32,11 @@ test("OrdersView shows empty table", async () => {
   expect(
     await screen.findByRole("generic", { name: "OrdersView-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("OrdersView shows failed table", async () => {
@@ -36,7 +44,7 @@ test("OrdersView shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrdersView-Loading" }),
+    await screen.findByRole("region", { name: "OrdersView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -51,8 +59,13 @@ test("OrdersView shows failed table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "OrdersView-Failed" }),
+    await screen.findByRole("region", { name: "OrdersView-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("OrdersView shows success table", async () => {
@@ -60,7 +73,7 @@ test("OrdersView shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrdersView-Loading" }),
+    await screen.findByRole("region", { name: "OrdersView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -83,6 +96,11 @@ test("OrdersView shows success table", async () => {
   });
 
   expect(rows).toHaveLength(4);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("OrdersView shows updated table", async () => {
@@ -90,7 +108,7 @@ test("OrdersView shows updated table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "OrdersView-Loading" }),
+    await screen.findByRole("region", { name: "OrdersView-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
@@ -117,4 +135,9 @@ test("OrdersView shows updated table", async () => {
   expect(
     await screen.findByRole("generic", { name: "OrdersView-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Parameters/UI/FilterWidget.tsx b/src/Slices/Parameters/UI/FilterWidget.tsx
index 33b8da80f..3e8452ac6 100644
--- a/src/Slices/Parameters/UI/FilterWidget.tsx
+++ b/src/Slices/Parameters/UI/FilterWidget.tsx
@@ -27,7 +27,7 @@ export const FilterWidget: React.FC<Props> = ({ filter, setFilter }) => {
       updated: timestampFilters.length > 0 ? timestampFilters : undefined,
     });
   return (
-    <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+    <ToolbarGroup variant="filter-group" aria-label="FilterBar" role="toolbar">
       <FilterPicker
         setFilterKind={setFilterKind}
         filterKind={filterKind}
diff --git a/src/Slices/Parameters/UI/Page.test.tsx b/src/Slices/Parameters/UI/Page.test.tsx
index 76f55edd8..9bdd266ff 100644
--- a/src/Slices/Parameters/UI/Page.test.tsx
+++ b/src/Slices/Parameters/UI/Page.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   QueryResolverImpl,
@@ -27,6 +28,8 @@ import {
 import * as Parameters from "@S/Parameters/Data/Mock";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -108,6 +111,11 @@ test("When using the name filter then only the matching parameters should be fet
     name: "Parameters Table Row",
   });
   expect(rowsAfter).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the source filter then only the matching parameters should be fetched and shown", async () => {
@@ -125,7 +133,7 @@ test("When using the source filter then only the matching parameters should be f
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -165,6 +173,11 @@ test("When using the source filter then only the matching parameters should be f
     name: "Parameters Table Row",
   });
   expect(rowsAfter).toHaveLength(3);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("When using the Updated filter then the parameters within the range selected range should be fetched and shown", async () => {
@@ -183,7 +196,7 @@ test("When using the Updated filter then the parameters within the range selecte
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
@@ -246,4 +259,9 @@ test("When using the Updated filter then the parameters within the range selecte
   expect(
     await screen.findByText("to | 2022/02/01 00:00:00", { exact: false }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Resource/UI/ResourcesPage/Components/ActionButton.tsx b/src/Slices/Resource/UI/ResourcesPage/Components/ActionButton.tsx
index cab83eb9a..e779852c8 100644
--- a/src/Slices/Resource/UI/ResourcesPage/Components/ActionButton.tsx
+++ b/src/Slices/Resource/UI/ResourcesPage/Components/ActionButton.tsx
@@ -40,7 +40,7 @@ export const ResourcePageActionButton: React.FC<Props> = ({
 
   return isHalted ? (
     <ActionDisabledTooltip
-      ariaLabel={textContent}
+      testingId={textContent}
       tooltipContent={words("environment.halt.tooltip")}
       isDisabled
     >
diff --git a/src/Slices/Resource/UI/ResourcesPage/Components/RequiresTableWithData.tsx b/src/Slices/Resource/UI/ResourcesPage/Components/RequiresTableWithData.tsx
index 6e6da05af..5a0bd75fd 100644
--- a/src/Slices/Resource/UI/ResourcesPage/Components/RequiresTableWithData.tsx
+++ b/src/Slices/Resource/UI/ResourcesPage/Components/RequiresTableWithData.tsx
@@ -34,7 +34,7 @@ export const RequiresTableWithData: React.FC<Props> = ({ id, deps }) => {
       failed: (error) => (
         <ErrorView
           message={words("error.general")(error)}
-          aria-label="ResourceRequires-Failed"
+          ariaLabel="ResourceRequires-Failed"
         />
       ),
       success: (resourceDetails) =>
diff --git a/src/Slices/Resource/UI/ResourcesPage/Page.test.tsx b/src/Slices/Resource/UI/ResourcesPage/Page.test.tsx
index b9da84176..40d450ea9 100644
--- a/src/Slices/Resource/UI/ResourcesPage/Page.test.tsx
+++ b/src/Slices/Resource/UI/ResourcesPage/Page.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, RemoteData } from "@/Core";
 import {
   QueryResolverImpl,
@@ -25,6 +26,16 @@ import { DependencyProvider } from "@/UI/Dependency";
 import { ResourceDetails } from "@S/ResourceDetails/Data/Mock";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    // In this case, the tooltips are part of the higher hiararchy
+    region: { enabled: false },
+  },
+});
+
 function setup(entries?: string[]) {
   const apiHelper = new DeferredApiHelper();
   const authHelper = new KeycloakAuthHelper();
@@ -70,7 +81,7 @@ test("ResourcesView shows empty table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourcesView-Loading" }),
+    await screen.findByRole("region", { name: "ResourcesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -92,6 +103,11 @@ test("ResourcesView shows empty table", async () => {
   expect(
     await screen.findByRole("generic", { name: "ResourcesView-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ResourcesView shows failed table", async () => {
@@ -99,7 +115,7 @@ test("ResourcesView shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourcesView-Loading" }),
+    await screen.findByRole("region", { name: "ResourcesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -107,8 +123,13 @@ test("ResourcesView shows failed table", async () => {
   });
 
   expect(
-    await screen.findByRole("generic", { name: "ResourcesView-Failed" }),
+    await screen.findByRole("region", { name: "ResourcesView-Failed" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ResourcesView shows success table", async () => {
@@ -116,7 +137,7 @@ test("ResourcesView shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourcesView-Loading" }),
+    await screen.findByRole("region", { name: "ResourcesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -126,6 +147,11 @@ test("ResourcesView shows success table", async () => {
   expect(
     await screen.findByRole("grid", { name: "ResourcesView-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ResourcesView WHEN user clicks on requires toggle THEN list of requires is shown", async () => {
@@ -154,6 +180,11 @@ test("GIVEN ResourcesView WHEN user clicks on requires toggle THEN list of requi
   expect(
     await screen.findByRole("grid", { name: "ResourceRequires-Success" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ResourcesView shows next page of resources", async () => {
@@ -204,6 +235,11 @@ test("ResourcesView shows next page of resources", async () => {
       name: Resource.response.data[3].id_details.resource_id_value,
     }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ResourcesView shows sorting buttons for sortable columns", async () => {
@@ -227,6 +263,11 @@ test("ResourcesView shows sorting buttons for sortable columns", async () => {
       name: words("resources.column.deployState"),
     }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ResourcesView sets sorting parameters correctly on click", async () => {
@@ -245,7 +286,13 @@ test("ResourcesView sets sorting parameters correctly on click", async () => {
   });
 
   expect(apiHelper.pendingRequests[0].url).toContain("&sort=agent.asc");
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
+
 it.each`
   filterType  | filterValue | placeholderText                                 | filterUrlName
   ${"search"} | ${"agent2"} | ${words("resources.filters.agent.placeholder")} | ${"agent"}
@@ -288,8 +335,14 @@ it.each`
     expect(apiHelper.pendingRequests[0].url).toContain(
       `filter.${filterUrlName}=${filterValue}`,
     );
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   },
 );
+
 it.each`
   filterValueOne | placeholderTextOne                              | filterUrlNameOne       | filterValueTwo | placeholderTextTwo                              | filterUrlNameTwo
   ${"agent2"}    | ${words("resources.filters.agent.placeholder")} | ${"agent"}             | ${"file3"}     | ${words("resources.filters.value.placeholder")} | ${"resource_id_value"}
@@ -346,8 +399,14 @@ it.each`
     expect(apiHelper.pendingRequests[0].url).toContain(
       `filter.${filterUrlNameTwo}=${filterValueTwo}`,
     );
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   },
 );
+
 test("when using the all filters then the resources with that filter values should be fetched and shown", async () => {
   const filterValueOne = "agent";
   const filterUrlNameOne = "agent";
@@ -411,6 +470,11 @@ test("when using the all filters then the resources with that filter values shou
   expect(apiHelper.pendingRequests[0].url).toContain(
     `filter.${filterUrlNameThree}=${filterValueThree}`,
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test.each`
@@ -472,6 +536,11 @@ test.each`
     });
 
     expect(rowsAfter).toHaveLength(2);
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   },
 );
 
@@ -523,6 +592,11 @@ test("When clicking the clear and reset filters then the state filter is updated
   expect(apiHelper.pendingRequests[0].url).toEqual(
     `/api/v2/resource?deploy_summary=True&limit=20&filter.status=%21orphaned&sort=resource_type.asc`,
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ResourcesView shows deploy state bar", async () => {
@@ -542,6 +616,11 @@ test("ResourcesView shows deploy state bar", async () => {
       name: words("resources.deploySummary.title"),
     }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ResourcesView WHEN data is loading for next page THEN shows toolbar", async () => {
@@ -549,7 +628,7 @@ test("GIVEN ResourcesView WHEN data is loading for next page THEN shows toolbar"
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourcesView-Loading" }),
+    await screen.findByRole("region", { name: "ResourcesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -591,7 +670,7 @@ test("GIVEN ResourcesView WHEN data is loading for next page THEN shows toolbar"
   });
 
   expect(
-    await screen.findByRole("generic", { name: "ResourcesView-Loading" }),
+    await screen.findByRole("region", { name: "ResourcesView-Loading" }),
   ).toBeInTheDocument();
 
   expect(
@@ -610,8 +689,11 @@ test("GIVEN ResourcesView WHEN data is loading for next page THEN shows toolbar"
     }),
   ).toBeVisible();
   expect(
-    screen.getByRole("generic", { name: "PaginationWidget" }),
+    screen.getByRole("navigation", { name: "top-Pagination" }),
   ).toBeVisible();
+  expect(
+    screen.queryByRole("navigation", { name: "bottom-Pagination" }),
+  ).not.toBeInTheDocument();
 
   await act(async () => {
     await apiHelper.resolve(
@@ -636,6 +718,11 @@ test("GIVEN ResourcesView WHEN data is loading for next page THEN shows toolbar"
       name: "LegendItem-available",
     }),
   ).toHaveAttribute("data-value", "2");
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ResourcesView WHEN data is auto-updated THEN shows updated toolbar", async () => {
@@ -643,7 +730,7 @@ test("GIVEN ResourcesView WHEN data is auto-updated THEN shows updated toolbar",
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourcesView-Loading" }),
+    await screen.findByRole("region", { name: "ResourcesView-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
@@ -689,8 +776,11 @@ test("GIVEN ResourcesView WHEN data is auto-updated THEN shows updated toolbar",
     }),
   ).toBeVisible();
   expect(
-    screen.getAllByRole("generic", { name: "PaginationWidget" }),
-  ).toHaveLength(2);
+    screen.getByRole("navigation", { name: "top-Pagination" }),
+  ).toBeVisible();
+  expect(
+    screen.getByRole("navigation", { name: "bottom-Pagination" }),
+  ).toBeInTheDocument();
 
   await act(async () => {
     await apiHelper.resolve(
@@ -715,6 +805,11 @@ test("GIVEN ResourcesView WHEN data is auto-updated THEN shows updated toolbar",
       name: "LegendItem-available",
     }),
   ).toHaveAttribute("data-value", "2");
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ResourcesView shows deploy state bar with available status without processing_events status", async () => {
@@ -741,6 +836,11 @@ test("ResourcesView shows deploy state bar with available status without process
   expect(
     screen.getByRole("cell", { name: "Status-processing_events" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the ResourcesView When clicking on deploy, then the approriate backend request is fired", async () => {
@@ -781,6 +881,11 @@ test("Given the ResourcesView When clicking on deploy, then the approriate backe
       },
     },
   ]);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the ResourcesView When clicking on repair, then the approriate backend request is fired", async () => {
@@ -819,6 +924,11 @@ test("Given the ResourcesView When clicking on repair, then the approriate backe
       },
     },
   ]);
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given the ResourcesView When environment is halted, then deploy and repair buttons are disabled", async () => {
@@ -850,4 +960,9 @@ test("Given the ResourcesView When environment is halted, then deploy and repair
       name: words("resources.deploySummary.deploy"),
     }),
   ).toBeDisabled();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Resource/UI/ResourcesPage/Page.tsx b/src/Slices/Resource/UI/ResourcesPage/Page.tsx
index c3e0e1825..e58227cf6 100644
--- a/src/Slices/Resource/UI/ResourcesPage/Page.tsx
+++ b/src/Slices/Resource/UI/ResourcesPage/Page.tsx
@@ -111,6 +111,7 @@ export const Page: React.FC = () => {
                     pageSize={pageSize}
                     setPageSize={setPageSize}
                     setCurrentPage={setCurrentPage}
+                    variant="bottom"
                   />
                 </FlexItem>
               </StyledFlex>
diff --git a/src/Slices/Resource/UI/ResourcesPage/ResourcesTable.tsx b/src/Slices/Resource/UI/ResourcesPage/ResourcesTable.tsx
index 045169037..8df4bbd71 100644
--- a/src/Slices/Resource/UI/ResourcesPage/ResourcesTable.tsx
+++ b/src/Slices/Resource/UI/ResourcesPage/ResourcesTable.tsx
@@ -66,7 +66,7 @@ export const ResourcesTable: React.FC<Props> = ({
     <Table {...props} variant={TableVariant.compact}>
       <Thead>
         <Tr>
-          <Th></Th>
+          <Th aria-hidden />
           {heads}
         </Tr>
       </Thead>
diff --git a/src/Slices/ResourceDetails/UI/Tabs/FactsTab/FactsTab.test.tsx b/src/Slices/ResourceDetails/UI/Tabs/FactsTab/FactsTab.test.tsx
index 3caed5928..7bb600dd2 100644
--- a/src/Slices/ResourceDetails/UI/Tabs/FactsTab/FactsTab.test.tsx
+++ b/src/Slices/ResourceDetails/UI/Tabs/FactsTab/FactsTab.test.tsx
@@ -57,13 +57,13 @@ test("Given the FactsTab When the backend response is an error Then shows failed
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Facts-Loading" }),
+    await screen.findByRole("region", { name: "Facts-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "Facts-Failed" }),
+    await screen.findByRole("region", { name: "Facts-Failed" }),
   ).toBeInTheDocument();
 });
 
@@ -72,7 +72,7 @@ test("Given the FactsTab When the backend response is successful Then shows succ
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "Facts-Loading" }),
+    await screen.findByRole("region", { name: "Facts-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
diff --git a/src/Slices/ResourceDetails/UI/Tabs/HistoryTab/ResourceHistoryView.test.tsx b/src/Slices/ResourceDetails/UI/Tabs/HistoryTab/ResourceHistoryView.test.tsx
index 090d808f7..0f570bcf1 100644
--- a/src/Slices/ResourceDetails/UI/Tabs/HistoryTab/ResourceHistoryView.test.tsx
+++ b/src/Slices/ResourceDetails/UI/Tabs/HistoryTab/ResourceHistoryView.test.tsx
@@ -67,7 +67,7 @@ test("ResourceHistoryView shows empty table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourceHistory-Loading" }),
+    await screen.findByRole("region", { name: "ResourceHistory-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -88,13 +88,13 @@ test("ResourceHistoryView shows failed table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourceHistory-Loading" }),
+    await screen.findByRole("region", { name: "ResourceHistory-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.left("error"));
 
   expect(
-    await screen.findByRole("generic", { name: "ResourceHistory-Failed" }),
+    await screen.findByRole("region", { name: "ResourceHistory-Failed" }),
   ).toBeInTheDocument();
 });
 
@@ -103,7 +103,7 @@ test("ResourceHistory shows success table", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ResourceHistory-Loading" }),
+    await screen.findByRole("region", { name: "ResourceHistory-Loading" }),
   ).toBeInTheDocument();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
diff --git a/src/Slices/ResourceDetails/UI/Tabs/LogTab/View.spec.tsx b/src/Slices/ResourceDetails/UI/Tabs/LogTab/View.spec.tsx
index 629cea02c..4fa57bae3 100644
--- a/src/Slices/ResourceDetails/UI/Tabs/LogTab/View.spec.tsx
+++ b/src/Slices/ResourceDetails/UI/Tabs/LogTab/View.spec.tsx
@@ -55,7 +55,7 @@ test("GIVEN ResourceLogsView THEN shows resource logs", async () => {
   render(component);
 
   expect(
-    screen.getByRole("generic", { name: "ResourceLogs-Loading" }),
+    screen.getByRole("region", { name: "ResourceLogs-Loading" }),
   ).toBeVisible();
 
   expect(apiHelper.pendingRequests).toHaveLength(1);
diff --git a/src/Slices/ResourceDetails/UI/View.test.tsx b/src/Slices/ResourceDetails/UI/View.test.tsx
index 1166ee83e..1ff537d6a 100644
--- a/src/Slices/ResourceDetails/UI/View.test.tsx
+++ b/src/Slices/ResourceDetails/UI/View.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import { getStoreInstance, QueryResolverImpl } from "@/Data";
 import {
@@ -21,6 +22,8 @@ import {
 import { ResourceDetails } from "@S/ResourceDetails/Data/Mock";
 import { View } from "./View";
 
+expect.extend(toHaveNoViolations);
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -70,6 +73,11 @@ test("GIVEN The Resource details view THEN details data is fetched immediately",
   expect(
     await screen.findByText(ResourceDetails.a.attributes.path),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN The Resource details view WHEN the user clicks on the requires tab THEN the requires table is shown", async () => {
@@ -95,6 +103,11 @@ test("GIVEN The Resource details view WHEN the user clicks on the requires tab T
   expect(
     await screen.findByRole("grid", { name: "ResourceRequires-Success" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN The Resource details view THEN shows status label", async () => {
@@ -107,4 +120,9 @@ test("GIVEN The Resource details view THEN shows status label", async () => {
   expect(
     screen.getByRole("generic", { name: "Status-deployed" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/ResourceDiscovery/UI/DiscoveredResourcesTable.tsx b/src/Slices/ResourceDiscovery/UI/DiscoveredResourcesTable.tsx
index d13df899f..e4aa6c22d 100644
--- a/src/Slices/ResourceDiscovery/UI/DiscoveredResourcesTable.tsx
+++ b/src/Slices/ResourceDiscovery/UI/DiscoveredResourcesTable.tsx
@@ -62,7 +62,7 @@ export const DiscoveredResourcesTable: React.FC<Props> = ({
     <Table {...props} variant={TableVariant.compact}>
       <Thead>
         <Tr>
-          <Th></Th>
+          <Th aria-hidden />
           {heads}
         </Tr>
       </Thead>
diff --git a/src/Slices/ResourceDiscovery/UI/Page.test.tsx b/src/Slices/ResourceDiscovery/UI/Page.test.tsx
index efa3ccd06..de555df39 100644
--- a/src/Slices/ResourceDiscovery/UI/Page.test.tsx
+++ b/src/Slices/ResourceDiscovery/UI/Page.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   QueryResolverImpl,
@@ -15,6 +16,8 @@ import { DependencyProvider } from "@/UI/Dependency";
 import * as DiscoveredResources from "../Data/Mock";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
 function setup() {
   const apiHelper = new DeferredApiHelper();
   const scheduler = new StaticScheduler();
@@ -63,6 +66,11 @@ test("GIVEN Discovered Resources page THEN shows table", async () => {
       name: "vcenter::VirtualMachine[lab,name=acisim]",
     }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN Discovered Resources page THEN sets sorting parameters correctly on click", async () => {
@@ -79,4 +87,9 @@ test("GIVEN Discovered Resources page THEN sets sorting parameters correctly on
   expect(apiHelper.pendingRequests[0].url).toContain(
     "&sort=discovered_resource_id.desc",
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/ServiceCatalog/UI/CatalogDataList.test.tsx b/src/Slices/ServiceCatalog/UI/CatalogDataList.test.tsx
index d12e4d6b2..b7bb03c89 100644
--- a/src/Slices/ServiceCatalog/UI/CatalogDataList.test.tsx
+++ b/src/Slices/ServiceCatalog/UI/CatalogDataList.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { MemoryRouter } from "react-router";
 import { act, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { ServiceModel } from "@/Core";
 import {
   BaseApiHelper,
@@ -17,6 +18,15 @@ import { words } from "@/UI";
 import { DependencyProvider } from "@/UI/Dependency";
 import { CatalogDataList } from "./CatalogDataList";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 const Component = (services: ServiceModel[]) => {
   const commandResolver = new CommandResolverImpl(
     new DynamicCommandManagerResolverImpl([
@@ -32,23 +42,33 @@ const Component = (services: ServiceModel[]) => {
   );
 };
 
-test("GIVEN CatalogDataList WHEN no services ('[]') THEN no services are shown", () => {
+test("GIVEN CatalogDataList WHEN no services ('[]') THEN no services are shown", async () => {
   render(Component([]));
 
   const list = screen.getByRole("list", { name: "List of service entities" });
   expect(within(list).queryByRole("listitem")).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
-test("GIVEN CatalogDataList WHEN 1 service THEN 1 service is shown", () => {
+test("GIVEN CatalogDataList WHEN 1 service THEN 1 service is shown", async () => {
   render(Component([Service.a]));
 
   const list = screen.getByRole("list", { name: "List of service entities" });
   expect(
     within(list).getByRole("listitem", { name: Service.a.name }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
-test("GIVEN CatalogDataList WHEN 2 services THEN 2 services are shown", () => {
+test("GIVEN CatalogDataList WHEN 2 services THEN 2 services are shown", async () => {
   render(Component([Service.a, Service.b]));
 
   const list = screen.getByRole("list", { name: "List of service entities" });
@@ -58,9 +78,14 @@ test("GIVEN CatalogDataList WHEN 2 services THEN 2 services are shown", () => {
   expect(
     within(list).getByRole("listitem", { name: Service.b.name }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
-test("GIVEN CatalogDataList WHEN service THEN service inventory has correct link", () => {
+test("GIVEN CatalogDataList WHEN service THEN service inventory has correct link", async () => {
   render(Component([Service.a]));
 
   const list = screen.getByRole("list", { name: "List of service entities" });
@@ -74,6 +99,11 @@ test("GIVEN CatalogDataList WHEN service THEN service inventory has correct link
     "href",
     `/lsm/catalog/${Service.a.name}/inventory`,
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN CatalogDataList WHEN service THEN service details has correct link", async () => {
@@ -97,9 +127,14 @@ test("GIVEN CatalogDataList WHEN service THEN service details has correct link",
     "href",
     `/lsm/catalog/${Service.a.name}/details`,
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
-test("GIVEN CatalogDataList WHEN description available THEN should show description", () => {
+test("GIVEN CatalogDataList WHEN description available THEN should show description", async () => {
   render(Component([Service.a]));
 
   const list = screen.getByRole("list", { name: "List of service entities" });
@@ -108,4 +143,9 @@ test("GIVEN CatalogDataList WHEN description available THEN should show descript
     Service.a.description as string,
   );
   expect(description).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/ServiceCatalog/UI/Page.test.tsx b/src/Slices/ServiceCatalog/UI/Page.test.tsx
index 27b182917..73d64d123 100644
--- a/src/Slices/ServiceCatalog/UI/Page.test.tsx
+++ b/src/Slices/ServiceCatalog/UI/Page.test.tsx
@@ -3,6 +3,7 @@ import { Link, MemoryRouter, useLocation } from "react-router-dom";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either, RemoteData } from "@/Core";
 import {
   QueryResolverImpl,
@@ -25,6 +26,8 @@ import { words } from "@/UI";
 import { DependencyProvider, EnvironmentHandlerImpl } from "@/UI/Dependency";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
 const [env1, env2] = Environment.filterable.map((env) => env.id);
 
 function setup() {
@@ -93,7 +96,7 @@ test("ServiceCatalog shows updated services", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ServiceCatalog-Loading" }),
+    await screen.findByRole("region", { name: "ServiceCatalog-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: [] }));
@@ -110,6 +113,11 @@ test("ServiceCatalog shows updated services", async () => {
   expect(
     await screen.findByRole("generic", { name: "ServiceCatalog-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ServiceCatalog shows updated empty", async () => {
@@ -117,7 +125,7 @@ test("ServiceCatalog shows updated empty", async () => {
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ServiceCatalog-Loading" }),
+    await screen.findByRole("region", { name: "ServiceCatalog-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(Either.right({ data: [Service.a] }));
@@ -133,6 +141,11 @@ test("ServiceCatalog shows updated empty", async () => {
   expect(
     await screen.findByRole("generic", { name: "ServiceCatalog-Empty" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ServiceCatalog WHEN new environment selected THEN new query is triggered", async () => {
@@ -162,6 +175,11 @@ test("GIVEN ServiceCatalog WHEN new environment selected THEN new query is trigg
     url: "/lsm/v1/service_catalog?instance_summary=True",
     environment: env2,
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ServiceCatalog WHEN service is deleted THEN command is triggered", async () => {
@@ -191,4 +209,9 @@ test("GIVEN ServiceCatalog WHEN service is deleted THEN command is triggered", a
     method: "DELETE",
     url: "/lsm/v1/service_catalog/" + Service.a.name,
   });
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/ServiceDetails/UI/Spec/CallbacksTab.spec.tsx b/src/Slices/ServiceDetails/UI/Spec/CallbacksTab.spec.tsx
index cd3c189a4..c380e8ce5 100644
--- a/src/Slices/ServiceDetails/UI/Spec/CallbacksTab.spec.tsx
+++ b/src/Slices/ServiceDetails/UI/Spec/CallbacksTab.spec.tsx
@@ -125,7 +125,7 @@ test("GIVEN ServiceDetails WHEN click on callbacks tab THEN shows callbacks tab"
   });
 
   expect(
-    screen.getByRole("generic", { name: "Callbacks-Loading" }),
+    screen.getByRole("region", { name: "Callbacks-Loading" }),
   ).toBeVisible();
 
   await act(async () => {
diff --git a/src/Slices/ServiceDetails/UI/Tabs/AttributeTable.test.tsx b/src/Slices/ServiceDetails/UI/Tabs/AttributeTable.test.tsx
index 8ef702d37..3dc234fd3 100644
--- a/src/Slices/ServiceDetails/UI/Tabs/AttributeTable.test.tsx
+++ b/src/Slices/ServiceDetails/UI/Tabs/AttributeTable.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter, useLocation } from "react-router-dom";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { AttributeModel, RemoteData, ServiceModel } from "@/Core";
 import {
   CommandResolverImpl,
@@ -20,6 +21,15 @@ import { multiNestedEditable } from "@/Test/Data/Service/EmbeddedEntity";
 import { DependencyProvider, EnvironmentHandlerImpl } from "@/UI";
 import { AttributeTable } from "./AttributeTable";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 const attribute1: AttributeModel = {
   name: "order_id",
   type: "int",
@@ -88,7 +98,7 @@ function setup(service: ServiceModel) {
   return component;
 }
 
-test("GIVEN AttributeTable WHEN passed no attributes THEN the empty container is shown", () => {
+test("GIVEN AttributeTable WHEN passed no attributes THEN the empty container is shown", async () => {
   const component = setup({
     ...Service.a,
     attributes: [],
@@ -96,6 +106,11 @@ test("GIVEN AttributeTable WHEN passed no attributes THEN the empty container is
   });
   render(component);
   expect(screen.getByText("No attributes found for the service")).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN AttributeTable WHEN passed 1 attribute THEN 1 row is shown", async () => {
@@ -109,6 +124,11 @@ test("GIVEN AttributeTable WHEN passed 1 attribute THEN 1 row is shown", async (
   expect(
     await screen.findByRole("row", { name: "Row-order_id" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN AttributeTable WHEN passed 2 attributes THEN 2 rows are shown", async () => {
@@ -125,6 +145,11 @@ test("GIVEN AttributeTable WHEN passed 2 attributes THEN 2 rows are shown", asyn
   expect(
     await screen.findByRole("row", { name: "Row-service_mtu" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN AttributeTable WHEN passed no attributes but some embedded entities THEN the rows are shown", async () => {
@@ -137,6 +162,11 @@ test("GIVEN AttributeTable WHEN passed no attributes but some embedded entities
   expect(
     await screen.findByRole("row", { name: "Row-circuits" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN AttributeTable WHEN passed 2 attributes THEN 2 rows are shown", async () => {
@@ -153,6 +183,11 @@ test("GIVEN AttributeTable WHEN passed 2 attributes THEN 2 rows are shown", asyn
   expect(
     await screen.findByRole("row", { name: "Row-service_mtu" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN AttributeTable WHEN passed embedded attributes THEN expendable rows are shown and availalbe to expand/collapse one", async () => {
@@ -186,4 +221,9 @@ test("GIVEN AttributeTable WHEN passed embedded attributes THEN expendable rows
     await userEvent.click(toggleButton);
   });
   expect(row).not.toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/ServiceDetails/UI/Tabs/ConfigList.test.tsx b/src/Slices/ServiceDetails/UI/Tabs/ConfigList.test.tsx
index 33f27572f..30ece3e15 100644
--- a/src/Slices/ServiceDetails/UI/Tabs/ConfigList.test.tsx
+++ b/src/Slices/ServiceDetails/UI/Tabs/ConfigList.test.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Config, EnvironmentDetails, RemoteData } from "@/Core";
 import {
   BaseApiHelper,
@@ -18,6 +19,15 @@ import {
 import { DependencyProvider, EnvironmentModifierImpl } from "@/UI/Dependency";
 import { ConfigList } from "./ConfigList";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const baseApiHelper = new BaseApiHelper();
@@ -65,4 +75,9 @@ it("Config Details takes environment halted status in account", async () => {
   expect(
     await screen.findByRole("checkbox", { name: "enabled-True" }),
   ).toBeDisabled();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/ServiceInstanceHistory/UI/HistoryTable.tsx b/src/Slices/ServiceInstanceHistory/UI/HistoryTable.tsx
index ce7e0887e..82dcda1d3 100644
--- a/src/Slices/ServiceInstanceHistory/UI/HistoryTable.tsx
+++ b/src/Slices/ServiceInstanceHistory/UI/HistoryTable.tsx
@@ -40,7 +40,7 @@ export const HistoryTable: React.FC<Props> = ({ service, logs }) => {
       <Table>
         <Thead>
           <Tr>
-            <Th />
+            <Th aria-hidden />
             {columnHeads.map((head) => (
               <Th key={head}>{head}</Th>
             ))}
diff --git a/src/Slices/ServiceInstanceHistory/UI/ServiceInstanceHistory.test.tsx b/src/Slices/ServiceInstanceHistory/UI/ServiceInstanceHistory.test.tsx
index 3724b7ad3..47710b69b 100644
--- a/src/Slices/ServiceInstanceHistory/UI/ServiceInstanceHistory.test.tsx
+++ b/src/Slices/ServiceInstanceHistory/UI/ServiceInstanceHistory.test.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { MemoryRouter, useLocation } from "react-router-dom";
-import { render, screen } from "@testing-library/react";
+import { act, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, RemoteData } from "@/Core";
 import {
   QueryResolverImpl,
@@ -27,6 +28,15 @@ import {
 import * as InstanceLog from "@S/ServiceInstanceHistory/Data/Mock";
 import { ServiceInstanceHistory } from "./ServiceInstanceHistory";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const store = getStoreInstance();
   const apiHelper = new DeferredApiHelper();
@@ -104,6 +114,11 @@ it("ServiceInstanceHistory renders", async () => {
       name: "ServiceInstanceHistory-Empty",
     }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 it("ServiceInstanceHistory shows dates correctly", async () => {
@@ -118,6 +133,11 @@ it("ServiceInstanceHistory shows dates correctly", async () => {
     }),
   );
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   expect(
     await screen.findByRole("generic", {
       name: "ServiceInstanceHistory-Success",
@@ -127,4 +147,4 @@ it("ServiceInstanceHistory shows dates correctly", async () => {
   expect(
     screen.queryByRole("cell", { name: "Invalid date" }),
   ).not.toBeInTheDocument();
-});
+}, 15000);
diff --git a/src/Slices/ServiceInventory/UI/Components/FilterWidget/FilterWidget.tsx b/src/Slices/ServiceInventory/UI/Components/FilterWidget/FilterWidget.tsx
index d36d8f033..04516d3e3 100644
--- a/src/Slices/ServiceInventory/UI/Components/FilterWidget/FilterWidget.tsx
+++ b/src/Slices/ServiceInventory/UI/Components/FilterWidget/FilterWidget.tsx
@@ -55,7 +55,7 @@ export const FilterWidget: React.FC<Props> = ({
   };
 
   return (
-    <ToolbarGroup variant="filter-group" aria-label="FilterBar">
+    <ToolbarGroup variant="filter-group" aria-label="FilterBar" role="toolbar">
       <FilterPicker
         setFilterKind={setFilterKind}
         filterKind={filterKind}
diff --git a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/DeleteAction/DeleteAction.tsx b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/DeleteAction/DeleteAction.tsx
index e15344a52..4e67758ee 100644
--- a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/DeleteAction/DeleteAction.tsx
+++ b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/DeleteAction/DeleteAction.tsx
@@ -56,7 +56,7 @@ export const DeleteAction: React.FC<Props> = ({
       />
       <ActionDisabledTooltip
         isDisabled={isDisabled || isHalted}
-        ariaLabel={words("inventory.deleteInstance.button")}
+        testingId={words("inventory.deleteInstance.button")}
         tooltipContent={
           isHalted
             ? words("environment.halt.tooltip")
diff --git a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/ForceStateAction/ForceStateAction.tsx b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/ForceStateAction/ForceStateAction.tsx
index dc1373032..e8ccbdca9 100644
--- a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/ForceStateAction/ForceStateAction.tsx
+++ b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/ForceStateAction/ForceStateAction.tsx
@@ -11,7 +11,6 @@ import { ToastAlertMessage } from "../../ToastAlertMessage";
 interface Props extends VersionedServiceInstanceIdentifier {
   instance_identity: string;
   availableStates: string[];
-  insetHeight: string;
 }
 /**
  * ForceStateAction is a component that allows the user to force a state on a service instance.
@@ -31,7 +30,6 @@ export const ForceStateAction: React.FC<Props> = ({
   instance_identity,
   version,
   availableStates,
-  insetHeight,
 }) => {
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const [confirmationText, setConfirmationText] = useState<string>("");
@@ -90,7 +88,7 @@ export const ForceStateAction: React.FC<Props> = ({
         />
       )}
       <ActionDisabledTooltip
-        ariaLabel={words("inventory.statustab.forceState")}
+        testingId={words("inventory.statustab.forceState")}
         tooltipContent={
           isHalted
             ? words("environment.halt.tooltip")
@@ -110,7 +108,6 @@ export const ForceStateAction: React.FC<Props> = ({
             <DrilldownMenu
               id="drilldownMenuExpertState"
               aria-label="drilldownMenuExpertState"
-              style={{ insetBlockStart: insetHeight }}
             >
               <MenuItem
                 style={{
diff --git a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/RowActions.tsx b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/RowActions.tsx
index 8679ddb09..3aea3449a 100644
--- a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/RowActions.tsx
+++ b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/RowActions.tsx
@@ -62,24 +62,6 @@ export const RowActions: React.FunctionComponent<InstanceActionsProps> = ({
 
   const composerEnabled =
     featureManager.isComposerEnabled() && composerAvailable;
-  // the height of the drilled down menus differ based on how many options preceeds the drilldown. This is a bug on PF side.
-  // and setting the insetHeight manually is a workaround for that issue.
-  const getInsetHeight = () => {
-    // -100 for each default option present above the first drilldown that is enabled.
-    // diagnose and duplicate are always enabled, so this means it starts at -200
-    let insetHeight = -200;
-    if (!editDisabled) {
-      insetHeight = insetHeight - 200;
-    }
-    if (composerAvailable) {
-      insetHeight = insetHeight - 100;
-    }
-    if (diagnoseDisabled) {
-      insetHeight = insetHeight + 100;
-    }
-
-    return `${insetHeight}%`;
-  };
 
   const onToggleClick = () => {
     setIsOpen(!isOpen);
@@ -155,80 +137,82 @@ export const RowActions: React.FunctionComponent<InstanceActionsProps> = ({
     >
       <MenuContent menuHeight={`${menuHeights[activeMenu]}px`}>
         <MenuList>
-          <Link
-            variant="plain"
-            pathname={routeManager.getUrl("Diagnose", {
-              service: instance.service_entity,
-              instance: instance.id,
-            })}
+          <MenuItem
+            itemId="diagnose"
             isDisabled={diagnoseDisabled}
+            icon={<FileMedicalAltIcon />}
           >
-            <MenuItem
-              itemId="diagnose"
-              isDisabled={diagnoseDisabled}
-              icon={<FileMedicalAltIcon />}
-            >
-              {words("inventory.statustab.diagnose")}
-            </MenuItem>
-          </Link>
-          {composerEnabled && (
             <Link
               variant="plain"
-              pathname={routeManager.getUrl("InstanceComposerEditor", {
+              pathname={routeManager.getUrl("Diagnose", {
                 service: instance.service_entity,
                 instance: instance.id,
               })}
+              isDisabled={diagnoseDisabled}
+            >
+              {words("inventory.statustab.diagnose")}
+            </Link>
+          </MenuItem>
+          {composerEnabled && (
+            <MenuItem
+              itemId="edit-composer"
               isDisabled={editDisabled}
+              icon={<ToolsIcon />}
             >
-              <MenuItem
-                itemId="edit-composer"
+              <Link
+                variant="plain"
+                pathname={routeManager.getUrl("InstanceComposerEditor", {
+                  service: instance.service_entity,
+                  instance: instance.id,
+                })}
                 isDisabled={editDisabled}
-                icon={<ToolsIcon />}
               >
                 {words("inventory.instanceComposer.editButton")}
-              </MenuItem>
-            </Link>
+              </Link>
+            </MenuItem>
           )}
           {featureManager.isComposerEnabled() && (
+            <MenuItem itemId="show-composer" icon={<EyeIcon />}>
+              <Link
+                variant="plain"
+                pathname={routeManager.getUrl("InstanceComposerViewer", {
+                  service: instance.service_entity,
+                  instance: instance.id,
+                })}
+              >
+                {words("inventory.instanceComposer.showButton")}
+              </Link>
+            </MenuItem>
+          )}
+
+          <MenuItem
+            itemId="edit"
+            isDisabled={editDisabled}
+            icon={<ToolsIcon />}
+          >
             <Link
               variant="plain"
-              pathname={routeManager.getUrl("InstanceComposerViewer", {
+              pathname={routeManager.getUrl("EditInstance", {
                 service: instance.service_entity,
                 instance: instance.id,
               })}
-            >
-              <MenuItem itemId="show-composer" icon={<EyeIcon />}>
-                {words("inventory.instanceComposer.showButton")}
-              </MenuItem>
-            </Link>
-          )}
-          <Link
-            variant="plain"
-            pathname={routeManager.getUrl("EditInstance", {
-              service: instance.service_entity,
-              instance: instance.id,
-            })}
-            isDisabled={editDisabled}
-          >
-            <MenuItem
-              itemId="edit"
               isDisabled={editDisabled}
-              icon={<ToolsIcon />}
             >
               {words("inventory.editInstance.button")}
-            </MenuItem>
-          </Link>
-          <Link
-            variant="plain"
-            pathname={routeManager.getUrl("DuplicateInstance", {
-              service: instance.service_entity,
-              instance: instance.id,
-            })}
-          >
-            <MenuItem itemId="duplicate" icon={<CopyIcon />}>
-              Duplicate
-            </MenuItem>
-          </Link>
+            </Link>
+          </MenuItem>
+
+          <MenuItem itemId="duplicate" icon={<CopyIcon />}>
+            <Link
+              variant="plain"
+              pathname={routeManager.getUrl("DuplicateInstance", {
+                service: instance.service_entity,
+                instance: instance.id,
+              })}
+            >
+              {words("inventory.duplicateInstance.button")}
+            </Link>
+          </MenuItem>
           <Divider component="li" />
           <MenuItem
             itemId="group:navigate"
@@ -237,38 +221,37 @@ export const RowActions: React.FunctionComponent<InstanceActionsProps> = ({
               <DrilldownMenu
                 id="navigateDrillDown"
                 aria-label="navigationDrilldown"
-                style={{ insetBlockStart: getInsetHeight() }}
               >
                 <MenuItem
                   itemId="group:navigate_breadcrumb"
                   direction="up"
                   aria-hidden
                 >
-                  Back
+                  {words("back")}
                 </MenuItem>
                 <Divider component="li" />
-                <Link
-                  variant="plain"
-                  pathname={routeManager.getUrl("History", {
-                    service: instance.service_entity,
-                    instance: instance.id,
-                  })}
-                >
-                  <MenuItem itemId="history" icon={<HistoryIcon />}>
+                <MenuItem itemId="history" icon={<HistoryIcon />}>
+                  <Link
+                    variant="plain"
+                    pathname={routeManager.getUrl("History", {
+                      service: instance.service_entity,
+                      instance: instance.id,
+                    })}
+                  >
                     {words("inventory.statusTab.history")}
-                  </MenuItem>
-                </Link>
-                <Link
-                  variant="plain"
-                  pathname={routeManager.getUrl("Events", {
-                    service: instance.service_entity,
-                    instance: instance.id,
-                  })}
-                >
-                  <MenuItem itemId="events" icon={<PortIcon />}>
+                  </Link>
+                </MenuItem>
+                <MenuItem itemId="events" icon={<PortIcon />}>
+                  <Link
+                    variant="plain"
+                    pathname={routeManager.getUrl("Events", {
+                      service: instance.service_entity,
+                      instance: instance.id,
+                    })}
+                  >
                     {words("inventory.statusTab.events")}
-                  </MenuItem>
-                </Link>
+                  </Link>
+                </MenuItem>
                 <DeleteAction
                   isDisabled={deleteDisabled}
                   service_entity={instance.service_entity}
@@ -297,7 +280,6 @@ export const RowActions: React.FunctionComponent<InstanceActionsProps> = ({
             <ForceStateAction
               service_entity={instance.service_entity}
               id={instance.id}
-              insetHeight={getInsetHeight()}
               instance_identity={
                 instance.service_identity_attribute_value ?? instance.id
               }
@@ -306,7 +288,7 @@ export const RowActions: React.FunctionComponent<InstanceActionsProps> = ({
             />
           )}
           <Divider component="li" />
-          <MenuGroup label="Set state">
+          <MenuGroup label="Set state" role="group">
             <SetStateSection
               service_entity={instance.service_entity}
               id={instance.id}
diff --git a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/SetStateSection/SetStateSection.tsx b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/SetStateSection/SetStateSection.tsx
index 042c3bb0a..4ac9888f3 100644
--- a/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/SetStateSection/SetStateSection.tsx
+++ b/src/Slices/ServiceInventory/UI/Components/RowActionsMenu/SetStateSection/SetStateSection.tsx
@@ -63,37 +63,38 @@ export const SetStateSection: React.FunctionComponent<Props> = ({
           setStateErrorMessage={setStateErrorMessage}
         />
       )}
-      <ActionDisabledTooltip
-        isDisabled={isDisabled || isHalted}
-        ariaLabel={words("inventory.statustab.setInstanceState")}
-        tooltipContent={
-          isHalted
-            ? words("environment.halt.tooltip")
-            : words("inventory.statustab.actionDisabled")
-        }
-      >
-        {targets?.map((target) => (
-          <MenuItem
-            key={target}
-            value={target}
-            itemId={target}
-            onClick={() => onSelect(target)}
-            data-testid={`${id}-${target}`}
+      {targets?.map((target) => (
+        <MenuItem
+          key={target}
+          isDisabled={isDisabled || isHalted}
+          value={target}
+          itemId={target}
+          onClick={() => onSelect(target)}
+          data-testid={`${id}-${target}`}
+        >
+          <ActionDisabledTooltip
+            isDisabled={isDisabled || isHalted}
+            testingId={words("inventory.statustab.setInstanceState")}
+            tooltipContent={
+              isHalted
+                ? words("environment.halt.tooltip")
+                : words("inventory.statustab.actionDisabled")
+            }
           >
             {target}
-          </MenuItem>
-        ))}
-        {(!targets || targets.length < 1) && (
-          <MenuItem
-            key={"no value"}
-            value={"no value"}
-            itemId={"no value"}
-            isDisabled
-          >
-            None available
-          </MenuItem>
-        )}
-      </ActionDisabledTooltip>
+          </ActionDisabledTooltip>
+        </MenuItem>
+      ))}
+      {(!targets || targets.length < 1) && (
+        <MenuItem
+          key={"no value"}
+          value={"no value"}
+          itemId={"no value"}
+          isDisabled
+        >
+          None available
+        </MenuItem>
+      )}
       <ConfirmationModal
         title={words("inventory.statustab.confirmTitle")}
         onSetInstanceState={onSubmit}
diff --git a/src/Slices/ServiceInventory/UI/InventoryTable.test.tsx b/src/Slices/ServiceInventory/UI/InventoryTable.test.tsx
index f8331ba0f..ae280c7d6 100644
--- a/src/Slices/ServiceInventory/UI/InventoryTable.test.tsx
+++ b/src/Slices/ServiceInventory/UI/InventoryTable.test.tsx
@@ -182,8 +182,6 @@ test("ServiceInventory can show resources for instance", async () => {
   expect(screen.getByText("[resource_id_1]")).toBeInTheDocument();
 });
 
-jest.mock("@/UI/Utils/useFeatures");
-
 function setup(expertMode = false, setSortFn: (props) => void = dummySetter) {
   const store = getStoreInstance();
 
diff --git a/src/Slices/ServiceInventory/UI/InventoryTable.tsx b/src/Slices/ServiceInventory/UI/InventoryTable.tsx
index 40e33f253..e0d629a51 100644
--- a/src/Slices/ServiceInventory/UI/InventoryTable.tsx
+++ b/src/Slices/ServiceInventory/UI/InventoryTable.tsx
@@ -68,6 +68,7 @@ export const InventoryTable: React.FC<Props> = ({
         width={getColumnWidth(column.apiName)}
         key={column.displayName}
         {...sortParams}
+        {...(column.apiName === "actions" && { "aria-hidden": true })}
       >
         {column.apiName === "actions" ? "" : column.displayName}
       </Th>
@@ -78,7 +79,7 @@ export const InventoryTable: React.FC<Props> = ({
     <Table {...props}>
       <Thead>
         <Tr>
-          <Th />
+          <Th aria-hidden />
           {heads}
         </Tr>
       </Thead>
diff --git a/src/Slices/ServiceInventory/UI/ServiceInventory.test.tsx b/src/Slices/ServiceInventory/UI/ServiceInventory.test.tsx
index 40c88cafd..c241d77ca 100644
--- a/src/Slices/ServiceInventory/UI/ServiceInventory.test.tsx
+++ b/src/Slices/ServiceInventory/UI/ServiceInventory.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter, useLocation } from "react-router-dom";
 import { fireEvent, render, screen, act } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either, RemoteData } from "@/Core";
 import {
   QueryResolverImpl,
@@ -37,6 +38,8 @@ import { TriggerInstanceUpdateCommandManager } from "@S/EditInstance/Data";
 import { Chart } from "./Components";
 import { ServiceInventory } from "./ServiceInventory";
 
+expect.extend(toHaveNoViolations);
+
 function setup(service = Service.a, pageSize = "") {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -135,15 +138,13 @@ function setup(service = Service.a, pageSize = "") {
   };
 }
 
-jest.mock("@/UI/Utils/useFeatures");
-
 test("ServiceInventory shows updated instances", async () => {
   const { component, apiHelper, scheduler } = setup();
 
   render(component);
 
   expect(
-    await screen.findByRole("generic", { name: "ServiceInventory-Loading" }),
+    await screen.findByRole("region", { name: "ServiceInventory-Loading" }),
   ).toBeInTheDocument();
 
   apiHelper.resolve(
@@ -171,6 +172,11 @@ test("ServiceInventory shows updated instances", async () => {
   expect(
     await screen.findByRole("grid", { name: "ServiceInventory-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ServiceInventory shows error with retry", async () => {
@@ -180,7 +186,7 @@ test("ServiceInventory shows error with retry", async () => {
   apiHelper.resolve(Either.left("fake error"));
 
   expect(
-    await screen.findByRole("generic", { name: "ServiceInventory-Failed" }),
+    await screen.findByRole("region", { name: "ServiceInventory-Failed" }),
   ).toBeInTheDocument();
 
   fireEvent.click(screen.getByRole("button", { name: "Retry" }));
@@ -196,6 +202,11 @@ test("ServiceInventory shows error with retry", async () => {
   expect(
     await screen.findByRole("grid", { name: "ServiceInventory-Success" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ServiceInventory shows next page of instances", async () => {
@@ -234,6 +245,11 @@ test("ServiceInventory shows next page of instances", async () => {
   expect(
     await screen.findByRole("cell", { name: "IdCell-b" }),
   ).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ResourcesView fetches resources for new instance after instance update", async () => {
@@ -307,6 +323,11 @@ test("GIVEN ResourcesView fetches resources for new instance after instance upda
   expect(apiHelper.pendingRequests[0].url).toMatch(
     `/lsm/v1/service_inventory/${ServiceInstance.a.service_entity}/${ServiceInstance.a.id}/resources?current_version=4`,
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ServiceInventory shows instance summary chart", async () => {
diff --git a/src/Slices/ServiceInventory/UI/ServiceInventory.tsx b/src/Slices/ServiceInventory/UI/ServiceInventory.tsx
index 1dc0bd5eb..14354b41f 100644
--- a/src/Slices/ServiceInventory/UI/ServiceInventory.tsx
+++ b/src/Slices/ServiceInventory/UI/ServiceInventory.tsx
@@ -96,14 +96,12 @@ export const ServiceInventory: React.FunctionComponent<{
         {RemoteData.fold(
           {
             notAsked: () => null,
-            loading: () => (
-              <LoadingView aria-label="ServiceInventory-Loading" />
-            ),
+            loading: () => <LoadingView ariaLabel="ServiceInventory-Loading" />,
             failed: (error) => (
               <ErrorView
                 message={error}
                 retry={retry}
-                aria-label="ServiceInventory-Failed"
+                ariaLabel="ServiceInventory-Failed"
               />
             ),
             success: ({ data: instances }) =>
diff --git a/src/Slices/ServiceInventory/UI/Spec/AttributesFilter.spec.ts b/src/Slices/ServiceInventory/UI/Spec/AttributesFilter.spec.ts
index b509ff40a..30e92f459 100644
--- a/src/Slices/ServiceInventory/UI/Spec/AttributesFilter.spec.ts
+++ b/src/Slices/ServiceInventory/UI/Spec/AttributesFilter.spec.ts
@@ -21,7 +21,7 @@ test("GIVEN The Service Inventory WHEN the user filters on AttributeSet ('Active
 
   await act(async () => {
     await userEvent.click(
-      within(screen.getByRole("generic", { name: "FilterBar" })).getByRole(
+      within(screen.getByRole("toolbar", { name: "FilterBar" })).getByRole(
         "button",
         { name: "FilterPicker" },
       ),
diff --git a/src/Slices/ServiceInventory/UI/Spec/DeletedFilter.spec.ts b/src/Slices/ServiceInventory/UI/Spec/DeletedFilter.spec.ts
index c2ce00364..5603dd6a1 100644
--- a/src/Slices/ServiceInventory/UI/Spec/DeletedFilter.spec.ts
+++ b/src/Slices/ServiceInventory/UI/Spec/DeletedFilter.spec.ts
@@ -19,7 +19,7 @@ test("GIVEN The Service Inventory WHEN the user filters on deleted ('Only') THEN
     );
   });
 
-  const filterBar = screen.getByRole("generic", { name: "FilterBar" });
+  const filterBar = screen.getByRole("toolbar", { name: "FilterBar" });
 
   const picker = within(filterBar).getByRole("button", {
     name: "FilterPicker",
diff --git a/src/Slices/ServiceInventory/UI/Spec/Filter.spec.ts b/src/Slices/ServiceInventory/UI/Spec/Filter.spec.ts
index 37eaf610d..1b076d630 100644
--- a/src/Slices/ServiceInventory/UI/Spec/Filter.spec.ts
+++ b/src/Slices/ServiceInventory/UI/Spec/Filter.spec.ts
@@ -40,7 +40,7 @@ test("GIVEN The Service Inventory WHEN the user filters on something THEN a data
   });
 
   expect(
-    await screen.findByRole("generic", { name: "ServiceInventory-Loading" }),
+    await screen.findByRole("region", { name: "ServiceInventory-Loading" }),
   ).toBeInTheDocument();
 
   await act(async () => {
diff --git a/src/Slices/ServiceInventory/UI/Spec/IdFilter.spec.ts b/src/Slices/ServiceInventory/UI/Spec/IdFilter.spec.ts
index b31e3d7ae..bbcc68e0a 100644
--- a/src/Slices/ServiceInventory/UI/Spec/IdFilter.spec.ts
+++ b/src/Slices/ServiceInventory/UI/Spec/IdFilter.spec.ts
@@ -19,7 +19,7 @@ test("GIVEN The Service Inventory WHEN the user filters on id ('a') THEN only 1
     );
   });
 
-  const filterBar = screen.getByRole("generic", { name: "FilterBar" });
+  const filterBar = screen.getByRole("toolbar", { name: "FilterBar" });
 
   const picker = within(filterBar).getByRole("button", {
     name: "FilterPicker",
diff --git a/src/Slices/ServiceInventory/UI/Spec/IdentityFilter.spec.ts b/src/Slices/ServiceInventory/UI/Spec/IdentityFilter.spec.ts
index 6fa36094d..99602cfdd 100644
--- a/src/Slices/ServiceInventory/UI/Spec/IdentityFilter.spec.ts
+++ b/src/Slices/ServiceInventory/UI/Spec/IdentityFilter.spec.ts
@@ -24,7 +24,7 @@ test("GIVEN The Service Inventory WHEN the user filters on identity ('Order ID',
     );
   });
 
-  const filterBar = screen.getByRole("generic", { name: "FilterBar" });
+  const filterBar = screen.getByRole("toolbar", { name: "FilterBar" });
   await act(async () => {
     await userEvent.click(
       within(filterBar).getByRole("button", { name: "FilterPicker" }),
diff --git a/src/Slices/ServiceInventory/UI/Tabs/ResourcesTab.tsx b/src/Slices/ServiceInventory/UI/Tabs/ResourcesTab.tsx
index 0f4cbee39..afe05e671 100644
--- a/src/Slices/ServiceInventory/UI/Tabs/ResourcesTab.tsx
+++ b/src/Slices/ServiceInventory/UI/Tabs/ResourcesTab.tsx
@@ -30,7 +30,7 @@ export const ResourcesTab: React.FC<Props> = ({
       notAsked: () => null,
       loading: () => (
         <ResourceTableWrapper aria-label="ResourceTable-Loading" id={id}>
-          <LoadingView />
+          <LoadingView ariaLabel="ResourceTable-Loading" />
         </ResourceTableWrapper>
       ),
       failed: (error) => (
@@ -38,6 +38,7 @@ export const ResourcesTab: React.FC<Props> = ({
           <ErrorView
             title={words("inventory.resourcesTab.failed.title")}
             message={words("inventory.resourcesTab.failed.body")(error)}
+            ariaLabel="ResourceTable-Failed"
           />
         </ResourceTableWrapper>
       ),
diff --git a/src/Slices/Settings/UI/Tabs/Configuration/Components/Warning.tsx b/src/Slices/Settings/UI/Tabs/Configuration/Components/Warning.tsx
index cded73fa5..e513132ec 100644
--- a/src/Slices/Settings/UI/Tabs/Configuration/Components/Warning.tsx
+++ b/src/Slices/Settings/UI/Tabs/Configuration/Components/Warning.tsx
@@ -6,7 +6,7 @@ import styled from "styled-components";
 
 export const Warning: React.FC<{ className?: string }> = ({ className }) => (
   <Tooltip content="Changed value has not been saved">
-    <IconWrapper className={className} aria-label="Warning">
+    <IconWrapper className={className} data-testid="Warning">
       <Icon style={{ color: global_warning_color_100.var }}>
         <ExclamationTriangleIcon />
       </Icon>
diff --git a/src/Slices/Settings/UI/Tabs/Configuration/Tab.test.tsx b/src/Slices/Settings/UI/Tabs/Configuration/Tab.test.tsx
index 1555fd024..b4e27075a 100644
--- a/src/Slices/Settings/UI/Tabs/Configuration/Tab.test.tsx
+++ b/src/Slices/Settings/UI/Tabs/Configuration/Tab.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, fireEvent, render, screen, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, Maybe } from "@/Core";
 import {
   CommandManagerResolverImpl,
@@ -22,6 +23,15 @@ import {
 import { DependencyProvider, words } from "@/UI";
 import { Tab } from "./Tab";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const apiHelper = new DeferredApiHelper();
   const authHelper = new KeycloakAuthHelper();
@@ -85,6 +95,11 @@ test("GIVEN ConfigurationTab THEN shows all settings", async () => {
   expect(
     within(row).getByRole("button", { name: "ResetAction" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab WHEN editing a dict field THEN shows warning icon", async () => {
@@ -110,9 +125,12 @@ test("GIVEN ConfigurationTab WHEN editing a dict field THEN shows warning icon",
   await act(async () => {
     await userEvent.type(newKeyInput, "testKey");
   });
-  expect(
-    within(row).getByRole("generic", { name: "Warning" }),
-  ).toBeInTheDocument();
+  expect(within(row).getByTestId("Warning")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab WHEN editing an enum field THEN shows warning icon", async () => {
@@ -144,9 +162,12 @@ test("GIVEN ConfigurationTab WHEN editing an enum field THEN shows warning icon"
       within(row).getByRole("option", { name: "push_full_deploy" }),
     );
   });
-  expect(
-    within(row).getByRole("generic", { name: "Warning" }),
-  ).toBeInTheDocument();
+  expect(within(row).getByTestId("Warning")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab WHEN editing a boolean field THEN shows warning icon", async () => {
@@ -173,9 +194,12 @@ test("GIVEN ConfigurationTab WHEN editing a boolean field THEN shows warning ico
     );
   });
 
-  expect(
-    within(row).getByRole("generic", { name: "Warning" }),
-  ).toBeInTheDocument();
+  expect(within(row).getByTestId("Warning")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab WHEN editing a number field THEN shows warning icon", async () => {
@@ -198,9 +222,12 @@ test("GIVEN ConfigurationTab WHEN editing a number field THEN shows warning icon
     await userEvent.click(within(row).getByRole("button", { name: "plus" }));
   });
 
-  expect(
-    within(row).getByRole("generic", { name: "Warning" }),
-  ).toBeInTheDocument();
+  expect(within(row).getByTestId("Warning")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab WHEN editing a positiveFloat field THEN shows warning icon", async () => {
@@ -223,9 +250,12 @@ test("GIVEN ConfigurationTab WHEN editing a positiveFloat field THEN shows warni
     await userEvent.click(within(row).getByRole("button", { name: "plus" }));
   });
 
-  expect(
-    within(row).getByRole("generic", { name: "Warning" }),
-  ).toBeInTheDocument();
+  expect(within(row).getByTestId("Warning")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab WHEN editing a string field THEN shows warning icon", async () => {
@@ -251,9 +281,12 @@ test("GIVEN ConfigurationTab WHEN editing a string field THEN shows warning icon
     await userEvent.type(textbox, "testString");
   });
 
-  expect(
-    within(row).getByRole("generic", { name: "Warning" }),
-  ).toBeInTheDocument();
+  expect(within(row).getByTestId("Warning")).toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("ConfigurationTab can display unknown setting types as strings", async () => {
@@ -271,6 +304,11 @@ test("ConfigurationTab can display unknown setting types as strings", async () =
   const field = within(row).getByRole("textbox", { name: "string input" });
   expect(field).toBeInTheDocument();
   expect(field).toHaveValue("false");
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab and boolean input WHEN changing boolean value and saving THEN update is performed", async () => {
@@ -338,6 +376,11 @@ test("GIVEN ConfigurationTab and boolean input WHEN changing boolean value and s
 
   expect(apiHelper.resolvedRequests).toHaveLength(3);
   expect(toggle).toBeChecked();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab and boolean input WHEN clicking reset THEN delete is performed", async () => {
@@ -392,6 +435,11 @@ test("GIVEN ConfigurationTab and boolean input WHEN clicking reset THEN delete i
   });
 
   expect(toggle).toBeChecked();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN ConfigurationTab and dict input WHEN adding an entry and saving THEN entry is locked in", async () => {
@@ -471,4 +519,9 @@ test("GIVEN ConfigurationTab and dict input WHEN adding an entry and saving THEN
   ).toBeInTheDocument();
   expect(newKeyInput).toHaveValue("");
   expect(newValueInput).toHaveValue("");
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Settings/UI/Tabs/Configuration/Tab.tsx b/src/Slices/Settings/UI/Tabs/Configuration/Tab.tsx
index 6a9a5f6ea..843099566 100644
--- a/src/Slices/Settings/UI/Tabs/Configuration/Tab.tsx
+++ b/src/Slices/Settings/UI/Tabs/Configuration/Tab.tsx
@@ -18,9 +18,9 @@ export const Tab: React.FC<Props> = ({ environmentId }) => {
   return RemoteData.fold(
     {
       notAsked: () => null,
-      loading: () => <LoadingView aria-label="EnvironmentSettings-Loading" />,
+      loading: () => <LoadingView ariaLabel="EnvironmentSettings-Loading" />,
       failed: (error) => (
-        <ErrorView aria-label="EnvironmentSettings-Failed" message={error} />
+        <ErrorView ariaLabel="EnvironmentSettings-Failed" message={error} />
       ),
       success: (settings) => <Provider settings={settings} />,
     },
diff --git a/src/Slices/Settings/UI/Tabs/Environment/Components/Actions.tsx b/src/Slices/Settings/UI/Tabs/Environment/Components/Actions.tsx
index 1288b6e1d..d2fe3fdd0 100644
--- a/src/Slices/Settings/UI/Tabs/Environment/Components/Actions.tsx
+++ b/src/Slices/Settings/UI/Tabs/Environment/Components/Actions.tsx
@@ -50,7 +50,7 @@ export const Actions: React.FC<ActionsProps> = ({ environment }) => {
         <DescriptionListDescription>
           <ActionDisabledTooltip
             isDisabled={isProtected}
-            ariaLabel={"clear"}
+            testingId={"clear"}
             tooltipContent={words("environment.protected.tooltip")}
           >
             <Button
@@ -68,7 +68,7 @@ export const Actions: React.FC<ActionsProps> = ({ environment }) => {
         <DescriptionListDescription>
           <ActionDisabledTooltip
             isDisabled={isProtected}
-            ariaLabel={"delete"}
+            testingId={"delete"}
             tooltipContent={words("environment.protected.tooltip")}
           >
             <Button
diff --git a/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.test.tsx b/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.test.tsx
index 1c0111581..da4a7046b 100644
--- a/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.test.tsx
+++ b/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either, Maybe } from "@/Core";
 import {
   CommandResolverImpl,
@@ -20,6 +21,15 @@ import {
 import { DependencyProvider } from "@/UI/Dependency";
 import { EnvironmentSettings } from "./EnvironmentSettings";
 
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
 function setup() {
   const selectedEnvironment = Environment.filterable[0];
   const apiHelper = new DeferredApiHelper();
@@ -70,6 +80,11 @@ test("Given environment settings When clicking on the edit name button Then the
   expect(
     screen.queryByRole("generic", { name: "Name-value" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given environment settings When submitting the edited name Then the backend request is fired", async () => {
@@ -119,6 +134,11 @@ test("Given environment settings When submitting the edited name Then the backen
   expect(
     screen.queryByRole("textbox", { name: "Name-input" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given environment settings When canceling a name edit Then the backend request is not fired", async () => {
@@ -152,6 +172,11 @@ test("Given environment settings When canceling a name edit Then the backend req
   expect(
     screen.queryByRole("textbox", { name: "Name-input" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test.each`
@@ -208,6 +233,11 @@ test.each`
     expect(
       screen.queryByRole("generic", { name: "Name-error-message" }),
     ).not.toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   },
 );
 
@@ -240,6 +270,11 @@ test("Given environment settings When clicking on the edit repository settings b
   expect(
     screen.queryByRole("generic", { name: "repo_url-value" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given environment settings When submitting the edited repository settings Then the backend request is fired", async () => {
@@ -321,6 +356,11 @@ test("Given environment settings When submitting the edited repository settings
   expect(
     screen.queryByRole("textbox", { name: "repo_url-value" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given environment settings When canceling a repository edit Then the backend request is not fired", async () => {
@@ -363,6 +403,11 @@ test("Given environment settings When canceling a repository edit Then the backe
   expect(
     screen.queryByRole("textbox", { name: "repo_url-input" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test.each`
@@ -425,6 +470,11 @@ test.each`
         name: "Repository Settings-error-message",
       }),
     ).not.toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   },
 );
 
@@ -451,6 +501,11 @@ test("Given environment settings When clicking on the edit project button Then t
   expect(
     screen.queryByRole("generic", { name: "Project Name-value" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given environment settings When submitting the edited project name Then the backend request is fired", async () => {
@@ -514,6 +569,11 @@ test("Given environment settings When submitting the edited project name Then th
   expect(
     screen.queryByRole("textbox", { name: "Project Name-typeahead" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given environment settings When canceling a project name edit Then the backend request is not fired", async () => {
@@ -550,6 +610,11 @@ test("Given environment settings When canceling a project name edit Then the bac
   expect(
     screen.queryByRole("textbox", { name: "Project Name-typeahead" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test.each`
@@ -617,6 +682,11 @@ test.each`
     expect(
       screen.queryByRole("generic", { name: "Project Name-error-message" }),
     ).not.toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
   },
 );
 
@@ -640,6 +710,11 @@ test("Given environment settings When clicking on the edit description button Th
   expect(
     screen.queryByRole("generic", { name: "Description-value" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given environment settings When clicking on the edit icon button Then the image field is shown", async () => {
@@ -660,4 +735,9 @@ test("Given environment settings When clicking on the edit icon button Then the
   expect(
     screen.queryByRole("img", { name: "Icon-value" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.tsx b/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.tsx
index 96bef164d..efa408eef 100644
--- a/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.tsx
+++ b/src/Slices/Settings/UI/Tabs/Environment/EnvironmentSettings.tsx
@@ -21,7 +21,6 @@ interface Props {
 export const EnvironmentSettings: React.FC<Props> = ({
   environment,
   projects,
-  ...props
 }) => {
   const { commandResolver } = useContext(DependencyContext);
   const modifyEnvironmentTrigger =
@@ -66,7 +65,7 @@ export const EnvironmentSettings: React.FC<Props> = ({
     });
 
   return (
-    <PaddedList aria-label={props["aria-label"]}>
+    <PaddedList>
       <EditableTextField
         initialValue={environment.name}
         label={words("settings.tabs.environment.name")}
diff --git a/src/Slices/Settings/UI/Tabs/Tabs.tsx b/src/Slices/Settings/UI/Tabs/Tabs.tsx
index aa0bfa787..50de804eb 100644
--- a/src/Slices/Settings/UI/Tabs/Tabs.tsx
+++ b/src/Slices/Settings/UI/Tabs/Tabs.tsx
@@ -28,7 +28,7 @@ export const Tabs: React.FC<Props> = ({ activeTab, setActiveTab }) => {
   if (!selected) {
     return (
       <ErrorView
-        aria-label="Environment-Failed"
+        ariaLabel="Environment-Failed"
         message={words("error.environment.missing")}
       />
     );
diff --git a/src/Slices/Status/UI/Page.test.tsx b/src/Slices/Status/UI/Page.test.tsx
index 1db5cf66a..25b8ce85b 100644
--- a/src/Slices/Status/UI/Page.test.tsx
+++ b/src/Slices/Status/UI/Page.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { act, render, screen, waitFor, within } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { ArchiveHelper, Deferred, Either, RemoteData } from "@/Core";
 import {
   CommandResolverImpl,
@@ -25,6 +26,8 @@ import { words } from "@/UI";
 import { DependencyProvider } from "@/UI/Dependency";
 import { Page } from "./Page";
 
+expect.extend(toHaveNoViolations);
+
 export class MockArchiveHelper implements ArchiveHelper {
   private promise;
   public resolve;
@@ -123,6 +126,11 @@ test("GIVEN StatusPage THEN shows server status", async () => {
       name: "StatusItem-lsm.database",
     }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN StatusPage without support extension THEN download button is not present", async () => {
@@ -138,6 +146,11 @@ test("GIVEN StatusPage without support extension THEN download button is not pre
   expect(
     screen.queryByRole("button", { name: "DownloadArchiveButton" }),
   ).not.toBeInTheDocument();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN StatusPage with support extension THEN download button is present", async () => {
@@ -151,6 +164,11 @@ test("GIVEN StatusPage with support extension THEN download button is present",
   expect(
     screen.getByRole("button", { name: "DownloadArchiveButton" }),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN StatusPage with support extension WHEN user click download THEN an archive is created", async () => {
@@ -190,6 +208,11 @@ test("GIVEN StatusPage with support extension WHEN user click download THEN an a
       words("status.supportArchive.action.download"),
     ),
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN StatusPage with support extension WHEN user click download THEN button goes through correct phases", async () => {
@@ -232,6 +255,11 @@ test("GIVEN StatusPage with support extension WHEN user click download THEN butt
       words("status.supportArchive.action.download"),
     ),
   );
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("GIVEN StatusPage with support extension WHEN user click download and response is error THEN error is shown", async () => {
@@ -259,4 +287,9 @@ test("GIVEN StatusPage with support extension WHEN user click download and respo
   const errorContainer = screen.getByTestId("ToastAlert");
   expect(errorContainer).toBeVisible();
   expect(within(errorContainer).getByText("error")).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
diff --git a/src/Slices/Status/UI/StatusItem.tsx b/src/Slices/Status/UI/StatusItem.tsx
index 477a0b865..b5f474e9c 100644
--- a/src/Slices/Status/UI/StatusItem.tsx
+++ b/src/Slices/Status/UI/StatusItem.tsx
@@ -27,7 +27,7 @@ export const StatusItem: React.FC<Props> = ({
   <ListItem icon={icon} aria-label={`StatusItem-${name}`}>
     <Flex direction={{ default: "column" }}>
       <FlexItem>
-        <InlineTitle headingLevel="h3">{name}</InlineTitle>
+        <InlineTitle headingLevel="h2">{name}</InlineTitle>
         <Category>{category}</Category>
       </FlexItem>
       {details.length > 0 && (
diff --git a/src/Slices/Status/UI/SupportArchive.tsx b/src/Slices/Status/UI/SupportArchive.tsx
index f5355b7b9..96292267f 100644
--- a/src/Slices/Status/UI/SupportArchive.tsx
+++ b/src/Slices/Status/UI/SupportArchive.tsx
@@ -39,6 +39,7 @@ export const SupportArchive: React.FC = () => {
             data-testid="ToastAlert"
             variant="danger"
             title="Something went wrong with downloading the support archive"
+            component="h3"
             actionClose={
               <AlertActionCloseButton onClose={() => setError(null)} />
             }
diff --git a/src/Slices/UserManagement/UI/Components/UserInfoRow.tsx b/src/Slices/UserManagement/UI/Components/UserInfoRow.tsx
index 57d3e6cd6..f7610ea59 100644
--- a/src/Slices/UserManagement/UI/Components/UserInfoRow.tsx
+++ b/src/Slices/UserManagement/UI/Components/UserInfoRow.tsx
@@ -24,7 +24,7 @@ export const UserInfoRow: React.FC<UserInfoRowProps> = ({ user }) => {
   };
 
   return (
-    <Tr aria-label={`row-${user.username}`} role="user-row">
+    <Tr aria-label={`row-${user.username}`} data-testid="user-row">
       <Td dataLabel={user.username}>{user.username}</Td>
       <Td dataLabel={`${user.username}-actions`}>
         <Button variant="danger" onClick={() => onDelete()}>
diff --git a/src/Slices/UserManagement/UI/Page.test.tsx b/src/Slices/UserManagement/UI/Page.test.tsx
index d5f15ec78..76823ff22 100644
--- a/src/Slices/UserManagement/UI/Page.test.tsx
+++ b/src/Slices/UserManagement/UI/Page.test.tsx
@@ -1,8 +1,9 @@
 import React from "react";
 import { MemoryRouter } from "react-router-dom";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { act, render, screen } from "@testing-library/react";
+import { act, fireEvent, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
 import { PrimaryAuthController } from "@/Data";
@@ -10,7 +11,9 @@ import { UserInfo } from "@/Data/Managers/V2/GetUsers";
 import { dependencies } from "@/Test";
 import { DependencyProvider, words } from "@/UI";
 import { UserManagementPage } from "./Page";
+
 const spyDispatch = jest.spyOn(document, "dispatchEvent");
+expect.extend(toHaveNoViolations);
 
 const setup = () => {
   const queryClient = new QueryClient();
@@ -56,6 +59,11 @@ describe("UserManagementPage", () => {
     );
     expect(addUserButton).toBeInTheDocument();
 
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
     server.close();
   });
 
@@ -80,7 +88,7 @@ describe("UserManagementPage", () => {
     const successView = await screen.findByLabelText("users-table");
     expect(successView).toBeInTheDocument();
 
-    const userRows = screen.getAllByRole("user-row");
+    const userRows = screen.getAllByTestId("user-row");
     expect(userRows).toHaveLength(2);
 
     expect(screen.getByText("test_user")).toBeInTheDocument();
@@ -88,6 +96,11 @@ describe("UserManagementPage", () => {
 
     expect(screen.getAllByText("Delete")).toHaveLength(2);
 
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
     server.close();
   });
 
@@ -121,6 +134,11 @@ describe("UserManagementPage", () => {
 
     expect(spyDispatch).toHaveBeenCalledWith(new CustomEvent("open-login"));
 
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
     server.close();
   });
 
@@ -175,7 +193,7 @@ describe("UserManagementPage", () => {
 
     const successView = await screen.findByLabelText("users-table");
     expect(successView).toBeInTheDocument();
-    const userRows = screen.getAllByRole("user-row");
+    const userRows = screen.getAllByTestId("user-row");
     expect(userRows).toHaveLength(2);
 
     await act(async () => {
@@ -206,13 +224,19 @@ describe("UserManagementPage", () => {
     });
 
     await act(async () => {
-      await userEvent.click(screen.getByLabelText("add_user-button"));
+      fireEvent.click(screen.getByLabelText("add_user-button"));
     });
 
-    const updatedRows = await screen.findAllByRole("user-row");
+    const updatedRows = await screen.findAllByTestId("user-row");
     expect(updatedRows).toHaveLength(3);
 
     expect(screen.getByText("new_user")).toBeInTheDocument();
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
     server.close();
   });
 
@@ -251,18 +275,26 @@ describe("UserManagementPage", () => {
 
     const successView = await screen.findByLabelText("users-table");
     expect(successView).toBeInTheDocument();
-    const userRows = screen.getAllByRole("user-row");
+
+    const userRows = screen.getAllByTestId("user-row");
     expect(userRows).toHaveLength(2);
 
     await act(async () => {
-      await userEvent.click(screen.getAllByText("Delete")[0]);
+      fireEvent.click(screen.getAllByText("Delete")[0]);
     });
 
     await act(async () => {
-      await userEvent.click(screen.getByText("Yes"));
+      fireEvent.click(screen.getByText("Yes"));
     });
 
-    const updatedRows = await screen.findAllByRole("user-row");
+    const updatedRows = await screen.findAllByTestId("user-row");
     expect(updatedRows).toHaveLength(1);
+
+    await act(async () => {
+      const results = await axe(document.body);
+      expect(results).toHaveNoViolations();
+    });
+
+    server.close();
   });
 });
diff --git a/src/Slices/UserManagement/UI/Page.tsx b/src/Slices/UserManagement/UI/Page.tsx
index 96f6932ee..3c58c7f4b 100644
--- a/src/Slices/UserManagement/UI/Page.tsx
+++ b/src/Slices/UserManagement/UI/Page.tsx
@@ -18,14 +18,14 @@ export const UserManagementPage: React.FC = () => {
   const { data, isLoading, isError, error, refetch } =
     useGetUsers().useOneTime();
 
-  if (isLoading) return <LoadingView aria-label="UserManagement-Loading" />;
+  if (isLoading) return <LoadingView ariaLabel="UserManagement-Loading" />;
   if (isError)
     return (
       <ErrorView
         data-testid="ErrorView"
         title={words("error")}
         message={words("error.general")(error.message)}
-        aria-label="UserManagement-Failed"
+        ariaLabel="UserManagement-Failed"
         retry={refetch}
       />
     );
diff --git a/src/UI/Components/ActionDisabledTooltip/ActionDisabledTooltip.tsx b/src/UI/Components/ActionDisabledTooltip/ActionDisabledTooltip.tsx
index 49bfd5016..a0c7c3f0f 100644
--- a/src/UI/Components/ActionDisabledTooltip/ActionDisabledTooltip.tsx
+++ b/src/UI/Components/ActionDisabledTooltip/ActionDisabledTooltip.tsx
@@ -5,7 +5,7 @@ import { words } from "@/UI/words";
 
 interface Props {
   isDisabled?: boolean;
-  ariaLabel: string;
+  testingId: string;
   tooltipContent?: string;
 }
 
@@ -14,13 +14,13 @@ export const ActionDisabledTooltip: React.FC<
 > = ({
   children,
   isDisabled,
-  ariaLabel,
+  testingId,
   tooltipContent = words("inventory.statustab.actionDisabled"),
 }) => {
   if (isDisabled) {
     return (
       <Tooltip entryDelay={200} content={tooltipContent}>
-        <CursorNotAllowedContainer aria-label={ariaLabel}>
+        <CursorNotAllowedContainer data-testid={testingId}>
           {children}
         </CursorNotAllowedContainer>
       </Tooltip>
diff --git a/src/UI/Components/BlockingModal/BlockingModal.test.tsx b/src/UI/Components/BlockingModal/BlockingModal.test.tsx
index 6ae791e9d..daf70304e 100644
--- a/src/UI/Components/BlockingModal/BlockingModal.test.tsx
+++ b/src/UI/Components/BlockingModal/BlockingModal.test.tsx
@@ -1,10 +1,20 @@
 import React from "react";
 import { render, screen } from "@testing-library/react";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { act } from "react-dom/test-utils";
 import { words } from "@/UI/words";
 import { BlockingModal } from "./BlockingModal";
 
-test("Given BlockingModal When firing event twice Then Modal will appear and disappear", () => {
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
+
+test("Given BlockingModal When firing event twice Then Modal will appear and disappear", async () => {
   render(<BlockingModal />);
 
   act(() => {
@@ -15,6 +25,11 @@ test("Given BlockingModal When firing event twice Then Modal will appear and dis
   expect(modalHalt).toBeVisible();
   expect(textHalt).toBeVisible();
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   act(() => {
     document.dispatchEvent(new CustomEvent("halt-event"));
   });
diff --git a/src/UI/Components/CatalogActions/CatalogActions.test.tsx b/src/UI/Components/CatalogActions/CatalogActions.test.tsx
index 64f5977fc..9258e5435 100644
--- a/src/UI/Components/CatalogActions/CatalogActions.test.tsx
+++ b/src/UI/Components/CatalogActions/CatalogActions.test.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { render, screen, act, cleanup } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { configureAxe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   CommandManagerResolverImpl,
@@ -20,6 +21,14 @@ import {
 import { DependencyProvider } from "@/UI/Dependency";
 import { words } from "@/UI/words";
 import { CatalogActions } from "./CatalogActions";
+expect.extend(toHaveNoViolations);
+
+const axe = configureAxe({
+  rules: {
+    // disable landmark rules when testing isolated components.
+    region: { enabled: false },
+  },
+});
 
 function setup(
   details = {
@@ -78,6 +87,11 @@ test("Given CatalogUpdateButton, when user clicks on button, it should display a
   expect(
     await screen.findByText(words("catalog.update.modal.title")),
   ).toBeVisible();
+
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
 });
 
 test("Given CatalogUpdateButton, when user cancels the modal, it should not fire the API call and close the modal.", async () => {
@@ -94,6 +108,11 @@ test("Given CatalogUpdateButton, when user cancels the modal, it should not fire
   const cancelButton = await screen.findByText(words("no"));
   expect(cancelButton).toBeVisible();
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   await act(async () => {
     await userEvent.click(cancelButton);
   });
@@ -107,6 +126,11 @@ test("Given CatalogUpdateButton, when user confirms update, it should fire the A
   const { component, apiHelper } = setup();
   render(component);
 
+  await act(async () => {
+    const results = await axe(document.body);
+    expect(results).toHaveNoViolations();
+  });
+
   const button = screen.getByRole("button", {
     name: words("catalog.button.update"),
   });
diff --git a/src/UI/Components/CatalogActions/CatalogActions.tsx b/src/UI/Components/CatalogActions/CatalogActions.tsx
index 6a1a2f75c..e82dbb30b 100644
--- a/src/UI/Components/CatalogActions/CatalogActions.tsx
+++ b/src/UI/Components/CatalogActions/CatalogActions.tsx
@@ -93,8 +93,10 @@ export const CatalogActions: React.FC = () => {
         <StyledParagraph>
           {words("catalog.update.confirmation.p1")}
         </StyledParagraph>
+        <p>
+          <b>{words("catalog.update.confirmation.p2")}</b>
+        </p>
         <ul>
-          {words("catalog.update.confirmation.p2")}
           <li>
             - <b>{words("catalog.update.confirmation.p3")}</b>
           </li>
diff --git a/src/UI/Components/DiffWizard/ItemList/Block.tsx b/src/UI/Components/DiffWizard/ItemList/Block.tsx
index 384abb1c1..69786e568 100644
--- a/src/UI/Components/DiffWizard/ItemList/Block.tsx
+++ b/src/UI/Components/DiffWizard/ItemList/Block.tsx
@@ -51,13 +51,13 @@ export const Block: React.FC<Props> = ({ item, refs, classify }) => {
         <StyledHeader
           onExpand={onExpand}
           toggleButtonProps={{
-            id: "toggle-button",
+            id: `${item.id}-toggle-button`,
             "aria-label": "Details",
-            "aria-labelledby": "titleId toggle-button",
+            "aria-labelledby": "toggle-button",
             "aria-expanded": isExpanded,
           }}
         >
-          <StyledTitle id="titleId">
+          <StyledTitle id={item.id}>
             <StyledStatusDescriptor status={item.status} />
             {item.id}
           </StyledTitle>
diff --git a/src/UI/Components/EmptyView/EmptyView.tsx b/src/UI/Components/EmptyView/EmptyView.tsx
index 9992e16b1..09f7fac98 100644
--- a/src/UI/Components/EmptyView/EmptyView.tsx
+++ b/src/UI/Components/EmptyView/EmptyView.tsx
@@ -18,7 +18,7 @@ export const EmptyView: React.FC<Props> = ({ title, message, ...props }) => (
     <EmptyStateHeader
       titleText={<>{title || words("empty.title")}</>}
       icon={<EmptyStateIcon icon={ExclamationCircleIcon} />}
-      headingLevel="h4"
+      headingLevel="h2"
     />
     <EmptyStateBody>{message}</EmptyStateBody>
   </EmptyState>
diff --git a/src/UI/Components/ErrorView/ErrorView.tsx b/src/UI/Components/ErrorView/ErrorView.tsx
index c30a16853..d92f170f4 100644
--- a/src/UI/Components/ErrorView/ErrorView.tsx
+++ b/src/UI/Components/ErrorView/ErrorView.tsx
@@ -14,6 +14,7 @@ import { words } from "@/UI/words";
 
 interface Props {
   message: string;
+  ariaLabel?: string;
   title?: string;
   retry?: () => void;
   delay?: number;
@@ -24,15 +25,16 @@ export const ErrorView: React.FC<Props> = ({
   title,
   retry,
   delay,
+  ariaLabel,
   ...props
 }) => {
   return (
     <Delayed delay={delay}>
-      <EmptyState {...props}>
+      <EmptyState {...props} aria-label={ariaLabel} role="region">
         <EmptyStateHeader
           titleText={<>{title || words("error")}</>}
           icon={<EmptyStateIcon icon={ExclamationTriangleIcon} />}
-          headingLevel="h4"
+          headingLevel="h2"
         />
         <EmptyStateBody>
           <StyledErrorMessage>{message}</StyledErrorMessage>
diff --git a/src/UI/Components/EventsTable/EventsTableWrapper.tsx b/src/UI/Components/EventsTable/EventsTableWrapper.tsx
index 37427c7d5..dce671274 100644
--- a/src/UI/Components/EventsTable/EventsTableWrapper.tsx
+++ b/src/UI/Components/EventsTable/EventsTableWrapper.tsx
@@ -44,7 +44,7 @@ export const EventsTableWrapper: React.FC<React.PropsWithChildren<Props>> = ({
     <Table aria-label={props["aria-label"]}>
       <Thead>
         <Tr>
-          <Th />
+          <Th aria-hidden />
           {heads}
         </Tr>
       </Thead>
diff --git a/src/UI/Components/ExpertBanner/ExpertBanner.tsx b/src/UI/Components/ExpertBanner/ExpertBanner.tsx
index 4c256c6e8..95fb41262 100644
--- a/src/UI/Components/ExpertBanner/ExpertBanner.tsx
+++ b/src/UI/Components/ExpertBanner/ExpertBanner.tsx
@@ -7,7 +7,12 @@ export const ExpertBanner = () => {
 
   return environmentModifier.useIsExpertModeEnabled() ? (
     <React.Fragment>
-      <Banner isSticky variant="red" id="expert-mode-banner">
+      <Banner
+        isSticky
+        variant="red"
+        id="expert-mode-banner"
+        aria-label="expertModeActive"
+      >
         LSM expert mode is enabled, proceed with caution.
       </Banner>
     </React.Fragment>
diff --git a/src/UI/Components/LegendBar/LoneItem.tsx b/src/UI/Components/LegendBar/LoneItem.tsx
index 947836ceb..446a7a4bb 100644
--- a/src/UI/Components/LegendBar/LoneItem.tsx
+++ b/src/UI/Components/LegendBar/LoneItem.tsx
@@ -14,7 +14,6 @@ export const LoneItem: React.FC<Props> = ({ label }) => (
     value={1}
     backgroundColor={global_palette_blue_50.var}
     color={global_Color_100.var}
-    aria-label={`LegendItem-lone`}
   >
     {label}
   </Container>
diff --git a/src/UI/Components/LicenseBanner/LicenseBanner.tsx b/src/UI/Components/LicenseBanner/LicenseBanner.tsx
index 3195b76f7..e674e8162 100644
--- a/src/UI/Components/LicenseBanner/LicenseBanner.tsx
+++ b/src/UI/Components/LicenseBanner/LicenseBanner.tsx
@@ -15,7 +15,7 @@ export const LicenseBanner: React.FC = () => {
   );
 
   return expirationMessage ? (
-    <Banner isSticky variant="red">
+    <Banner isSticky variant="red" aria-label="licenceExpired">
       {expirationMessage}
     </Banner>
   ) : null;
diff --git a/src/UI/Components/Link/Link.tsx b/src/UI/Components/Link/Link.tsx
index 38d42aae6..f760b211a 100644
--- a/src/UI/Components/Link/Link.tsx
+++ b/src/UI/Components/Link/Link.tsx
@@ -49,5 +49,9 @@ export const Link: React.FC<Props> = forwardRef<HTMLAnchorElement, Props>(
 );
 
 const StyledRRLink = styled(RRLink)<{ $variant?: string }>`
+  display: inline-block;
+  width: 100%;
+  color: ${({ $variant }) =>
+    $variant === "plain" ? "inherit" : "var(--pf-global--primary-color--100)"};
   ${({ $variant }) => ($variant === "plain" ? "text-decoration:none" : "")};
 `;
diff --git a/src/UI/Components/LoadingView/LoadingView.tsx b/src/UI/Components/LoadingView/LoadingView.tsx
index 29c1b006f..33e90bcd5 100644
--- a/src/UI/Components/LoadingView/LoadingView.tsx
+++ b/src/UI/Components/LoadingView/LoadingView.tsx
@@ -6,13 +6,18 @@ import { words } from "@/UI/words";
 
 interface Props {
   instant?: boolean;
+  ariaLabel?: string;
 }
 
-export const LoadingView: React.FC<Props> = ({ instant, ...props }) => (
-  <EmptyState isFullHeight {...props}>
+export const LoadingView: React.FC<Props> = ({
+  instant,
+  ariaLabel,
+  ...props
+}) => (
+  <EmptyState isFullHeight {...props} aria-label={ariaLabel} role="region">
     <Delayed delay={instant ? undefined : 200}>
       <EmptyStateIcon icon={Spinner} />
-      <Title size="lg" headingLevel="h4">
+      <Title size="lg" headingLevel="h2">
         {words("loading")}
       </Title>
     </Delayed>
diff --git a/src/UI/Components/MultiTextSelect/MultiTextSelect.tsx b/src/UI/Components/MultiTextSelect/MultiTextSelect.tsx
index 7a7697835..7ad66aace 100644
--- a/src/UI/Components/MultiTextSelect/MultiTextSelect.tsx
+++ b/src/UI/Components/MultiTextSelect/MultiTextSelect.tsx
@@ -205,14 +205,13 @@ export const MultiTextSelect: React.FC<Props> = ({
             onClick={onToggleClick}
             onChange={onTextInputChange}
             onKeyDown={onInputKeyDown}
-            id="multi-typeahead-select-input"
             autoComplete="off"
             innerRef={textInputRef}
             placeholder={placeholderText || "Select..."}
             {...(activeItem && { "aria-activedescendant": activeItem })}
             role="combobox"
             isExpanded={isOpen}
-            aria-controls="select-multi-typeahead-listbox"
+            aria-controls={`select-listbox-${toggleAriaLabel}`}
             aria-label={`${toggleAriaLabel}FilterInput`}
             disabled={props.isDisabled}
           >
diff --git a/src/UI/Components/PageContainer/PageContainer.tsx b/src/UI/Components/PageContainer/PageContainer.tsx
index 249356e71..06e5dd780 100644
--- a/src/UI/Components/PageContainer/PageContainer.tsx
+++ b/src/UI/Components/PageContainer/PageContainer.tsx
@@ -12,9 +12,9 @@ export const PageContainer: React.FC<React.PropsWithChildren<Props>> = ({
   title,
   ...props
 }) => (
-  <PageSection variant="light" {...props}>
+  <PageSection variant="light" {...props} role="main">
     <PagePadder>
-      <PageTitle>{title}</PageTitle>
+      <PageTitle role="heading">{title}</PageTitle>
       {children}
     </PagePadder>
   </PageSection>
diff --git a/src/UI/Components/PaginationWidget/Provider.tsx b/src/UI/Components/PaginationWidget/Provider.tsx
index 8f2e042a8..87e8bd636 100644
--- a/src/UI/Components/PaginationWidget/Provider.tsx
+++ b/src/UI/Components/PaginationWidget/Provider.tsx
@@ -18,6 +18,7 @@ interface Props {
   pageSize: PageSize.Type;
   setPageSize: (size: PageSize.Type) => void;
   setCurrentPage: (currentPage: CurrentPage) => void;
+  variant?: "top" | "bottom";
 }
 
 /**
@@ -30,6 +31,7 @@ export const Provider: React.FC<Props> = ({
   pageSize,
   setPageSize,
   setCurrentPage,
+  variant = "top",
 }) =>
   RemoteData.fold(
     {
@@ -40,7 +42,10 @@ export const Provider: React.FC<Props> = ({
         <StyledPagination
           itemCount={Number(metadata.total)}
           perPage={Number(pageSize.value)}
-          titles={{ perPageSuffix: "" }}
+          titles={{
+            perPageSuffix: "",
+            paginationAriaLabel: `${variant}-Pagination`,
+          }}
           page={
             Math.floor(Number(metadata.before) / Number(metadata.page_size)) + 1
           }
@@ -56,7 +61,8 @@ export const Provider: React.FC<Props> = ({
               value: handlers.prev ? handlers.prev : "",
             })
           }
-          aria-label="PaginationWidget"
+          aria-label={`PaginationWidget-${variant}`}
+          widgetId={`PaginationWidget-${variant}`}
           onPerPageSelect={(
             _event: React.MouseEvent | React.KeyboardEvent | MouseEvent,
             newPerPage: number,
@@ -70,6 +76,7 @@ export const Provider: React.FC<Props> = ({
           }}
           perPageOptions={PaginationPageSizes}
           isCompact
+          variant={variant}
         />
       ),
     },
diff --git a/src/UI/Components/RemoteDataView/RemoteDataView.tsx b/src/UI/Components/RemoteDataView/RemoteDataView.tsx
index e02a04a72..27e5f7b8b 100644
--- a/src/UI/Components/RemoteDataView/RemoteDataView.tsx
+++ b/src/UI/Components/RemoteDataView/RemoteDataView.tsx
@@ -21,14 +21,14 @@ export const RemoteDataView = <T,>({
     {
       notAsked: () => null,
       loading: () => (
-        <LoadingView aria-label={label ? `${label}-Loading` : undefined} />
+        <LoadingView ariaLabel={label ? `${label}-Loading` : undefined} />
       ),
       failed: (error) => (
         <ErrorView
           data-testid="ErrorView"
           title={words("error")}
           message={words("error.general")(error)}
-          aria-label={label ? `${label}-Failed` : undefined}
+          ariaLabel={label ? `${label}-Failed` : undefined}
           retry={retry}
         />
       ),
diff --git a/src/UI/Components/ServiceInstanceForm/ServiceInstanceForm.tsx b/src/UI/Components/ServiceInstanceForm/ServiceInstanceForm.tsx
index e8e100b85..6199868e1 100644
--- a/src/UI/Components/ServiceInstanceForm/ServiceInstanceForm.tsx
+++ b/src/UI/Components/ServiceInstanceForm/ServiceInstanceForm.tsx
@@ -173,7 +173,7 @@ export const ServiceInstanceForm: React.FC<Props> = ({
       <ActionGroup>
         <ActionDisabledTooltip
           isDisabled={isSubmitDisabled}
-          ariaLabel={words("confirm")}
+          testingId={words("confirm")}
           tooltipContent={words("environment.halt.tooltip")}
         >
           <Button
diff --git a/src/UI/Components/ServiceProvider/ServiceProvider.tsx b/src/UI/Components/ServiceProvider/ServiceProvider.tsx
index e8f689e06..9741188f4 100644
--- a/src/UI/Components/ServiceProvider/ServiceProvider.tsx
+++ b/src/UI/Components/ServiceProvider/ServiceProvider.tsx
@@ -27,12 +27,16 @@ export const ServiceProvider: React.FunctionComponent<Props> = ({
       notAsked: () => null,
       loading: () => (
         <Wrapper aria-label="ServiceProvider-Loading" name={serviceName}>
-          <LoadingView />
+          <LoadingView ariaLabel="ServiceProvider-Loading" />
         </Wrapper>
       ),
       failed: (error) => (
         <Wrapper aria-label="ServiceProvider-Failed" name={serviceName}>
-          <ErrorView message={error} retry={retry} />
+          <ErrorView
+            message={error}
+            retry={retry}
+            ariaLabel="ServiceProvider-Failed"
+          />
         </Wrapper>
       ),
       success: (service) => <Dependant service={service} />,
diff --git a/src/UI/Components/ServicesProvider/ServicesProvider.tsx b/src/UI/Components/ServicesProvider/ServicesProvider.tsx
index e28b1baad..3fb51b746 100644
--- a/src/UI/Components/ServicesProvider/ServicesProvider.tsx
+++ b/src/UI/Components/ServicesProvider/ServicesProvider.tsx
@@ -26,12 +26,16 @@ export const ServicesProvider: React.FunctionComponent<Props> = ({
       notAsked: () => null,
       loading: () => (
         <Wrapper aria-label="ServicesProvider-Loading" name={serviceName}>
-          <LoadingView />
+          <LoadingView ariaLabel="ServicesProvider-Loading" />
         </Wrapper>
       ),
       failed: (error) => (
         <Wrapper aria-label="ServicesProvider-Failed" name={serviceName}>
-          <ErrorView message={error} retry={retry} />
+          <ErrorView
+            message={error}
+            retry={retry}
+            ariaLabel="ServicesProvider-Failed"
+          />
         </Wrapper>
       ),
       success: (services) => (
diff --git a/src/UI/Components/SingleTextSelect/SingleTextSelect.tsx b/src/UI/Components/SingleTextSelect/SingleTextSelect.tsx
index 6bd1a5f3f..9a1d95916 100644
--- a/src/UI/Components/SingleTextSelect/SingleTextSelect.tsx
+++ b/src/UI/Components/SingleTextSelect/SingleTextSelect.tsx
@@ -258,7 +258,6 @@ export const SingleTextSelect: React.FC<Props> = ({
           onClick={onToggleClick}
           onChange={onTextInputChange}
           onKeyDown={onInputKeyDown}
-          id="typeahead-select-input"
           autoComplete="off"
           innerRef={textInputRef}
           placeholder={placeholderText}
diff --git a/src/UI/Components/Timeline/Frame.tsx b/src/UI/Components/Timeline/Frame.tsx
index 2edb95752..96d1fb27f 100644
--- a/src/UI/Components/Timeline/Frame.tsx
+++ b/src/UI/Components/Timeline/Frame.tsx
@@ -28,15 +28,17 @@ export const Frame: React.FC<FrameProps> = ({
   success,
 }) => {
   const DoneState = () => (
-    <Icon aria-label="done-state" size="lg">
+    <Icon aria-label="done-state" role="img" size="lg">
       <CheckCircleIcon color="var(--pf-v5-global--success-color--100)" />
     </Icon>
   );
 
-  const LoadingState = () => <Spinner aria-label="loading-state" size="lg" />;
+  const LoadingState = () => (
+    <Spinner aria-label="loading-state" role="img" size="lg" />
+  );
 
   const ErrorState = () => (
-    <Icon aria-label="error-state" size="lg">
+    <Icon aria-label="error-state" role="img" size="lg">
       <ExclamationCircleIcon color="var(--pf-v5-global--danger-color--100)" />
     </Icon>
   );
diff --git a/src/UI/Components/ToastAlert/ToastAlert.tsx b/src/UI/Components/ToastAlert/ToastAlert.tsx
index 25b05fcc6..3470fb455 100644
--- a/src/UI/Components/ToastAlert/ToastAlert.tsx
+++ b/src/UI/Components/ToastAlert/ToastAlert.tsx
@@ -26,6 +26,7 @@ export const ToastAlert: React.FC<Props> = ({
         data-testid="ToastAlert"
         variant={type}
         title={title}
+        component="h3"
         actionClose={<AlertActionCloseButton onClose={() => setMessage("")} />}
       >
         <StyledMessage>{message}</StyledMessage>
diff --git a/src/UI/Components/UpdateBanner/UpdateBanner.tsx b/src/UI/Components/UpdateBanner/UpdateBanner.tsx
index 4eae63124..8d836b155 100644
--- a/src/UI/Components/UpdateBanner/UpdateBanner.tsx
+++ b/src/UI/Components/UpdateBanner/UpdateBanner.tsx
@@ -24,7 +24,7 @@ export const UpdateBanner: React.FunctionComponent<Props> = (props) => {
 
   const banner = (
     <React.Fragment>
-      <Banner isSticky variant="gold">
+      <Banner isSticky variant="gold" aria-label="newVersionAvailable">
         You are running {currentVersion}, a new version is available! Please
         hard-reload (Ctrl+F5 | Cmd + Shift + R) your page to load the new
         version.
diff --git a/src/UI/Root/Components/PageFrame/PageFrame.tsx b/src/UI/Root/Components/PageFrame/PageFrame.tsx
index cbfd35279..0f5cfd5b3 100644
--- a/src/UI/Root/Components/PageFrame/PageFrame.tsx
+++ b/src/UI/Root/Components/PageFrame/PageFrame.tsx
@@ -25,8 +25,10 @@ export const PageFrame: React.FC<React.PropsWithChildren<Props>> = ({
 
   return (
     <>
-      <ExpertBanner />
-      <LicenseBanner />
+      <div role="alert" aria-label="bannerNotifications">
+        <ExpertBanner />
+        <LicenseBanner />
+      </div>
       <div className="pf-m-grow" style={{ minHeight: "0%" }}>
         <BlockingModal />
         <Page
diff --git a/src/UI/Root/Components/Sidebar/EnvironmentControls/EnvironmentControls.test.tsx b/src/UI/Root/Components/Sidebar/EnvironmentControls/EnvironmentControls.test.tsx
index 41b915115..442d54bd4 100644
--- a/src/UI/Root/Components/Sidebar/EnvironmentControls/EnvironmentControls.test.tsx
+++ b/src/UI/Root/Components/Sidebar/EnvironmentControls/EnvironmentControls.test.tsx
@@ -3,6 +3,7 @@ import { MemoryRouter } from "react-router-dom";
 import { act, render, screen } from "@testing-library/react";
 import { userEvent } from "@testing-library/user-event";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   BaseApiHelper,
@@ -29,6 +30,8 @@ import {
 import { DependencyProvider } from "@/UI/Dependency";
 import { EnvironmentControls } from "./EnvironmentControls";
 
+expect.extend(toHaveNoViolations);
+
 function setup() {
   const store = getStoreInstance();
   const scheduler = new StaticScheduler();
@@ -86,6 +89,17 @@ function setup() {
   };
 }
 
+test("GIVEN EnvironmentControls WHEN rendered THEN it should be accessible", async () => {
+  const { component, apiHelper } = setup();
+  const { container } = render(component);
+
+  await act(async () => {
+    await apiHelper.resolve(Either.right({ data: EnvironmentDetails.a }));
+  });
+
+  expect(await axe(container)).toHaveNoViolations();
+});
+
 test("EnvironmentControls halt the environment when clicked and the environment is running", async () => {
   const dispatchEventSpy = jest.spyOn(document, "dispatchEvent");
 
diff --git a/src/UI/Root/Components/Sidebar/Navigation/Navigation.test.tsx b/src/UI/Root/Components/Sidebar/Navigation/Navigation.test.tsx
index 7573d28ab..4f3eaa1f5 100644
--- a/src/UI/Root/Components/Sidebar/Navigation/Navigation.test.tsx
+++ b/src/UI/Root/Components/Sidebar/Navigation/Navigation.test.tsx
@@ -1,7 +1,8 @@
 import React from "react";
 import { MemoryRouter } from "react-router-dom";
-import { act, render, screen, within } from "@testing-library/react";
+import { act, cleanup, render, screen, within } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { RemoteData, ServerStatus } from "@/Core";
 import {
   PrimaryFeatureManager,
@@ -20,6 +21,8 @@ import { DependencyProvider } from "@/UI/Dependency";
 import { words } from "@/UI/words";
 import { Navigation } from "./Navigation";
 
+expect.extend(toHaveNoViolations);
+
 function setup(
   initialEntries: string[] | undefined,
   serverStatus: ServerStatus,
@@ -49,6 +52,15 @@ function setup(
   return { component, apiHelper };
 }
 
+test("GIVEN Navigation THEN it should be accessible", async () => {
+  const { component } = setup(undefined, TestServerStatus.withLsm);
+  const { container } = render(component);
+
+  expect(await axe(container)).toHaveNoViolations();
+
+  cleanup();
+});
+
 test("GIVEN Navigation WHEN lsm enabled THEN shows all navigation items", () => {
   const { component } = setup(undefined, TestServerStatus.withLsm);
   render(component);
diff --git a/src/UI/Root/Components/Sidebar/Sidebar.tsx b/src/UI/Root/Components/Sidebar/Sidebar.tsx
index cff1f4c20..3d8d59974 100644
--- a/src/UI/Root/Components/Sidebar/Sidebar.tsx
+++ b/src/UI/Root/Components/Sidebar/Sidebar.tsx
@@ -12,7 +12,7 @@ export const Sidebar: React.FC<{
   environment: string | undefined;
 }> = ({ environment }) => {
   return (
-    <PageSidebar aria-label="PageSidebar" theme="dark">
+    <PageSidebar aria-label="PageSidebar" theme="dark" role="sidebar">
       <PageSidebarBody>
         <Stack>
           <StackItem>
diff --git a/src/UI/Root/Root.test.tsx b/src/UI/Root/Root.test.tsx
index f95696024..c4baac417 100644
--- a/src/UI/Root/Root.test.tsx
+++ b/src/UI/Root/Root.test.tsx
@@ -1,8 +1,9 @@
 import React from "react";
 import { MemoryRouter } from "react-router";
 import { useLocation } from "react-router-dom";
-import { act, render, screen } from "@testing-library/react";
+import { act, cleanup, render, screen } from "@testing-library/react";
 import { StoreProvider } from "easy-peasy";
+import { axe, toHaveNoViolations } from "jest-axe";
 import { Either } from "@/Core";
 import {
   QueryResolverImpl,
@@ -72,18 +73,36 @@ function setup() {
       </StoreProvider>
     </MemoryRouter>
   );
+
   return {
     component,
     apiHelper,
   };
 }
 
-jest.mock("@/UI/Utils/useFeatures");
+expect.extend(toHaveNoViolations);
+
+test("GIVEN the app THEN the app should be accessible", async () => {
+  fetchMock.mockResponse(JSON.stringify({}));
+  const { component, apiHelper } = setup();
+  render(component);
+
+  await act(async () => {
+    await apiHelper.resolve(Either.right({ data: ServerStatus.withLsm }));
+    await apiHelper.resolve(Either.right({ data: Project.list }));
+  });
+
+  const results = await axe(document.body);
+  expect(results).toHaveNoViolations();
+
+  cleanup();
+});
 
 test("GIVEN the app THEN the navigation toggle button should be visible", async () => {
   fetchMock.mockResponse(JSON.stringify({}));
   const { component, apiHelper } = setup();
   render(component);
+
   await act(async () => {
     await apiHelper.resolve(Either.right({ data: ServerStatus.withLsm }));
     await apiHelper.resolve(Either.right({ data: Project.list }));
diff --git a/src/UI/Utils/ErrorBoundary.tsx b/src/UI/Utils/ErrorBoundary.tsx
index 7c00dfdac..992095318 100644
--- a/src/UI/Utils/ErrorBoundary.tsx
+++ b/src/UI/Utils/ErrorBoundary.tsx
@@ -35,6 +35,7 @@ class ErrorBoundary extends Component<Props, State> {
       return (
         <React.Fragment>
           <ErrorView
+            ariaLabel="ErrorBoundary"
             message={
               this.state.error?.message || "Something unexpected happened."
             }
diff --git a/src/UI/Utils/useFeatures.tsx b/src/UI/Utils/useFeatures.tsx
deleted file mode 100644
index 4a0031315..000000000
--- a/src/UI/Utils/useFeatures.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useEffect, useState } from "react";
-
-const extractFeatures = (fileContent) => {
-  // Parse the fileContent and extract the value of features
-  if (!fileContent || typeof fileContent !== "string" || fileContent === "") {
-    return [];
-  }
-  const strippedStr = fileContent.replace("export", "");
-  const script = `(function() { ${strippedStr} return features; })();`;
-  return eval(script);
-};
-
-const useFeatures = (): string[] => {
-  const [features, setFeatures] = useState([]);
-
-  /* eslint-disable react-hooks/exhaustive-deps */
-  useEffect(() => {
-    const checkFileChange = async () => {
-      try {
-        const response = await fetch("/console/config.js");
-        if (!response.ok) {
-          throw new Error(
-            "The configuration file couldn't be found at /console/config.js. Running the application without features.",
-          );
-        }
-        const content = await response.text();
-        const extractedFeatures = extractFeatures(content);
-
-        if (extractedFeatures !== features) {
-          setFeatures(extractedFeatures);
-        }
-      } catch (err) {
-        console.error("Error checking the config-file change", err);
-      }
-    };
-
-    checkFileChange();
-  }, []);
-
-  return features || [];
-};
-
-export default useFeatures;
diff --git a/src/UI/words.tsx b/src/UI/words.tsx
index 37e0dae65..d1b3d06a1 100644
--- a/src/UI/words.tsx
+++ b/src/UI/words.tsx
@@ -32,6 +32,7 @@ const dict = {
   jumpTo: "Jump to",
   hideAll: "Hide All",
   showAll: "Show All",
+  back: "Back",
 
   /**
    * Error related text
@@ -141,6 +142,7 @@ const dict = {
     amount === 1 ? "1 item" : `${amount} items`,
   "inventory.editInstance.button": "Edit",
   "inventory.editInstance.title": "Edit instance",
+  "inventory.duplicateInstance.button": "Duplicate",
   "inventory.duplicateInstance.title": "Duplicate instance",
   "inventory.editInstance.failed": "Editing instance failed",
   "inventory.editInstance.noAttributes":
diff --git a/yarn.lock b/yarn.lock
index 9d615e378..6110d9aad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -936,6 +936,7 @@ __metadata:
     "@types/fetch-mock": "npm:^7.3.8"
     "@types/file-saver": "npm:^2.0.7"
     "@types/jest": "npm:^29.5.12"
+    "@types/jest-axe": "npm:^3.5.9"
     "@types/json-bigint": "npm:^1.0.3"
     "@types/loadable__component": "npm:^5"
     "@types/lodash": "npm:^4.14.202"
@@ -980,6 +981,7 @@ __metadata:
     husky: "npm:^9.0.11"
     imagemin: "npm:^8.0.1"
     jest: "npm:^29.7.0"
+    jest-axe: "npm:^8.0.0"
     jest-environment-jsdom: "npm:^29.6.4"
     jest-fetch-mock: "npm:^3.0.3"
     jest-junit: "npm:^16.0.0"
@@ -2233,7 +2235,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^29.5.12":
+"@types/jest-axe@npm:^3.5.9":
+  version: 3.5.9
+  resolution: "@types/jest-axe@npm:3.5.9"
+  dependencies:
+    "@types/jest": "npm:*"
+    axe-core: "npm:^3.5.5"
+  checksum: 10/ca93cf7b13f173278f8c67e4f7d73c9c0cf3c6110f5d76a8815e1044c1b2950fe4b4e83475f6d23bd82479edc908da19e037cf8e1a9c0e89f1c8f5b95355c93d
+  languageName: node
+  linkType: hard
+
+"@types/jest@npm:*, @types/jest@npm:^29.5.12":
   version: 29.5.12
   resolution: "@types/jest@npm:29.5.12"
   dependencies:
@@ -3717,6 +3729,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"axe-core@npm:4.7.2":
+  version: 4.7.2
+  resolution: "axe-core@npm:4.7.2"
+  checksum: 10/1b94fcbe203296fc7174992a3d70dbcd477d88b933afa045aaffa1704fe63d8da8945e4b38fc576f9c7384abeb353e2d6607ab54d25b5c90b255ef2244bda29a
+  languageName: node
+  linkType: hard
+
+"axe-core@npm:^3.5.5":
+  version: 3.5.6
+  resolution: "axe-core@npm:3.5.6"
+  checksum: 10/3e776d843737edbb189e909694518e925ff1830c89ad7a043044ca4f2136d43417dc1f3006d2b164488316d12bf6fbcf0d989f05e874d8eeab58b8e2393ba4bc
+  languageName: node
+  linkType: hard
+
 "babel-jest@npm:^29.7.0":
   version: 29.7.0
   resolution: "babel-jest@npm:29.7.0"
@@ -4198,6 +4224,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "chalk@npm:4.1.2"
+  dependencies:
+    ansi-styles: "npm:^4.1.0"
+    supports-color: "npm:^7.1.0"
+  checksum: 10/cb3f3e594913d63b1814d7ca7c9bafbf895f75fbf93b92991980610dfd7b48500af4e3a5d4e3a8f337990a96b168d7eb84ee55efdce965e2ee8efc20f8c8f139
+  languageName: node
+  linkType: hard
+
 "chalk@npm:5.3.0":
   version: 5.3.0
   resolution: "chalk@npm:5.3.0"
@@ -4226,16 +4262,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "chalk@npm:4.1.2"
-  dependencies:
-    ansi-styles: "npm:^4.1.0"
-    supports-color: "npm:^7.1.0"
-  checksum: 10/cb3f3e594913d63b1814d7ca7c9bafbf895f75fbf93b92991980610dfd7b48500af4e3a5d4e3a8f337990a96b168d7eb84ee55efdce965e2ee8efc20f8c8f139
-  languageName: node
-  linkType: hard
-
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
@@ -9433,6 +9459,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-axe@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "jest-axe@npm:8.0.0"
+  dependencies:
+    axe-core: "npm:4.7.2"
+    chalk: "npm:4.1.2"
+    jest-matcher-utils: "npm:29.2.2"
+    lodash.merge: "npm:4.6.2"
+  checksum: 10/6a1673b547292d0ced82fbf48ff337efd349da00164ecffe95b3b702b6fbe477ba6762baa221bbb972bfa31b3368b15d5f91fcd3489d18789a990c7b6b7bb7ce
+  languageName: node
+  linkType: hard
+
 "jest-changed-files@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-changed-files@npm:29.7.0"
@@ -9536,7 +9574,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.7.0":
+"jest-diff@npm:^29.2.1, jest-diff@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-diff@npm:29.7.0"
   dependencies:
@@ -9615,7 +9653,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^29.6.3":
+"jest-get-type@npm:^29.2.0, jest-get-type@npm:^29.6.3":
   version: 29.6.3
   resolution: "jest-get-type@npm:29.6.3"
   checksum: 10/88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205
@@ -9667,6 +9705,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jest-matcher-utils@npm:29.2.2":
+  version: 29.2.2
+  resolution: "jest-matcher-utils@npm:29.2.2"
+  dependencies:
+    chalk: "npm:^4.0.0"
+    jest-diff: "npm:^29.2.1"
+    jest-get-type: "npm:^29.2.0"
+    pretty-format: "npm:^29.2.1"
+  checksum: 10/e095739f450e5e0aa23106acb2be95af4c168bb4f77f27ad51e5f1b40e0b9f5453762c4ca26eaf70ef25776a657af3de56634bb6e8e9bc7fe549be07b1e34f7d
+  languageName: node
+  linkType: hard
+
 "jest-matcher-utils@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-matcher-utils@npm:29.7.0"
@@ -10416,7 +10466,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.merge@npm:^4.6.2":
+"lodash.merge@npm:4.6.2, lodash.merge@npm:^4.6.2":
   version: 4.6.2
   resolution: "lodash.merge@npm:4.6.2"
   checksum: 10/d0ea2dd0097e6201be083865d50c3fb54fbfbdb247d9cc5950e086c991f448b7ab0cdab0d57eacccb43473d3f2acd21e134db39f22dac2d6c9ba6bf26978e3d6
@@ -12648,7 +12698,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
+"pretty-format@npm:^29.0.0, pretty-format@npm:^29.2.1, pretty-format@npm:^29.7.0":
   version: 29.7.0
   resolution: "pretty-format@npm:29.7.0"
   dependencies: