diff --git a/src/Components/DomainList/DomainList.tsx b/src/Components/DomainList/DomainList.tsx
index 21c6192..61888e6 100644
--- a/src/Components/DomainList/DomainList.tsx
+++ b/src/Components/DomainList/DomainList.tsx
@@ -216,7 +216,7 @@ export const DomainList = () => {
     <>
       <TableComposable>
         <Thead>
-          <Tr>
+          <Tr ouiaId="TrDomainListHeader">
             <Th sort={getSortParams(0)}>Name</Th>
             <Th>Type</Th>
             <Th sort={getSortParams(3)}>Domain auto-join on launch</Th>
@@ -241,7 +241,7 @@ export const DomainList = () => {
                       onClick={() => {
                         onShowDetails(domain);
                       }}
-                      ouiaId="LinkListDomainDetails"
+                      ouiaId="LinkDomainListDetails"
                     >
                       {domain.title}
                     </Button>
diff --git a/src/Routes/DefaultPage/DefaultPage.tsx b/src/Routes/DefaultPage/DefaultPage.tsx
index 947432e..e88cac0 100644
--- a/src/Routes/DefaultPage/DefaultPage.tsx
+++ b/src/Routes/DefaultPage/DefaultPage.tsx
@@ -36,7 +36,7 @@ const Header = () => {
 
   return (
     <PageHeader>
-      <PageHeaderTitle title={title} ouiaId="TextDefaultTitle" />
+      <PageHeaderTitle title={title} />
       <p>
         Manage registered identity domains to leverage host access controls from your existing identity and access management.{' '}
         <Button
@@ -77,7 +77,7 @@ const EmptyContent = () => {
         <Bullseye>
           <EmptyState variant={EmptyStateVariant.full}>
             <EmptyStateIcon icon={RegistryIcon} />
-            <Title headingLevel="h2" size="lg" className="pf-u-pt-sm">
+            <Title headingLevel="h2" size="lg" className="pf-u-pt-sm" ouiaId="TitleEmptyContent">
               No identity domains registered
             </Title>
             <EmptyStateBody>
diff --git a/src/Routes/DetailPage/Components/FilterField/filter-field.tsx b/src/Routes/DetailPage/Components/FilterField/filter-field.tsx
index 9f726e9..d50fec8 100644
--- a/src/Routes/DetailPage/Components/FilterField/filter-field.tsx
+++ b/src/Routes/DetailPage/Components/FilterField/filter-field.tsx
@@ -36,6 +36,7 @@ export const InputFilterServer = (props: InputFilterServerProps) => {
       key="Name"
       value="Name"
       component="button"
+      ouiaId="DropitemFilterFieldName"
       onClick={() => {
         setFilter('Name');
       }}
@@ -46,6 +47,7 @@ export const InputFilterServer = (props: InputFilterServerProps) => {
       key="Location"
       value="Location"
       component="button"
+      ouiaId="DropitemFilterFieldLocation"
       onClick={() => {
         setFilter('Location');
       }}
@@ -70,9 +72,16 @@ export const InputFilterServer = (props: InputFilterServerProps) => {
           }
           isOpen={isOpen}
           dropdownItems={dropdownItems}
+          ouiaId="DropdownFilterField"
         />
-        <TextInput id="input-filter-dropdown" aria-label="input with dropdown and button" value={value} onChange={onChange} />
-        <Button id="input-filter-button" variant="control" icon={<SearchIcon />} />
+        <TextInput
+          id="input-filter-dropdown"
+          aria-label="input with dropdown and button"
+          value={value}
+          onChange={onChange}
+          ouiaId="TextinputFilterField"
+        />
+        <Button id="input-filter-button" variant="control" icon={<SearchIcon />} ouiaId="ButtonFilterField" />
       </InputGroup>
     </>
   );
diff --git a/src/Routes/DetailPage/DetailPage.tsx b/src/Routes/DetailPage/DetailPage.tsx
index f005119..3eb62e3 100644
--- a/src/Routes/DetailPage/DetailPage.tsx
+++ b/src/Routes/DetailPage/DetailPage.tsx
@@ -132,6 +132,7 @@ const DetailPage = () => {
                 isPlain
                 dropdownItems={dropdownItems}
                 position="right"
+                ouiaId=""
               />
             </FlexItem>
           </Flex>
@@ -148,7 +149,7 @@ const DetailPage = () => {
           </Tabs>
         </PageHeader>
         <PageSection>
-          <Card>
+          <Card ouiaId="CardDetailPage">
             <CardBody>
               {activeTabKey === 0 && (
                 <DetailGeneral
diff --git a/src/Routes/WizardPage/Components/PagePreparation/PagePreparation.tsx b/src/Routes/WizardPage/Components/PagePreparation/PagePreparation.tsx
index cc305cf..50ab156 100644
--- a/src/Routes/WizardPage/Components/PagePreparation/PagePreparation.tsx
+++ b/src/Routes/WizardPage/Components/PagePreparation/PagePreparation.tsx
@@ -75,7 +75,7 @@ const PagePreparation = (props: PagePreparationProps) => {
 
   return (
     <>
-      <Title headingLevel={'h2'} ouiaId="TextWizardPagePreparationTitle">
+      <Title headingLevel={'h2'} ouiaId="TextPagePreparationTitle">
         Preparation for your identity domain registration
       </Title>
       <Form
@@ -88,7 +88,7 @@ const PagePreparation = (props: PagePreparationProps) => {
             title={'Only Red Hat Identity Management (IdM) is currently supported.'}
             variant="info"
             isInline
-            ouiaId="AlertWizardPagePrepare"
+            ouiaId="AlertPagePreparationPrepare"
           ></Alert>
         </FormGroup>
         <FormGroup label="Identity domain prerequisites">
@@ -103,7 +103,7 @@ const PagePreparation = (props: PagePreparationProps) => {
                 iconPosition="right"
                 isInline
                 href={prerequisitesLink}
-                ouiaId="ButtonWizardPagePreparePrerequisites"
+                ouiaId="ButtonPagePreparationPrerequisites"
               >
                 prerequisites
               </Button>
@@ -126,11 +126,11 @@ const PagePreparation = (props: PagePreparationProps) => {
                   iconPosition="right"
                   isInline
                   href={installServerPackagesLink}
-                  ouiaId="LinkWizardPagePrepareInstall"
+                  ouiaId="LinkPagePreparationInstall"
                 >
                   steps to install the server packages
                 </Button>
-                <ClipboardCopy hoverTip="copy" clickTip="Copied" isReadOnly ouiaId="TextWizardPagePrepareInstallPackage">
+                <ClipboardCopy hoverTip="copy" clickTip="Copied" isReadOnly ouiaId="TextPagePreparationInstallPackage">
                   dnf copr enable @podengo/ipa-hcc && dnf install ipa-hcc-server
                 </ClipboardCopy>
               </TextContent>
diff --git a/src/Routes/WizardPage/Components/PageReview/PageReview.tsx b/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
index 338b478..39b4b19 100644
--- a/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
+++ b/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
@@ -27,7 +27,7 @@ import { TableComposable, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-tab
 const PageReviewIpaServersHead = () => {
   return (
     <Thead>
-      <Tr>
+      <Tr ouiaId="TrPageReviewIpaServers">
         <Th>Name</Th>
         <Th>UUID</Th>
       </Tr>
diff --git a/src/Routes/WizardPage/Components/PageServiceDetails/PageServiceDetails.tsx b/src/Routes/WizardPage/Components/PageServiceDetails/PageServiceDetails.tsx
index 92889a6..26518c9 100644
--- a/src/Routes/WizardPage/Components/PageServiceDetails/PageServiceDetails.tsx
+++ b/src/Routes/WizardPage/Components/PageServiceDetails/PageServiceDetails.tsx
@@ -70,7 +70,7 @@ const PageServiceDetails = (props: PageServiceDetailsProps) => {
   return (
     <>
       <Form onSubmit={(e) => e.preventDefault()}>
-        <Title headingLevel={'h2'} ouiaId="TextWizardDetailsTitle">
+        <Title headingLevel={'h2'} ouiaId="TitleWizardDetailsTitle">
           Add your identity domain information
         </Title>
         <FormGroup label="Display name" isRequired fieldId="register-title">
@@ -79,7 +79,7 @@ const PageServiceDetails = (props: PageServiceDetailsProps) => {
             value={title}
             onChange={onChangeTitle}
             className="pf-u-w-100 pf-u-w-50-on-md pf-u-w-50-on-xl"
-            ouiaId="TextWizardDetailsDomainTitle"
+            ouiaId="TextinputWizardDetailsDomainTitle"
           />
         </FormGroup>
         <FormGroup label="Description" fieldId="register-description">
@@ -113,7 +113,7 @@ const PageServiceDetails = (props: PageServiceDetailsProps) => {
             isChecked={isAutoEnrollmentEnabled}
             hasCheckIcon
             onChange={onChangeAutoEnrollment}
-            ouiaId="ButtonWizardDetailsDomainAutoenrollment"
+            ouiaId="SwitchWizardDetailsDomainAutoenrollment"
           />
         </FormGroup>
       </Form>
diff --git a/src/Routes/WizardPage/Components/PageServiceRegistration/PageServiceRegistration.tsx b/src/Routes/WizardPage/Components/PageServiceRegistration/PageServiceRegistration.tsx
index d40ee5c..ca10820 100644
--- a/src/Routes/WizardPage/Components/PageServiceRegistration/PageServiceRegistration.tsx
+++ b/src/Routes/WizardPage/Components/PageServiceRegistration/PageServiceRegistration.tsx
@@ -60,7 +60,7 @@ const PageServiceRegistration = (props: PageServiceRegistrationProp) => {
 
   return (
     <>
-      <Title headingLevel={'h2'} ouiaId="TextWizardRegistrationTitle">
+      <Title headingLevel={'h2'} ouiaId="TitleWizardRegistration">
         Register your identity domain
       </Title>
       <Form onSubmit={(e) => e.preventDefault()}>