diff --git a/packages/react-core/src/components/Form/Form.tsx b/packages/react-core/src/components/Form/Form.tsx
index eae7a974c0f..fdedde6f75d 100644
--- a/packages/react-core/src/components/Form/Form.tsx
+++ b/packages/react-core/src/components/Form/Form.tsx
@@ -2,8 +2,9 @@ import { forwardRef } from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { css } from '@patternfly/react-styles';
 import cssMaxWidth from '@patternfly/react-tokens/dist/esm/c_form_m_limit_width_MaxWidth';
+import { useOUIAProps, OUIAProps } from '../../helpers';
 
-export interface FormProps extends Omit<React.HTMLProps<HTMLFormElement>, 'ref'> {
+export interface FormProps extends Omit<React.HTMLProps<HTMLFormElement>, 'ref'>, OUIAProps {
   /** Anything that can be rendered as Form content. */
   children?: React.ReactNode;
   /** Additional classes added to the Form. */
@@ -16,6 +17,10 @@ export interface FormProps extends Omit<React.HTMLProps<HTMLFormElement>, 'ref'>
   maxWidth?: string;
   /** @hide Forwarded ref */
   innerRef?: React.Ref<any>;
+  /** Value to overwrite the randomly generated data-ouia-component-id.*/
+  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;
 }
 
 const FormBase: React.FunctionComponent<FormProps> = ({
@@ -25,28 +30,34 @@ const FormBase: React.FunctionComponent<FormProps> = ({
   isWidthLimited = false,
   maxWidth = '',
   innerRef,
+  ouiaId,
+  ouiaSafe = true,
   ...props
-}: FormProps) => (
-  <form
-    noValidate
-    {...(maxWidth && {
-      style: {
-        [cssMaxWidth.name]: maxWidth,
-        ...props.style
-      } as React.CSSProperties
-    })}
-    {...props}
-    className={css(
-      styles.form,
-      isHorizontal && styles.modifiers.horizontal,
-      (isWidthLimited || maxWidth) && styles.modifiers.limitWidth,
-      className
-    )}
-    ref={innerRef}
-  >
-    {children}
-  </form>
-);
+}: FormProps) => {
+  const ouiaProps = useOUIAProps(Form.displayName, ouiaId, ouiaSafe);
+  return (
+    <form
+      noValidate
+      {...(maxWidth && {
+        style: {
+          [cssMaxWidth.name]: maxWidth,
+          ...props.style
+        } as React.CSSProperties
+      })}
+      {...props}
+      {...ouiaProps}
+      className={css(
+        styles.form,
+        isHorizontal && styles.modifiers.horizontal,
+        (isWidthLimited || maxWidth) && styles.modifiers.limitWidth,
+        className
+      )}
+      ref={innerRef}
+    >
+      {children}
+    </form>
+  );
+};
 
 export const Form = forwardRef((props: FormProps, ref: React.Ref<any>) => <FormBase innerRef={ref} {...props} />);
 
diff --git a/packages/react-core/src/components/Form/FormGroup.tsx b/packages/react-core/src/components/Form/FormGroup.tsx
index 76ebebaaec6..abde71667e0 100644
--- a/packages/react-core/src/components/Form/FormGroup.tsx
+++ b/packages/react-core/src/components/Form/FormGroup.tsx
@@ -2,9 +2,9 @@ import { Fragment, isValidElement } from 'react';
 import styles from '@patternfly/react-styles/css/components/Form/form';
 import { ASTERISK } from '../../helpers/htmlConstants';
 import { css } from '@patternfly/react-styles';
-import { useSSRSafeId } from '../../helpers';
+import { useSSRSafeId, useOUIAProps, OUIAProps } from '../../helpers';
 
-export interface FormGroupProps extends Omit<React.HTMLProps<HTMLDivElement>, 'label'> {
+export interface FormGroupProps extends Omit<React.HTMLProps<HTMLDivElement>, 'label'>, OUIAProps {
   /** Anything that can be rendered as FormGroup content. */
   children?: React.ReactNode;
   /** Additional classes added to the FormGroup. */
@@ -31,6 +31,10 @@ export interface FormGroupProps extends Omit<React.HTMLProps<HTMLDivElement>, 'l
    * radio inputs, or pass in "group" when the form group contains multiple of any other input type.
    */
   role?: string;
+  /** Value to overwrite the randomly generated data-ouia-component-id.*/
+  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;
 }
 
 export const FormGroup: React.FunctionComponent<FormGroupProps> = ({
@@ -45,8 +49,11 @@ export const FormGroup: React.FunctionComponent<FormGroupProps> = ({
   isStack = false,
   fieldId,
   role,
+  ouiaId,
+  ouiaSafe = true,
   ...props
 }: FormGroupProps) => {
+  const ouiaProps = useOUIAProps(FormGroup.displayName, ouiaId, ouiaSafe);
   const randomId = useSSRSafeId();
   const isGroupOrRadioGroup = role === 'group' || role === 'radiogroup';
   const LabelComponent = isGroupOrRadioGroup ? 'span' : 'label';
@@ -72,6 +79,7 @@ export const FormGroup: React.FunctionComponent<FormGroupProps> = ({
       {...(role && { role })}
       {...(isGroupOrRadioGroup && { 'aria-labelledby': `${fieldId || randomId}-legend` })}
       {...props}
+      {...ouiaProps}
     >
       {label && (
         <div
diff --git a/packages/react-core/src/components/Form/__tests__/__snapshots__/ActionGroup.test.tsx.snap b/packages/react-core/src/components/Form/__tests__/__snapshots__/ActionGroup.test.tsx.snap
index bb52e595478..39e1455c0a4 100644
--- a/packages/react-core/src/components/Form/__tests__/__snapshots__/ActionGroup.test.tsx.snap
+++ b/packages/react-core/src/components/Form/__tests__/__snapshots__/ActionGroup.test.tsx.snap
@@ -24,6 +24,9 @@ exports[`ActionGroup component should render horizontal form ActionGroup variant
 <DocumentFragment>
   <form
     class="pf-v6-c-form pf-m-horizontal"
+    data-ouia-component-id="OUIA-Generated-Form-:r0:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
diff --git a/packages/react-core/src/components/Form/__tests__/__snapshots__/Form.test.tsx.snap b/packages/react-core/src/components/Form/__tests__/__snapshots__/Form.test.tsx.snap
index 2878cc9dfb3..6e3d5b0f859 100644
--- a/packages/react-core/src/components/Form/__tests__/__snapshots__/Form.test.tsx.snap
+++ b/packages/react-core/src/components/Form/__tests__/__snapshots__/Form.test.tsx.snap
@@ -4,6 +4,9 @@ exports[`Form component should render default form variant 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r0:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   />
 </DocumentFragment>
@@ -13,6 +16,9 @@ exports[`Form component should render form with limited width 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form pf-m-limit-width"
+    data-ouia-component-id="OUIA-Generated-Form-:r2:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   />
 </DocumentFragment>
@@ -22,6 +28,9 @@ exports[`Form component should render horizontal form variant 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form pf-m-horizontal"
+    data-ouia-component-id="OUIA-Generated-Form-:r1:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   />
 </DocumentFragment>
diff --git a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap
index c2674a41356..9c61b9cfb36 100644
--- a/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap
+++ b/packages/react-core/src/components/Form/__tests__/__snapshots__/FormGroup.test.tsx.snap
@@ -4,6 +4,9 @@ exports[`FormGroup should render correctly when label is not a string with Child
 <DocumentFragment>
   <div
     class="pf-v6-c-form__group"
+    data-ouia-component-id="OUIA-Generated-FormGroup-:rm:"
+    data-ouia-component-type="PF6/FormGroup"
+    data-ouia-safe="true"
   >
     <div
       class="pf-v6-c-form__group-label"
@@ -41,6 +44,9 @@ exports[`FormGroup should render default form group variant 1`] = `
 <DocumentFragment>
   <div
     class="pf-v6-c-form__group"
+    data-ouia-component-id="OUIA-Generated-FormGroup-:r0:"
+    data-ouia-component-type="PF6/FormGroup"
+    data-ouia-safe="true"
   >
     <div
       class="pf-v6-c-form__group-label"
@@ -72,6 +78,9 @@ exports[`FormGroup should render form group variant with node label 1`] = `
 <DocumentFragment>
   <div
     class="pf-v6-c-form__group"
+    data-ouia-component-id="OUIA-Generated-FormGroup-:r8:"
+    data-ouia-component-type="PF6/FormGroup"
+    data-ouia-safe="true"
   >
     <div
       class="pf-v6-c-form__group-label"
@@ -105,6 +114,9 @@ exports[`FormGroup should render form group variant with required label 1`] = `
 <DocumentFragment>
   <div
     class="pf-v6-c-form__group"
+    data-ouia-component-id="OUIA-Generated-FormGroup-:r6:"
+    data-ouia-component-type="PF6/FormGroup"
+    data-ouia-safe="true"
   >
     <div
       class="pf-v6-c-form__group-label"
@@ -142,6 +154,9 @@ exports[`FormGroup should render form group variant without label 1`] = `
 <DocumentFragment>
   <div
     class="pf-v6-c-form__group"
+    data-ouia-component-id="OUIA-Generated-FormGroup-:rk:"
+    data-ouia-component-type="PF6/FormGroup"
+    data-ouia-safe="true"
   >
     <div
       class="pf-v6-c-form__group-control"
@@ -158,6 +173,9 @@ exports[`FormGroup should render form group with additional label info 1`] = `
 <DocumentFragment>
   <div
     class="pf-v6-c-form__group"
+    data-ouia-component-id="OUIA-Generated-FormGroup-:ra:"
+    data-ouia-component-type="PF6/FormGroup"
+    data-ouia-safe="true"
   >
     <div
       class="pf-v6-c-form__group-label pf-m-info"
@@ -200,10 +218,16 @@ exports[`FormGroup should render horizontal form group variant 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form pf-m-horizontal"
+    data-ouia-component-id="OUIA-Generated-Form-:re:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:rf:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -236,10 +260,16 @@ exports[`FormGroup should render stacked horizontal form group variant 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form pf-m-horizontal"
+    data-ouia-component-id="OUIA-Generated-Form-:rh:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:ri:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
diff --git a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
index fa88c11b905..ac08539ac72 100644
--- a/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
+++ b/packages/react-core/src/components/LoginPage/__tests__/__snapshots__/LoginForm.test.tsx.snap
@@ -4,10 +4,16 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r1k:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r1l:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -38,7 +44,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r17:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1o:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -52,6 +58,9 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r1p:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -82,7 +91,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1a:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1s:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -96,6 +105,9 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r1t:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-control"
@@ -106,7 +118,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
           <input
             aria-invalid="false"
             class="pf-v6-c-check__input"
-            data-ouia-component-id="OUIA-Generated-Checkbox-:r1d:"
+            data-ouia-component-id="OUIA-Generated-Checkbox-:r20:"
             data-ouia-component-type="PF6/Checkbox"
             data-ouia-safe="true"
             id="pf-login-remember-me-id"
@@ -132,7 +144,7 @@ exports[`LoginForm LoginForm with rememberMeLabel 1`] = `
         >
           <button
             class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r1e:"
+            data-ouia-component-id="OUIA-Generated-Button-primary-:r21:"
             data-ouia-component-type="PF6/Button"
             data-ouia-safe="true"
             type="submit"
@@ -154,10 +166,16 @@ exports[`LoginForm LoginForm with show password 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r22:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r23:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -188,7 +206,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r1h:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r26:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -202,6 +220,9 @@ exports[`LoginForm LoginForm with show password 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r27:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -238,7 +259,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             >
               <input
                 aria-invalid="false"
-                data-ouia-component-id="OUIA-Generated-TextInputBase-:r1k:"
+                data-ouia-component-id="OUIA-Generated-TextInputBase-:r2a:"
                 data-ouia-component-type="PF6/TextInput"
                 data-ouia-safe="true"
                 id="pf-login-password-id"
@@ -255,7 +276,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
             <button
               aria-label="Show password"
               class="pf-v6-c-button pf-m-control"
-              data-ouia-component-id="OUIA-Generated-Button-control-:r1l:"
+              data-ouia-component-id="OUIA-Generated-Button-control-:r2b:"
               data-ouia-component-type="PF6/Button"
               data-ouia-safe="true"
               type="button"
@@ -305,7 +326,7 @@ exports[`LoginForm LoginForm with show password 1`] = `
         >
           <button
             class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r1m:"
+            data-ouia-component-id="OUIA-Generated-Button-primary-:r2c:"
             data-ouia-component-type="PF6/Button"
             data-ouia-safe="true"
             type="submit"
@@ -327,10 +348,16 @@ exports[`LoginForm should render Login form 1`] = `
 <DocumentFragment>
   <form
     class="pf-v6-c-form"
+    data-ouia-component-id="OUIA-Generated-Form-:r0:"
+    data-ouia-component-type="PF6/Form"
+    data-ouia-safe="true"
     novalidate=""
   >
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r1:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -361,7 +388,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r2:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r4:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-username-id"
@@ -375,6 +402,9 @@ exports[`LoginForm should render Login form 1`] = `
     </div>
     <div
       class="pf-v6-c-form__group"
+      data-ouia-component-id="OUIA-Generated-FormGroup-:r5:"
+      data-ouia-component-type="PF6/FormGroup"
+      data-ouia-safe="true"
     >
       <div
         class="pf-v6-c-form__group-label"
@@ -405,7 +435,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <input
             aria-invalid="false"
-            data-ouia-component-id="OUIA-Generated-TextInputBase-:r5:"
+            data-ouia-component-id="OUIA-Generated-TextInputBase-:r8:"
             data-ouia-component-type="PF6/TextInput"
             data-ouia-safe="true"
             id="pf-login-password-id"
@@ -428,7 +458,7 @@ exports[`LoginForm should render Login form 1`] = `
         >
           <button
             class="pf-v6-c-button pf-m-primary pf-m-block"
-            data-ouia-component-id="OUIA-Generated-Button-primary-:r6:"
+            data-ouia-component-id="OUIA-Generated-Button-primary-:r9:"
             data-ouia-component-type="PF6/Button"
             data-ouia-safe="true"
             type="submit"
diff --git a/packages/react-core/src/helpers/OUIA/OUIA.md b/packages/react-core/src/helpers/OUIA/OUIA.md
index 21bb7bf56cf..d971aeb61b2 100644
--- a/packages/react-core/src/helpers/OUIA/OUIA.md
+++ b/packages/react-core/src/helpers/OUIA/OUIA.md
@@ -57,6 +57,8 @@ component.
 * [Content](/components/content)
 * [Dropdown](/components/menus/dropdown)
 * [DropdownItem](/components/menus/dropdown)
+* [Form](/components/forms/form)
+* [FormGroup](/components/forms/form)
 * [FormSelect](/components/forms/form-select)
 * [Menu](/components/menus/menu)
 * [Modal](/components/modal)