diff --git a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
index 6091153f111..12bdfebdcf5 100644
--- a/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
+++ b/packages/react-core/src/components/DatePicker/__tests__/__snapshots__/DatePicker.test.tsx.snap
@@ -127,6 +127,9 @@ exports[`With popover opened 1`] = `
                     <button
                       aria-expanded="false"
                       class="pf-v5-c-menu-toggle"
+                      data-ouia-component-id="OUIA-Generated-MenuToggle-1"
+                      data-ouia-component-type="PF5/MenuToggle"
+                      data-ouia-safe="true"
                       style="width: 140px;"
                       type="button"
                     >
diff --git a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
index 05c7b4a1b92..0b254abb3aa 100644
--- a/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
+++ b/packages/react-core/src/components/MenuToggle/MenuToggle.tsx
@@ -6,6 +6,7 @@ import { BadgeProps } from '../Badge';
 import CheckCircleIcon from '@patternfly/react-icons/dist/esm/icons/check-circle-icon';
 import ExclamationCircleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon';
 import ExclamationTriangleIcon from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon';
+import { OUIAProps, getDefaultOUIAId, getOUIAProps } from '../../helpers';
 
 export enum MenuToggleStatus {
   success = 'success',
@@ -24,12 +25,13 @@ export interface SplitButtonOptions {
 
 export interface MenuToggleProps
   extends Omit<
-    React.DetailedHTMLProps<
-      React.ButtonHTMLAttributes<HTMLButtonElement> & React.HTMLAttributes<HTMLDivElement>,
-      MenuToggleElement
+      React.DetailedHTMLProps<
+        React.ButtonHTMLAttributes<HTMLButtonElement> & React.HTMLAttributes<HTMLDivElement>,
+        MenuToggleElement
+      >,
+      'ref'
     >,
-    'ref'
-  > {
+    OUIAProps {
   /** Content rendered inside the toggle */
   children?: React.ReactNode;
   /** Additional classes added to the toggle */
@@ -58,16 +60,29 @@ export interface MenuToggleProps
   badge?: BadgeProps | React.ReactNode;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<MenuToggleElement>;
+  /** Value to overwrite the randomly generated data-ouia-component-id. It will always target the toggle button. */
+  ouiaId?: number | string;
+  /** Set the value of data-ouia-safe. Only set to true when the component is in a static state, i.e. no animations are occurring. At all other times, this value must be false. */
+  ouiaSafe?: boolean;
 }
 
-class MenuToggleBase extends React.Component<MenuToggleProps> {
+interface MenuToggleState {
+  ouiaStateId: string;
+}
+
+class MenuToggleBase extends React.Component<MenuToggleProps, MenuToggleState> {
   displayName = 'MenuToggleBase';
   static defaultProps: MenuToggleProps = {
     className: '',
     isExpanded: false,
     isDisabled: false,
     isFullWidth: false,
-    isFullHeight: false
+    isFullHeight: false,
+    ouiaSafe: true
+  };
+
+  state: MenuToggleState = {
+    ouiaStateId: getDefaultOUIAId(MenuToggle.displayName, this.props.variant)
   };
 
   render() {
@@ -87,12 +102,16 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
       innerRef,
       onClick,
       'aria-label': ariaLabel,
+      ouiaId,
+      ouiaSafe,
       ...otherProps
     } = this.props;
     const isPlain = variant === 'plain';
     const isPlainText = variant === 'plainText';
     const isTypeahead = variant === 'typeahead';
 
+    const ouiaProps = getOUIAProps(MenuToggle.displayName, ouiaId ?? this.state.ouiaStateId, ouiaSafe);
+
     let _statusIcon = statusIcon;
     if (!statusIcon) {
       switch (status) {
@@ -130,6 +149,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
             onClick={onClick}
             aria-label={ariaLabel || 'Menu toggle'}
             tabIndex={-1}
+            {...ouiaProps}
           >
             {toggleControls}
           </button>
@@ -189,6 +209,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
             onClick={onClick}
             {...(children && { style: { display: 'flex', paddingLeft: 'var(--pf-v5-global--spacer--sm)' } })}
             {...otherProps}
+            {...ouiaProps}
           >
             {children && <span className={css(styles.menuToggleText)}>{children}</span>}
             {toggleControls}
@@ -207,6 +228,7 @@ class MenuToggleBase extends React.Component<MenuToggleProps> {
         disabled={isDisabled}
         onClick={onClick}
         {...componentProps}
+        {...ouiaProps}
       />
     );
   }
diff --git a/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap b/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap
index c6e38c9a7d4..e63cef2610c 100644
--- a/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap
+++ b/packages/react-core/src/components/MenuToggle/__tests__/__snapshots__/MenuToggle.test.tsx.snap
@@ -5,6 +5,9 @@ exports[`menu toggle passes additional classes 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle test-class"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-2"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -42,6 +45,9 @@ exports[`menu toggle renders successfully 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-1"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -79,6 +85,9 @@ exports[`menu toggle shows badge 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-6"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -125,6 +134,9 @@ exports[`menu toggle shows icon 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-5"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -179,6 +191,9 @@ exports[`menu toggle shows isDisabled 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle pf-m-disabled"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-4"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     disabled=""
     type="button"
   >
@@ -217,6 +232,9 @@ exports[`menu toggle shows isExpanded 1`] = `
   <button
     aria-expanded="true"
     class="pf-v5-c-menu-toggle pf-m-expanded"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-3"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -254,6 +272,9 @@ exports[`menu toggle shows isPlain 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle pf-m-plain"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-plain-1"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <svg
@@ -278,6 +299,9 @@ exports[`menu toggle shows isPrimary 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle pf-m-primary"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-primary-1"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -315,6 +339,9 @@ exports[`menu toggle shows plain text 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
diff --git a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap
index 2318ccc5400..14da8ed255b 100644
--- a/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/Generated/__snapshots__/PaginationOptionsMenu.test.tsx.snap
@@ -6,6 +6,9 @@ exports[`PaginationOptionsMenu should match snapshot (auto-generated) 1`] = `
     aria-expanded="false"
     aria-haspopup="listbox"
     class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     id="''-toggle"
     type="button"
   >
diff --git a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
index 4b903de5555..759de221bc9 100644
--- a/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
+++ b/packages/react-core/src/components/Pagination/__tests__/__snapshots__/Pagination.test.tsx.snap
@@ -26,6 +26,9 @@ exports[`Pagination API verify inset2xl inset breakpoints 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-45"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -232,6 +235,9 @@ exports[`Pagination API verify insetLg inset breakpoints 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-43"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -438,6 +444,9 @@ exports[`Pagination API verify insetMd inset breakpoints 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-42"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -644,6 +653,9 @@ exports[`Pagination API verify insetNone inset breakpoints 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-40"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -850,6 +862,9 @@ exports[`Pagination API verify insetSm inset breakpoints 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-41"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -1056,6 +1071,9 @@ exports[`Pagination API verify insetXl inset breakpoints 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-44"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -1255,6 +1273,9 @@ exports[`Pagination component render custom pagination toggle 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-13"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -1458,6 +1479,9 @@ exports[`Pagination component render custom perPageOptions 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-10"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -1668,6 +1692,9 @@ exports[`Pagination component render custom start end 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-11"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -2045,6 +2072,9 @@ exports[`Pagination component render last page 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-9"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -2255,6 +2285,9 @@ exports[`Pagination component render limited number of pages 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-7"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -2456,6 +2489,9 @@ exports[`Pagination component render should render correctly bottom 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-2"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-bottom-toggle"
       type="button"
     >
@@ -2654,6 +2690,9 @@ exports[`Pagination component render should render correctly bottom sticky 1`] =
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-5"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-bottom-toggle"
       type="button"
     >
@@ -2864,6 +2903,9 @@ exports[`Pagination component render should render correctly compact 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-3"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -2993,6 +3035,9 @@ exports[`Pagination component render should render correctly disabled 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text pf-m-disabled"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-6"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       disabled=""
       id="options-menu-top-toggle"
       type="button"
@@ -3207,6 +3252,9 @@ exports[`Pagination component render should render correctly sticky 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-4"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -3417,6 +3465,9 @@ exports[`Pagination component render should render correctly top 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-1"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -3627,6 +3678,9 @@ exports[`Pagination component render titles 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-12"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -3837,6 +3891,9 @@ exports[`Pagination component render up drop direction 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-14"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
@@ -4047,6 +4104,9 @@ exports[`Pagination component render zero results 1`] = `
       aria-expanded="false"
       aria-haspopup="listbox"
       class="pf-v5-c-menu-toggle pf-m-plain pf-m-text"
+      data-ouia-component-id="OUIA-Generated-MenuToggle-plainText-8"
+      data-ouia-component-type="PF5/MenuToggle"
+      data-ouia-safe="true"
       id="options-menu-top-toggle"
       type="button"
     >
diff --git a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
index 91e79a7ef26..b1be83ba00b 100644
--- a/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
+++ b/packages/react-table/src/deprecated/components/Table/__tests__/__snapshots__/Table.test.tsx.snap
@@ -163,6 +163,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-11"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -237,6 +240,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-12"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -311,6 +317,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-13"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -385,6 +394,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-14"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -459,6 +471,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-15"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -533,6 +548,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-16"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -607,6 +625,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-17"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -681,6 +702,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-18"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -755,6 +779,9 @@ exports[`Table Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-19"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -5777,6 +5804,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-1"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -5851,6 +5881,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-2"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -5925,6 +5958,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-3"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -5999,6 +6035,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-4"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -6073,6 +6112,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-5"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -6147,6 +6189,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-6"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -6221,6 +6266,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-7"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -6295,6 +6343,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-8"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -6369,6 +6420,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-9"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             type="button"
           >
             <svg
@@ -6443,6 +6497,9 @@ exports[`Table Simple Actions table 1`] = `
             aria-expanded="false"
             aria-label="Kebab toggle"
             class="pf-v5-c-menu-toggle pf-m-plain pf-m-disabled"
+            data-ouia-component-id="OUIA-Generated-MenuToggle-plain-10"
+            data-ouia-component-type="PF5/MenuToggle"
+            data-ouia-safe="true"
             disabled=""
             type="button"
           >
diff --git a/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/DropdownSimple.test.tsx.snap b/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/DropdownSimple.test.tsx.snap
index c1f0b5cab98..7a001d2e1d2 100644
--- a/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/DropdownSimple.test.tsx.snap
+++ b/packages/react-templates/src/components/Dropdown/__tests__/__snapshots__/DropdownSimple.test.tsx.snap
@@ -5,6 +5,9 @@ exports[`Dropdown items Matches snapshot 1`] = `
   <button
     aria-expanded="true"
     class="pf-v5-c-menu-toggle pf-m-expanded"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-default-21"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
@@ -114,6 +117,9 @@ exports[`Dropdown toggle Matches snapshot 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-default-12"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     type="button"
   >
     <span
diff --git a/packages/react-templates/src/components/Select/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap b/packages/react-templates/src/components/Select/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap
index 6d8189bf009..aa1f97858a8 100644
--- a/packages/react-templates/src/components/Select/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap
+++ b/packages/react-templates/src/components/Select/__snapshots__/CheckboxSelectSnapshots.test.tsx.snap
@@ -5,6 +5,9 @@ exports[`checkbox select with no props snapshot 1`] = `
   <button
     aria-expanded="false"
     class="pf-v5-c-menu-toggle"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-1"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     style="width: 200px;"
     type="button"
   >
@@ -43,6 +46,9 @@ exports[`opened checkbox select snapshot 1`] = `
   <button
     aria-expanded="true"
     class="pf-v5-c-menu-toggle pf-m-expanded"
+    data-ouia-component-id="OUIA-Generated-MenuToggle-2"
+    data-ouia-component-type="PF5/MenuToggle"
+    data-ouia-safe="true"
     style="width: 200px;"
     type="button"
   >