diff --git a/.deps/prod.md b/.deps/prod.md
index 7fe7c770..6f3b257e 100644
--- a/.deps/prod.md
+++ b/.deps/prod.md
@@ -6,7 +6,7 @@
 | `@eclipse-che/api@7.18.1` | EPL-2.0 | N/A |
 | [`@eclipse-che/workspace-client@0.0.1-1608729566`](https://github.com/eclipse/che-workspace-client) | EPL-2.0 | N/A |
 | [`@patternfly/patternfly@4.10.31`](https://github.com/patternfly/patternfly.git) | MIT | [CQ22346](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22346) |
-| [`@patternfly/react-core@4.18.5`](https://github.com/patternfly/patternfly-react.git) | MIT | [CQ22347](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22347) |
+| [`@patternfly/react-core@4.84.4`](https://github.com/patternfly/patternfly-react.git) | MIT |  |
 | [`@patternfly/react-icons@4.3.5`](https://github.com/patternfly/patternfly-react.git) | MIT | clearlydefined |
 | `@patternfly/react-styles@4.3.4` | MIT | clearlydefined |
 | [`@patternfly/react-table@4.5.7`](https://github.com/patternfly/patternfly-react.git) | MIT | clearlydefined |
@@ -47,7 +47,7 @@
 | [`fast-json-stable-stringify@2.1.0`](git://github.com/epoberezkin/fast-json-stable-stringify.git) | MIT | clearlydefined |
 | [`faye-websocket@0.11.3`](git://github.com/faye/faye-websocket-node.git) | Apache-2.0 | clearlydefined |
 | `file-selector@0.1.12` | MIT | [CQ22350](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22350) |
-| [`focus-trap@4.0.2`](git+https://github.com/davidtheclark/focus-trap.git) | MIT | clearlydefined |
+| [`focus-trap@6.2.2`](git+https://github.com/focus-trap/focus-trap.git) | MIT | clearlydefined |
 | [`follow-redirects@1.5.10`](git@github.com:follow-redirects/follow-redirects.git) | MIT | clearlydefined |
 | [`function-bind@1.1.1`](git://github.com/Raynos/function-bind.git) | MIT | [CQ16925](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16925) |
 | [`glob-to-regexp@0.3.0`](https://github.com/fitzgen/glob-to-regexp.git) | BSD | [CQ18717](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18717) |
@@ -142,7 +142,7 @@
 | [`string.prototype.trimright@2.1.2`](git://github.com/es-shims/String.prototype.trimRight.git) | MIT | clearlydefined |
 | [`string.prototype.trimstart@1.0.1`](git://github.com/es-shims/String.prototype.trimStart.git) | MIT | clearlydefined |
 | [`symbol-observable@1.2.0`](https://github.com/blesh/symbol-observable.git) | MIT | clearlydefined |
-| [`tabbable@3.1.2`](git+https://github.com/davidtheclark/tabbable.git) | MIT | clearlydefined |
+| [`tabbable@5.1.5`](git+https://github.com/focus-trap/tabbable.git) | MIT | clearlydefined |
 | [`tiny-invariant@1.1.0`](https://github.com/alexreardon/tiny-invariant.git) | MIT | clearlydefined |
 | [`tiny-warning@1.0.3`](https://github.com/alexreardon/tiny-warning.git) | MIT | clearlydefined |
 | [`tippy.js@5.1.2`](git+https://github.com/atomiks/tippyjs.git) | MIT | clearlydefined |
diff --git a/package.json b/package.json
index 95d93c5a..d51a9c4c 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
   "dependencies": {
     "@eclipse-che/workspace-client": "^0.0.1-1608729566",
     "@patternfly/patternfly": "^4.10.31",
-    "@patternfly/react-core": "^4.18.5",
+    "@patternfly/react-core": "^4.23.1",
     "@patternfly/react-icons": "^4.3.5",
     "@patternfly/react-table": "^4.5.7",
     "@types/react-helmet": "^6.1.0",
diff --git a/src/Layout/ErrorReporter/index.tsx b/src/Layout/ErrorReporter/index.tsx
index 71afd148..023fff13 100644
--- a/src/Layout/ErrorReporter/index.tsx
+++ b/src/Layout/ErrorReporter/index.tsx
@@ -26,8 +26,7 @@ export class ErrorReporter extends React.PureComponent<Props> {
       <Page>
         <PageSection
           isFilled={true}
-          padding={{ default: 'noPadding' }}
-          className={styles.backdropBackground}
+          className={styles.backdropBackground + ' pf-c-page-section-no-padding'}
         >
           <Stack>
             <StackItem isFilled></StackItem>
diff --git a/src/Layout/Header/Tools/__tests__/__snapshots__/index.spec.tsx.snap b/src/Layout/Header/Tools/__tests__/__snapshots__/index.spec.tsx.snap
index 36aa632e..4543ef41 100644
--- a/src/Layout/Header/Tools/__tests__/__snapshots__/index.spec.tsx.snap
+++ b/src/Layout/Header/Tools/__tests__/__snapshots__/index.spec.tsx.snap
@@ -13,8 +13,7 @@ exports[`Page header tools should correctly render the component 1`] = `
       <nav
         aria-label="info button"
         className="pf-c-app-launcher pf-m-align-right"
-        data-ouia-component-id={0}
-        data-ouia-component-type="PF4/Dropdown"
+        data-ouia-component-type="PF4/ApplicationLauncher"
         data-ouia-safe={true}
       >
         <button
@@ -22,8 +21,11 @@ exports[`Page header tools should correctly render the component 1`] = `
           aria-haspopup={true}
           aria-label="info button"
           className="pf-c-app-launcher__toggle"
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-1"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           disabled={false}
-          id="pf-toggle-id-0"
+          id="pf-dropdown-toggle-id-0"
           onClick={[Function]}
           onKeyDown={[Function]}
           type="button"
@@ -56,7 +58,7 @@ exports[`Page header tools should correctly render the component 1`] = `
       </nav>
       <div
         className="pf-c-dropdown pf-m-align-right"
-        data-ouia-component-id={1}
+        data-ouia-component-id="OUIA-Generated-Dropdown-1"
         data-ouia-component-type="PF4/Dropdown"
         data-ouia-safe={true}
       >
@@ -64,8 +66,11 @@ exports[`Page header tools should correctly render the component 1`] = `
           aria-expanded={false}
           aria-haspopup={true}
           className="pf-c-dropdown__toggle pf-m-plain"
+          data-ouia-component-id="OUIA-Generated-DropdownToggle-2"
+          data-ouia-component-type="PF4/DropdownToggle"
+          data-ouia-safe={true}
           disabled={false}
-          id="pf-toggle-id-1"
+          id="pf-dropdown-toggle-id-1"
           onClick={[Function]}
           onKeyDown={[Function]}
           type="button"
@@ -94,7 +99,6 @@ exports[`Page header tools should correctly render the component 1`] = `
             >
               <path
                 d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                transform=""
               />
             </svg>
           </span>
diff --git a/src/Layout/Header/__tests__/__snapshots__/index.spec.tsx.snap b/src/Layout/Header/__tests__/__snapshots__/index.spec.tsx.snap
index 88c9f6b0..7797afb7 100644
--- a/src/Layout/Header/__tests__/__snapshots__/index.spec.tsx.snap
+++ b/src/Layout/Header/__tests__/__snapshots__/index.spec.tsx.snap
@@ -11,18 +11,18 @@ exports[`Page header should correctly render the component 1`] = `
       className="pf-c-page__header-brand-toggle"
     >
       <button
-        aria-controls="page-sidebar"
-        aria-disabled={null}
+        aria-controls={null}
+        aria-disabled={false}
         aria-expanded="true"
         aria-label="Global navigation"
         className="pf-c-button pf-m-plain"
-        data-ouia-component-id={null}
+        data-ouia-component-id="OUIA-Generated-Button-plain-1"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe={true}
         disabled={false}
         id="nav-toggle"
         onClick={[Function]}
-        tabIndex={null}
+        role={null}
         type="button"
       >
         <svg
@@ -41,7 +41,6 @@ exports[`Page header should correctly render the component 1`] = `
         >
           <path
             d="M16 132h416c8.837 0 16-7.163 16-16V76c0-8.837-7.163-16-16-16H16C7.163 60 0 67.163 0 76v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm0 160h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16z"
-            transform=""
           />
         </svg>
       </button>
diff --git a/src/components/LogsTab/LogsTools/__tests__/__snapshots__/LogsTools.spec.tsx.snap b/src/components/LogsTab/LogsTools/__tests__/__snapshots__/LogsTools.spec.tsx.snap
index e8c0d487..edc9e757 100644
--- a/src/components/LogsTab/LogsTools/__tests__/__snapshots__/LogsTools.spec.tsx.snap
+++ b/src/components/LogsTab/LogsTools/__tests__/__snapshots__/LogsTools.spec.tsx.snap
@@ -41,15 +41,15 @@ exports[`The LogsTools component should render the component correctly 1`] = `
       className=""
     >
       <button
-        aria-disabled={null}
+        aria-disabled={false}
         aria-label={null}
         className="pf-c-button pf-m-link"
-        data-ouia-component-id={null}
+        data-ouia-component-id="OUIA-Generated-Button-link-1"
         data-ouia-component-type="PF4/Button"
         data-ouia-safe={true}
         disabled={false}
         onClick={[Function]}
-        tabIndex={null}
+        role={null}
         type="button"
       >
         <svg
diff --git a/src/components/LogsTab/__tests__/__snapshots__/LogsTab.spec.tsx.snap b/src/components/LogsTab/__tests__/__snapshots__/LogsTab.spec.tsx.snap
index edd71bd4..413b77aa 100644
--- a/src/components/LogsTab/__tests__/__snapshots__/LogsTab.spec.tsx.snap
+++ b/src/components/LogsTab/__tests__/__snapshots__/LogsTab.spec.tsx.snap
@@ -93,15 +93,15 @@ exports[`The LogsTab component should render workspace-logs widget with logs ins
           className=""
         >
           <button
-            aria-disabled={null}
+            aria-disabled={false}
             aria-label={null}
             className="pf-c-button pf-m-link"
-            data-ouia-component-id={null}
+            data-ouia-component-id="OUIA-Generated-Button-link-2"
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
             disabled={false}
             onClick={[Function]}
-            tabIndex={null}
+            role={null}
             type="button"
           >
             <svg
@@ -199,15 +199,15 @@ exports[`The LogsTab component should render workspace-logs widget without logs
           className=""
         >
           <button
-            aria-disabled={null}
+            aria-disabled={false}
             aria-label={null}
             className="pf-c-button pf-m-link"
-            data-ouia-component-id={null}
+            data-ouia-component-id="OUIA-Generated-Button-link-1"
             data-ouia-component-type="PF4/Button"
             data-ouia-safe={true}
             disabled={false}
             onClick={[Function]}
-            tabIndex={null}
+            role={null}
             type="button"
           >
             <svg
diff --git a/src/components/Progress/__tests__/__snapshots__/Progress.spec.tsx.snap b/src/components/Progress/__tests__/__snapshots__/Progress.spec.tsx.snap
index 85dd6e89..b32aadc0 100644
--- a/src/components/Progress/__tests__/__snapshots__/Progress.spec.tsx.snap
+++ b/src/components/Progress/__tests__/__snapshots__/Progress.spec.tsx.snap
@@ -10,6 +10,7 @@ exports[`Progress component should render progress with loading correctly 1`] =
       aria-hidden="true"
       className="pf-c-progress__description"
       id="che-progress-ind-description"
+      onMouseEnter={null}
     >
       
     </div>
diff --git a/src/overrides.styl b/src/overrides.styl
index a0a1f52e..715e4b70 100644
--- a/src/overrides.styl
+++ b/src/overrides.styl
@@ -18,3 +18,5 @@
   color var(--pf-global--icon--Color--light) !important
   opacity 1 !important
 
+.pf-c-page-section-no-padding
+  padding 0 !important
diff --git a/src/pages/FactoryLoader/__tests__/__snapshots__/FactoryLoader.spec.tsx.snap b/src/pages/FactoryLoader/__tests__/__snapshots__/FactoryLoader.spec.tsx.snap
index 0a4a5fb1..8836b1cb 100644
--- a/src/pages/FactoryLoader/__tests__/__snapshots__/FactoryLoader.spec.tsx.snap
+++ b/src/pages/FactoryLoader/__tests__/__snapshots__/FactoryLoader.spec.tsx.snap
@@ -53,7 +53,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={5}
+      data-ouia-component-id="OUIA-Generated-Tabs-6"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -82,7 +82,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -96,6 +95,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -108,6 +109,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -138,7 +141,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -146,6 +148,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -163,7 +167,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -224,7 +227,6 @@ Array [
                 >
                   <path
                     d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    transform=""
                   />
                 </svg>
               </li>
@@ -277,7 +279,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -289,7 +290,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -298,10 +300,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -329,15 +332,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -365,17 +369,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -403,15 +408,16 @@ Array [
                           >
                             Devfile is not found in repository root. Default environment will be applied
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current="page"
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link pf-m-current"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -439,19 +445,19 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -459,17 +465,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -477,17 +483,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -497,6 +505,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -603,7 +613,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={6}
+      data-ouia-component-id="OUIA-Generated-Tabs-7"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -632,7 +642,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -646,6 +655,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -658,6 +669,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -688,7 +701,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -696,6 +708,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -713,7 +727,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -774,7 +787,6 @@ Array [
                 >
                   <path
                     d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    transform=""
                   />
                 </svg>
               </li>
@@ -827,7 +839,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -839,7 +850,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -848,10 +860,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -879,15 +892,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -915,17 +929,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -953,15 +968,16 @@ Array [
                           >
                             Devfile is not found 
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current="page"
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link pf-m-current"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -989,19 +1005,19 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1009,17 +1025,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1027,17 +1043,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -1047,6 +1065,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -1153,7 +1173,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={0}
+      data-ouia-component-id="OUIA-Generated-Tabs-1"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -1182,7 +1202,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1196,6 +1215,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -1208,6 +1229,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -1238,7 +1261,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1246,6 +1268,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -1263,7 +1287,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -1328,7 +1351,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -1340,7 +1362,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -1349,10 +1372,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1380,17 +1404,17 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1398,19 +1422,19 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
                           aria-disabled={true}
                           className="pf-c-wizard__nav-link pf-m-disabled"
+                          disabled={true}
                           onClick={[Function]}
-                          tabIndex={-1}
                         >
                           
                           <span
@@ -1418,17 +1442,17 @@ Array [
                           >
                             Looking for devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
                           aria-disabled={true}
                           className="pf-c-wizard__nav-link pf-m-disabled"
+                          disabled={true}
                           onClick={[Function]}
-                          tabIndex={-1}
                         >
                           
                           <span
@@ -1436,19 +1460,19 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1456,17 +1480,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1474,17 +1498,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -1494,6 +1520,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -1600,7 +1628,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={1}
+      data-ouia-component-id="OUIA-Generated-Tabs-2"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -1629,7 +1657,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1643,6 +1670,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -1655,6 +1684,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -1685,7 +1716,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1693,6 +1723,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -1710,7 +1742,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -1775,7 +1806,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -1787,7 +1817,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -1796,10 +1827,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1827,17 +1859,17 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1845,19 +1877,19 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
                           aria-disabled={true}
                           className="pf-c-wizard__nav-link pf-m-disabled"
+                          disabled={true}
                           onClick={[Function]}
-                          tabIndex={-1}
                         >
                           
                           <span
@@ -1865,17 +1897,17 @@ Array [
                           >
                             Looking for devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
                           aria-disabled={true}
                           className="pf-c-wizard__nav-link pf-m-disabled"
+                          disabled={true}
                           onClick={[Function]}
-                          tabIndex={-1}
                         >
                           
                           <span
@@ -1883,19 +1915,19 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1903,17 +1935,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1921,17 +1953,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -1941,6 +1975,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -2047,7 +2083,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={4}
+      data-ouia-component-id="OUIA-Generated-Tabs-5"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -2076,7 +2112,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -2090,6 +2125,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -2102,6 +2139,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -2132,7 +2171,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -2140,6 +2178,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -2157,7 +2197,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -2218,7 +2257,6 @@ Array [
                 >
                   <path
                     d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    transform=""
                   />
                 </svg>
               </li>
@@ -2271,7 +2309,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -2283,7 +2320,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -2292,10 +2330,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -2323,15 +2362,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -2359,17 +2399,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current="page"
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link pf-m-current"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -2397,17 +2438,17 @@ Array [
                           >
                             Looking for devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
                           aria-disabled={true}
                           className="pf-c-wizard__nav-link pf-m-disabled"
+                          disabled={true}
                           onClick={[Function]}
-                          tabIndex={-1}
                         >
                           
                           <span
@@ -2415,19 +2456,19 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -2435,17 +2476,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -2453,17 +2494,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -2473,6 +2516,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -2579,7 +2624,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={2}
+      data-ouia-component-id="OUIA-Generated-Tabs-3"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -2608,7 +2653,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -2622,6 +2666,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -2634,6 +2680,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -2664,7 +2712,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -2672,6 +2719,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -2689,7 +2738,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -2750,7 +2798,6 @@ Array [
                 >
                   <path
                     d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    transform=""
                   />
                 </svg>
               </li>
@@ -2803,7 +2850,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -2815,7 +2861,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -2824,10 +2871,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -2855,15 +2903,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -2891,17 +2940,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current="page"
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link pf-m-current"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -2929,17 +2979,17 @@ Array [
                           >
                             Looking for devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
                           aria-disabled={true}
                           className="pf-c-wizard__nav-link pf-m-disabled"
+                          disabled={true}
                           onClick={[Function]}
-                          tabIndex={-1}
                         >
                           
                           <span
@@ -2947,19 +2997,19 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -2967,17 +3017,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -2985,17 +3035,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -3005,6 +3057,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -3111,7 +3165,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={3}
+      data-ouia-component-id="OUIA-Generated-Tabs-4"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -3140,7 +3194,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -3154,6 +3207,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -3166,6 +3221,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -3196,7 +3253,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -3204,6 +3260,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -3221,7 +3279,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -3282,7 +3339,6 @@ Array [
                 >
                   <path
                     d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    transform=""
                   />
                 </svg>
               </li>
@@ -3335,7 +3391,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -3347,7 +3402,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -3356,10 +3412,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -3387,15 +3444,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -3423,17 +3481,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current="page"
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link pf-m-current"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -3461,17 +3520,17 @@ Array [
                           >
                             Looking for devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
                           aria-disabled={true}
                           className="pf-c-wizard__nav-link pf-m-disabled"
+                          disabled={true}
                           onClick={[Function]}
-                          tabIndex={-1}
                         >
                           
                           <span
@@ -3479,19 +3538,19 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -3499,17 +3558,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -3517,17 +3576,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -3537,6 +3598,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -3643,7 +3706,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={9}
+      data-ouia-component-id="OUIA-Generated-Tabs-10"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -3672,7 +3735,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -3686,6 +3748,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -3698,6 +3762,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -3728,7 +3794,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -3736,6 +3801,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -3753,7 +3820,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -3818,7 +3884,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -3830,7 +3895,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -3839,10 +3905,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -3870,15 +3937,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -3906,17 +3974,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -3944,15 +4013,16 @@ Array [
                           >
                             Devfile is not found in repository root. Default environment will be applied
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -3980,17 +4050,18 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -4018,15 +4089,16 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -4054,17 +4126,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -4074,6 +4148,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -4180,7 +4256,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={7}
+      data-ouia-component-id="OUIA-Generated-Tabs-8"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -4209,7 +4285,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -4223,6 +4298,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -4235,6 +4312,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -4265,7 +4344,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -4273,6 +4351,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -4290,7 +4370,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -4355,7 +4434,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -4367,7 +4445,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -4376,10 +4455,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -4407,15 +4487,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -4443,17 +4524,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -4481,15 +4563,16 @@ Array [
                           >
                             Devfile is not found in repository root. Default environment will be applied
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -4517,17 +4600,18 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -4555,17 +4639,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -4573,17 +4657,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -4593,6 +4679,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
@@ -4699,7 +4787,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={8}
+      data-ouia-component-id="OUIA-Generated-Tabs-9"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="factory-loader-page-tabs"
@@ -4728,7 +4816,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -4742,6 +4829,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-factory-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-factory-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -4754,6 +4843,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-factory-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-factory-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -4784,7 +4875,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -4792,6 +4882,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-factory-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-factory-loader-page-wizard-tab"
       role="tabpanel"
@@ -4809,7 +4901,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -4874,7 +4965,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -4886,7 +4976,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -4895,10 +4986,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -4926,15 +5018,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -4962,17 +5055,18 @@ Array [
                       >
                         Creating a workspace
                       </span>
-                    </a>
+                    </button>
                     <ol
                       className="pf-c-wizard__nav-list"
                     >
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -5000,15 +5094,16 @@ Array [
                           >
                             Devfile is not found 
                           </span>
-                        </a>
+                        </button>
                       </li>
                       <li
                         className="pf-c-wizard__nav-item"
                       >
-                        <a
+                        <button
                           aria-current={false}
-                          aria-disabled={false}
+                          aria-disabled={null}
                           className="pf-c-wizard__nav-link"
+                          disabled={false}
                           onClick={[Function]}
                         >
                           <svg
@@ -5036,17 +5131,18 @@ Array [
                           >
                             Applying devfile
                           </span>
-                        </a>
+                        </button>
                       </li>
                     </ol>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -5074,17 +5170,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -5092,17 +5188,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -5112,6 +5210,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-factory-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-factory-loader-page-logs-tab"
       role="tabpanel"
diff --git a/src/pages/GetStarted/index.tsx b/src/pages/GetStarted/index.tsx
index 80b411d6..c5f5d6e6 100644
--- a/src/pages/GetStarted/index.tsx
+++ b/src/pages/GetStarted/index.tsx
@@ -174,7 +174,7 @@ export class GetStarted extends React.PureComponent<Props, State> {
         </PageSection>
         <PageSection
           variant={PageSectionVariants.light}
-          padding={{ default: 'noPadding' }}
+          className='pf-c-page-section-no-padding'
           isFilled={false}
         >
           <Tabs
diff --git a/src/pages/IdeLoader/__tests__/__snapshots__/IdeLoader.spec.tsx.snap b/src/pages/IdeLoader/__tests__/__snapshots__/IdeLoader.spec.tsx.snap
index 103861c0..0e0794d9 100644
--- a/src/pages/IdeLoader/__tests__/__snapshots__/IdeLoader.spec.tsx.snap
+++ b/src/pages/IdeLoader/__tests__/__snapshots__/IdeLoader.spec.tsx.snap
@@ -53,7 +53,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={0}
+      data-ouia-component-id="OUIA-Generated-Tabs-1"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="ide-loader-page-tabs"
@@ -82,7 +82,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -96,6 +95,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-ide-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-ide-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -108,6 +109,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-ide-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-ide-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -138,7 +141,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -146,6 +148,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-ide-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-ide-loader-page-wizard-tab"
       role="tabpanel"
@@ -163,7 +167,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -228,7 +231,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -240,7 +242,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -249,10 +252,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -280,17 +284,17 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -298,17 +302,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -316,17 +320,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -336,6 +342,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-ide-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-ide-loader-page-logs-tab"
       role="tabpanel"
@@ -442,7 +450,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={1}
+      data-ouia-component-id="OUIA-Generated-Tabs-2"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="ide-loader-page-tabs"
@@ -471,7 +479,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -485,6 +492,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-ide-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-ide-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -497,6 +506,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-ide-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-ide-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -527,7 +538,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -535,6 +545,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-ide-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-ide-loader-page-wizard-tab"
       role="tabpanel"
@@ -552,7 +564,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -617,7 +628,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -629,7 +639,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -638,10 +649,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -669,17 +681,17 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -687,17 +699,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -705,17 +717,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -725,6 +739,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-ide-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-ide-loader-page-logs-tab"
       role="tabpanel"
@@ -831,7 +847,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={4}
+      data-ouia-component-id="OUIA-Generated-Tabs-5"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="ide-loader-page-tabs"
@@ -860,7 +876,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -874,6 +889,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-ide-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-ide-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -886,6 +903,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-ide-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-ide-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -916,7 +935,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -924,6 +942,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-ide-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-ide-loader-page-wizard-tab"
       role="tabpanel"
@@ -941,7 +961,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -1006,7 +1025,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -1018,7 +1036,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -1027,10 +1046,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1058,15 +1078,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1094,15 +1115,16 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1130,17 +1152,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -1150,6 +1174,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-ide-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-ide-loader-page-logs-tab"
       role="tabpanel"
@@ -1256,7 +1282,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={5}
+      data-ouia-component-id="OUIA-Generated-Tabs-6"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="ide-loader-page-tabs"
@@ -1285,7 +1311,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1299,6 +1324,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-ide-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-ide-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -1311,6 +1338,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-ide-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-ide-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -1341,7 +1370,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1349,6 +1377,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-ide-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-ide-loader-page-wizard-tab"
       role="tabpanel"
@@ -1366,7 +1396,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -1431,7 +1460,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -1443,7 +1471,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -1452,10 +1481,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1483,15 +1513,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1519,15 +1550,16 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1555,17 +1587,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -1575,6 +1609,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-ide-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-ide-loader-page-logs-tab"
       role="tabpanel"
@@ -1693,7 +1729,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={2}
+      data-ouia-component-id="OUIA-Generated-Tabs-3"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="ide-loader-page-tabs"
@@ -1722,7 +1758,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1736,6 +1771,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-ide-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-ide-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -1748,6 +1785,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-ide-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-ide-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -1778,7 +1817,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -1786,6 +1824,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-ide-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-ide-loader-page-wizard-tab"
       role="tabpanel"
@@ -1803,7 +1843,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -1868,7 +1907,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -1880,7 +1918,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -1889,10 +1928,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1920,15 +1960,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -1956,17 +1997,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -1974,17 +2015,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -1994,6 +2037,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-ide-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-ide-loader-page-logs-tab"
       role="tabpanel"
@@ -2100,7 +2145,7 @@ Array [
   >
     <div
       className="pf-c-tabs pf-m-inset-lg"
-      data-ouia-component-id={3}
+      data-ouia-component-id="OUIA-Generated-Tabs-4"
       data-ouia-component-type="PF4/Tabs"
       data-ouia-safe={true}
       id="ide-loader-page-tabs"
@@ -2129,7 +2174,6 @@ Array [
         >
           <path
             d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"
-            transform=""
           />
         </svg>
       </button>
@@ -2143,6 +2187,8 @@ Array [
           <button
             aria-controls="pf-tab-section-0-ide-loader-page-wizard-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-0-ide-loader-page-wizard-tab"
             onClick={[Function]}
           >
@@ -2155,6 +2201,8 @@ Array [
           <button
             aria-controls="pf-tab-section-1-ide-loader-page-logs-tab"
             className="pf-c-tabs__link"
+            data-ouia-component-type="PF4/TabButton"
+            data-ouia-safe={true}
             id="pf-tab-1-ide-loader-page-logs-tab"
             onClick={[Function]}
           >
@@ -2185,7 +2233,6 @@ Array [
         >
           <path
             d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-            transform=""
           />
         </svg>
       </button>
@@ -2193,6 +2240,8 @@ Array [
     <section
       aria-labelledby="pf-tab-0-ide-loader-page-wizard-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={false}
       id="pf-tab-section-0-ide-loader-page-wizard-tab"
       role="tabpanel"
@@ -2210,7 +2259,6 @@ Array [
             }
           }
         >
-          
           <button
             aria-expanded={false}
             aria-label="Wizard Toggle"
@@ -2275,7 +2323,6 @@ Array [
               >
                 <path
                   d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                  transform=""
                 />
               </svg>
             </span>
@@ -2287,7 +2334,8 @@ Array [
               className="pf-c-wizard__inner-wrap"
             >
               <nav
-                aria-label="Steps"
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__nav"
               >
                 <ol
@@ -2296,10 +2344,11 @@ Array [
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -2327,15 +2376,16 @@ Array [
                       >
                         Initializing
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current="page"
-                      aria-disabled={false}
+                      aria-disabled={null}
                       className="pf-c-wizard__nav-link pf-m-current"
+                      disabled={false}
                       onClick={[Function]}
                     >
                       <svg
@@ -2363,17 +2413,17 @@ Array [
                       >
                         Waiting for workspace to start
                       </span>
-                    </a>
+                    </button>
                   </li>
                   <li
                     className="pf-c-wizard__nav-item"
                   >
-                    <a
+                    <button
                       aria-current={false}
                       aria-disabled={true}
                       className="pf-c-wizard__nav-link pf-m-disabled"
+                      disabled={true}
                       onClick={[Function]}
-                      tabIndex={-1}
                     >
                       
                       <span
@@ -2381,17 +2431,19 @@ Array [
                       >
                         Open IDE
                       </span>
-                    </a>
+                    </button>
                   </li>
                 </ol>
               </nav>
-              <main
+              <div
+                aria-label={null}
+                aria-labelledby={null}
                 className="pf-c-wizard__main"
               >
                 <div
                   className="pf-c-wizard__main-body"
                 />
-              </main>
+              </div>
             </div>
             <span />
           </div>
@@ -2401,6 +2453,8 @@ Array [
     <section
       aria-labelledby="pf-tab-1-ide-loader-page-logs-tab"
       className="pf-c-tab-content"
+      data-ouia-component-type="PF4/TabContent"
+      data-ouia-safe={true}
       hidden={true}
       id="pf-tab-section-1-ide-loader-page-logs-tab"
       role="tabpanel"
diff --git a/src/pages/WorkspaceDetails/Header/__tests__/Header.spec.tsx b/src/pages/WorkspaceDetails/Header/__tests__/Header.spec.tsx
deleted file mode 100644
index b97370aa..00000000
--- a/src/pages/WorkspaceDetails/Header/__tests__/Header.spec.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2018-2020 Red Hat, Inc.
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   Red Hat, Inc. - initial API and implementation
- */
-
-import React from 'react';
-import renderer, { ReactTestRendererJSON } from 'react-test-renderer';
-import { WorkspaceStatus } from '../../../../services/helpers/types';
-import { HeaderActionSelect } from '../Actions';
-import Header from '../index';
-
-jest.mock('../../../../containers/WorkspaceDetails', () => {
-  return { Actions: {} };
-});
-
-describe('Workspace details header widget', () => {
-  const workspaceName = 'test-workspace-name';
-  const workspaceId = 'test-workspace-id';
-
-  it('should render STOPPED status correctly', () => {
-    const status = WorkspaceStatus.STOPPED;
-
-    const component = createComponent(status, workspaceName, workspaceId);
-
-    expect(getComponentSnapshot(component)).toMatchSnapshot();
-  });
-
-  it('should render RUNNING status correctly', () => {
-    const status = WorkspaceStatus.RUNNING;
-
-    const component = createComponent(status, workspaceName, workspaceId);
-
-    expect(getComponentSnapshot(component)).toMatchSnapshot();
-  });
-
-});
-
-function createComponent(
-  workspaceStatus: WorkspaceStatus,
-  workspaceName: string,
-  workspaceId: string,
-): React.ReactElement {
-  return (
-    <Header workspaceName={workspaceName} status={WorkspaceStatus[workspaceStatus]}>
-      <HeaderActionSelect
-        onAction={jest.fn()}
-        workspaceId={workspaceId}
-        workspaceName={workspaceName}
-        status={WorkspaceStatus[workspaceStatus]} />
-    </Header>
-  );
-}
-
-function getComponentSnapshot(
-  component: React.ReactElement
-): null | ReactTestRendererJSON | ReactTestRendererJSON[] {
-  return renderer.create(component).toJSON();
-}
diff --git a/src/pages/WorkspaceDetails/Header/__tests__/__snapshots__/Header.spec.tsx.snap b/src/pages/WorkspaceDetails/Header/__tests__/__snapshots__/Header.spec.tsx.snap
deleted file mode 100644
index b70d3e52..00000000
--- a/src/pages/WorkspaceDetails/Header/__tests__/__snapshots__/Header.spec.tsx.snap
+++ /dev/null
@@ -1,321 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Workspace details header widget should render RUNNING status correctly 1`] = `
-<section
-  className="pf-c-page__main-section pf-m-light"
->
-  <nav
-    aria-label="Breadcrumb"
-    className="pf-c-breadcrumb"
-    data-ouia-component-id={2}
-    data-ouia-component-type="PF4/Breadcrumb"
-    data-ouia-safe={true}
-  >
-    <ol
-      className="pf-c-breadcrumb__list"
-    >
-      <li
-        className="pf-c-breadcrumb__item"
-      >
-        <a
-          className="pf-c-breadcrumb__link"
-          href="./#/workspaces"
-          target={null}
-        >
-          Workspaces
-        </a>
-        <span
-          className="pf-c-breadcrumb__item-divider"
-        >
-          <svg
-            aria-hidden={true}
-            aria-labelledby={null}
-            fill="currentColor"
-            height="1em"
-            role="img"
-            style={
-              Object {
-                "verticalAlign": "-0.125em",
-              }
-            }
-            viewBox="0 0 256 512"
-            width="1em"
-          >
-            <path
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              transform=""
-            />
-          </svg>
-        </span>
-      </li>
-      <li
-        className="pf-c-breadcrumb__item"
-      >
-        test-workspace-name
-      </li>
-    </ol>
-  </nav>
-  <div
-    className="pf-l-flex"
-  >
-    <div
-      className=""
-    >
-      <h1
-        className=""
-        data-pf-content={true}
-      >
-        test-workspace-name
-        <span
-          className="pf-c-label pf-m-green"
-        >
-          <span
-            className="pf-c-label__content"
-          >
-            <span
-              className="pf-c-label__icon"
-            >
-              <svg
-                aria-hidden={true}
-                aria-labelledby={null}
-                fill="green"
-                height="1em"
-                role="img"
-                style={
-                  Object {
-                    "verticalAlign": "-0.125em",
-                  }
-                }
-                viewBox="0 64 1024 1024"
-                width="1em"
-              >
-                <path
-                  d="M512 109.714c-181.486 0-329.143 147.657-329.143 329.143s147.657 329.143 329.143 329.143c181.486 0 329.143-147.657 329.143-329.143s-147.657-329.143-329.143-329.143zM954.743 694.171c45.714-78.4 68.571-164.114 68.571-256.914s-22.857-178.514-68.571-256.914c-45.714-78.4-107.886-140.571-186.286-186.286s-164.114-68.571-256.914-68.571c-92.8 0-178.514 22.857-256.914 68.571s-140.571 107.886-186.286 186.286c-45.486 78.4-68.343 164.114-68.343 256.914s22.857 178.514 68.571 256.914c45.714 78.4 107.886 140.343 186.286 186.057s164.114 68.571 256.914 68.571c92.8 0 178.514-22.857 256.914-68.571 78.171-45.714 140.343-107.657 186.057-186.057zM677.257 829.714c-52.571 22.629-107.886 34.057-165.486 34.057-57.829 0-112.914-11.429-165.486-34.057s-97.829-53.029-136-90.971c-37.943-37.943-68.343-83.2-90.971-136-22.629-52.571-34.057-107.886-34.057-165.486 0-57.829 11.429-112.914 34.057-165.486s53.029-97.829 90.971-136c37.943-37.943 83.2-68.343 136-90.971 52.571-22.629 107.886-34.057 165.486-34.057 57.829 0 112.914 11.429 165.486 34.057s97.829 53.029 136 90.971c37.943 37.943 68.343 83.2 90.971 136 22.629 52.571 34.057 107.886 34.057 165.486 0 57.829-11.429 112.914-34.057 165.486s-53.029 97.829-90.971 136c-37.943 37.943-83.429 68.343-136 90.971z"
-                  transform="rotate(180 0 512) scale(-1 1)"
-                />
-              </svg>
-            </span>
-            Running
-          </span>
-        </span>
-      </h1>
-    </div>
-    <div
-      className="pf-m-align-right"
-    >
-      <div
-        className="pf-c-dropdown pf-m-align-right workspace-action-selector"
-        data-ouia-component-id={3}
-        data-ouia-component-type="PF4/Dropdown"
-        data-ouia-safe={true}
-      >
-        <button
-          aria-expanded={false}
-          aria-haspopup={true}
-          className="pf-c-dropdown__toggle pf-m-primary"
-          data-testid="test-workspace-id-action-dropdown"
-          disabled={false}
-          id="pf-toggle-id-1"
-          onClick={[Function]}
-          onKeyDown={[Function]}
-          type="button"
-        >
-          <span
-            className="pf-c-dropdown__toggle-text"
-          >
-            Actions
-          </span>
-          <span
-            className="pf-c-dropdown__toggle-icon"
-          >
-            <svg
-              aria-hidden={true}
-              aria-labelledby={null}
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style={
-                Object {
-                  "verticalAlign": "-0.125em",
-                }
-              }
-              viewBox="0 0 320 512"
-              width="1em"
-            >
-              <path
-                d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                transform=""
-              />
-            </svg>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-</section>
-`;
-
-exports[`Workspace details header widget should render STOPPED status correctly 1`] = `
-<section
-  className="pf-c-page__main-section pf-m-light"
->
-  <nav
-    aria-label="Breadcrumb"
-    className="pf-c-breadcrumb"
-    data-ouia-component-id={0}
-    data-ouia-component-type="PF4/Breadcrumb"
-    data-ouia-safe={true}
-  >
-    <ol
-      className="pf-c-breadcrumb__list"
-    >
-      <li
-        className="pf-c-breadcrumb__item"
-      >
-        <a
-          className="pf-c-breadcrumb__link"
-          href="./#/workspaces"
-          target={null}
-        >
-          Workspaces
-        </a>
-        <span
-          className="pf-c-breadcrumb__item-divider"
-        >
-          <svg
-            aria-hidden={true}
-            aria-labelledby={null}
-            fill="currentColor"
-            height="1em"
-            role="img"
-            style={
-              Object {
-                "verticalAlign": "-0.125em",
-              }
-            }
-            viewBox="0 0 256 512"
-            width="1em"
-          >
-            <path
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              transform=""
-            />
-          </svg>
-        </span>
-      </li>
-      <li
-        className="pf-c-breadcrumb__item"
-      >
-        test-workspace-name
-      </li>
-    </ol>
-  </nav>
-  <div
-    className="pf-l-flex"
-  >
-    <div
-      className=""
-    >
-      <h1
-        className=""
-        data-pf-content={true}
-      >
-        test-workspace-name
-        <span
-          className="pf-c-label"
-          style={
-            Object {
-              "color": "grey",
-            }
-          }
-        >
-          <span
-            className="pf-c-label__content"
-          >
-            <span
-              className="pf-c-label__icon"
-            >
-              <svg
-                aria-hidden="true"
-                fill="#151515"
-                height="1em"
-                role="img"
-                style={
-                  Object {
-                    "verticalAlign": "-0.125em",
-                  }
-                }
-                viewBox="0 0 16 16"
-                width="1em"
-              >
-                <path
-                  d="M8.001,0 C3.589,0 0,3.590 0,8 C0,12.410 3.590,16 8.001,16 C12.412,16 16,12.410
-               16,8 C16,3.589 12.4125,0 8.001,0 Z M8,14 C4.690,14 2,11.310 2,8 C2,4.692 4.690,2
-               8,2 C11.307,2 14,4.690 14,8 C14,11.309 11.307,14 8,14 Z"
-                />
-                <path
-                  d="M8.001,3.5 C5.519,3.5 3.5,5.520 3.5,8 C3.5,10.481 5.520,12.5 8.000,12.5 C10.482,12.5 12.5,10.481
-               12.5,8 C12.5,5.519 10.482,3.5 8.000,3.5 Z M8,10.75 C6.483,10.75 5.25,9.517 5.25,8 C5.25,6.484
-               6.483,5.25 8,5.25 C9.516,5.25 10.75,6.483 10.75,8 C10.75,9.516 9.516,10.75 8,10.75 Z"
-                />
-              </svg>
-            </span>
-            Stopped
-          </span>
-        </span>
-      </h1>
-    </div>
-    <div
-      className="pf-m-align-right"
-    >
-      <div
-        className="pf-c-dropdown pf-m-align-right workspace-action-selector"
-        data-ouia-component-id={1}
-        data-ouia-component-type="PF4/Dropdown"
-        data-ouia-safe={true}
-      >
-        <button
-          aria-expanded={false}
-          aria-haspopup={true}
-          className="pf-c-dropdown__toggle pf-m-primary"
-          data-testid="test-workspace-id-action-dropdown"
-          disabled={false}
-          id="pf-toggle-id-0"
-          onClick={[Function]}
-          onKeyDown={[Function]}
-          type="button"
-        >
-          <span
-            className="pf-c-dropdown__toggle-text"
-          >
-            Actions
-          </span>
-          <span
-            className="pf-c-dropdown__toggle-icon"
-          >
-            <svg
-              aria-hidden={true}
-              aria-labelledby={null}
-              fill="currentColor"
-              height="1em"
-              role="img"
-              style={
-                Object {
-                  "verticalAlign": "-0.125em",
-                }
-              }
-              viewBox="0 0 320 512"
-              width="1em"
-            >
-              <path
-                d="M31.3 192h257.3c17.8 0 26.7 21.5 14.1 34.1L174.1 354.8c-7.8 7.8-20.5 7.8-28.3 0L17.2 226.1C4.6 213.5 13.5 192 31.3 192z"
-                transform=""
-              />
-            </svg>
-          </span>
-        </button>
-      </div>
-    </div>
-  </div>
-</section>
-`;
diff --git a/yarn.lock b/yarn.lock
index 43b3dfe8..bc77f5c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -728,16 +728,39 @@
     tippy.js "5.1.2"
     tslib "^1.11.1"
 
+"@patternfly/react-core@^4.23.1":
+  version "4.84.4"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.84.4.tgz#e3061596f0ac02c5cb181f41201293ba073013a1"
+  integrity sha512-GIv6zJl+NGYIrSm2pATQFggRt4ZFYUKVNbLSsna2x8+eYeZscqIUFSPmBM+eNpQkGaoJk254Lu09pgm4hM/b4g==
+  dependencies:
+    "@patternfly/react-icons" "^4.7.22"
+    "@patternfly/react-styles" "^4.7.22"
+    "@patternfly/react-tokens" "^4.9.22"
+    focus-trap "6.2.2"
+    react-dropzone "9.0.0"
+    tippy.js "5.1.2"
+    tslib "1.13.0"
+
 "@patternfly/react-icons@^4.3.5":
   version "4.3.5"
   resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.3.5.tgz#b98c5af80f4729e6203c8e799ace2f57308b3b9a"
   integrity sha512-+GublxpFXR+y/5zygf9q00/LvIvso8jr0mxZGhVxsKmi2dUu7xAvN+T+5vjS9fiMbXf7WXsSPXST/UTiBIVTdQ==
 
+"@patternfly/react-icons@^4.7.22":
+  version "4.7.22"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.7.22.tgz#ee8c4f66020abf200cbdd233fba27d004dea562f"
+  integrity sha512-JDsnebr9CNIyrv9yjaGFQ56OChbV6KcxMYBIpNc8/sZdU4TXHWNC7P7rlUM/BuGpbWvyaOJtscRuf5uteIKX3A==
+
 "@patternfly/react-styles@^4.3.4":
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.3.4.tgz#ba62f983f1bd2586d2878d8a38912442ebca85e8"
   integrity sha512-d5W5G9g7sr7DthGPFiF6Oa33w8JFJ+ocLZDogyZcS1Oq0BJJX8j+hZNXZfhXxmHoXufxQL6RJ4dOyoa2zEZUvA==
 
+"@patternfly/react-styles@^4.7.22":
+  version "4.7.22"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.7.22.tgz#fda249c5ee03db965cad648da92aa1caa7eff02f"
+  integrity sha512-ojNuSNJx6CkNtsSFseZ2SJEVyzPMFYh0jOs204ICzYM1+fn9acsIi3Co0bcskFRzw8F6e2/x+8uVNx6QI8elxg==
+
 "@patternfly/react-table@^4.5.7":
   version "4.5.7"
   resolved "https://registry.yarnpkg.com/@patternfly/react-table/-/react-table-4.5.7.tgz#515e9e358a0451b04782d967c3b2df462e8e5fc7"
@@ -758,6 +781,11 @@
   resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.4.4.tgz#4a6fc7234908343087ccbc8e1ae53336d7fc7311"
   integrity sha512-vhDBtwkp1PTAqXDjAsUPRf/ewBh2Asong8MPr9ZGeXAeOULW8creW7GJx+JZX9eaEJMA3ESMeZ6wZ5j/yyWMGQ==
 
+"@patternfly/react-tokens@^4.9.22":
+  version "4.9.22"
+  resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.9.22.tgz#d23488cddf19ad065ef55bd43b47336ee63bf4cc"
+  integrity sha512-hN/8u7mFR62naFB2hdO7nl1p/0lCXtNq+VY+BAbp4UFC2/QyjNP0IOPBR+mR9Pbj5JwxrURI7G5blLp+k9RLvQ==
+
 "@sinonjs/commons@^1.7.0":
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.0.tgz#c8d68821a854c555bba172f3b06959a0039b236d"
@@ -4211,6 +4239,13 @@ focus-trap@4.0.2:
     tabbable "^3.1.2"
     xtend "^4.0.1"
 
+focus-trap@6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.2.2.tgz#0e6f391415b0697c99da932702dedd13084fa131"
+  integrity sha512-qWovH9+LGoKqREvJaTCzJyO0hphQYGz+ap5Hc4NqXHNhZBdxCi5uBPPcaOUw66fHmzXLVwvETLvFgpwPILqKpg==
+  dependencies:
+    tabbable "^5.1.4"
+
 follow-redirects@1.5.10:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
@@ -9638,6 +9673,11 @@ tabbable@^3.1.2:
   resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-3.1.2.tgz#f2d16cccd01f400e38635c7181adfe0ad965a4a2"
   integrity sha512-wjB6puVXTYO0BSFtCmWQubA/KIn7Xvajw0x0l6eJUudMG/EAiJvIUnyNX6xO4NpGrJ16lbD0eUseB9WxW0vlpQ==
 
+tabbable@^5.1.4:
+  version "5.1.5"
+  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.1.5.tgz#efec48ede268d511c261e3b81facbb4782a35147"
+  integrity sha512-oVAPrWgLLqrbvQE8XqcU7CVBq6SQbaIbHkhOca3u7/jzuQvyZycrUKPCGr04qpEIUslmUlULbSeN+m3QrKEykA==
+
 table@^5.0.0, table@^5.2.3, table@^5.4.6:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -9898,7 +9938,7 @@ ts-loader@^7.0.5:
     micromatch "^4.0.0"
     semver "^6.0.0"
 
-tslib@^1.10.0, tslib@^1.11.1:
+tslib@1.13.0, tslib@^1.10.0, tslib@^1.11.1:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==