diff --git a/packages/fuselage/src/components/FieldGroup/FieldGroup.stories.tsx b/packages/fuselage/src/components/FieldGroup/FieldGroup.stories.tsx
index d129f6dd86..a945432db3 100644
--- a/packages/fuselage/src/components/FieldGroup/FieldGroup.stories.tsx
+++ b/packages/fuselage/src/components/FieldGroup/FieldGroup.stories.tsx
@@ -2,7 +2,14 @@ import { Title, Description, Primary, Stories } from '@storybook/addon-docs';
 import type { ComponentStory, ComponentMeta } from '@storybook/react';
 import React from 'react';
 
-import { Field, FieldGroup, InputBox } from '../..';
+import {
+  Field,
+  FieldGroup,
+  FieldHint,
+  FieldLabel,
+  FieldRow,
+  InputBox,
+} from '../..';
 
 export default {
   title: 'Inputs/FieldGroup',
@@ -29,23 +36,23 @@ export default {
 export const Default: ComponentStory<typeof FieldGroup> = () => (
   <FieldGroup>
     <Field>
-      <Field.Label>Field #1</Field.Label>
-      <Field.Row>
+      <FieldLabel>Field #1</FieldLabel>
+      <FieldRow>
         <InputBox.Skeleton />
-      </Field.Row>
+      </FieldRow>
     </Field>
     <Field>
-      <Field.Label>Field #2</Field.Label>
-      <Field.Row>
+      <FieldLabel>Field #2</FieldLabel>
+      <FieldRow>
         <InputBox.Skeleton />
-      </Field.Row>
-      <Field.Hint>Help text</Field.Hint>
+      </FieldRow>
+      <FieldHint>Help text</FieldHint>
     </Field>
     <Field>
-      <Field.Label>Field #3</Field.Label>
-      <Field.Row>
+      <FieldLabel>Field #3</FieldLabel>
+      <FieldRow>
         <InputBox.Skeleton />
-      </Field.Row>
+      </FieldRow>
     </Field>
   </FieldGroup>
 );
diff --git a/packages/fuselage/src/components/Modal/Modal.stories.tsx b/packages/fuselage/src/components/Modal/Modal.stories.tsx
index 7859842ee4..0a2bea4d2e 100644
--- a/packages/fuselage/src/components/Modal/Modal.stories.tsx
+++ b/packages/fuselage/src/components/Modal/Modal.stories.tsx
@@ -3,7 +3,16 @@ import type { ComponentStory } from '@storybook/react';
 import type { ComponentProps } from 'react';
 import React from 'react';
 
-import { FieldGroup, Field, TextInput, Button, Modal, Box } from '../..';
+import {
+  FieldGroup,
+  Field,
+  TextInput,
+  Button,
+  Modal,
+  Box,
+  FieldLabel,
+  FieldRow,
+} from '../..';
 
 export default {
   title: 'Containers/Modal',
@@ -193,10 +202,10 @@ export const _WithForm: ComponentStory<typeof Modal> = () => (
     <Modal.Content>
       <FieldGroup>
         <Field>
-          <Field.Label>Label</Field.Label>
-          <Field.Row>
+          <FieldLabel>Label</FieldLabel>
+          <FieldRow>
             <TextInput placeholder='Placeholder' />
-          </Field.Row>
+          </FieldRow>
         </Field>
       </FieldGroup>
     </Modal.Content>
diff --git a/packages/layout/src/HorizontalWizardLayout/HorizontalWizardLayout.stories.tsx b/packages/layout/src/HorizontalWizardLayout/HorizontalWizardLayout.stories.tsx
index dc82b25ba6..be0c891759 100644
--- a/packages/layout/src/HorizontalWizardLayout/HorizontalWizardLayout.stories.tsx
+++ b/packages/layout/src/HorizontalWizardLayout/HorizontalWizardLayout.stories.tsx
@@ -1,4 +1,12 @@
-import { Field, InputBox } from '@rocket.chat/fuselage';
+import {
+  Field,
+  FieldDescription,
+  FieldError,
+  FieldHint,
+  FieldLabel,
+  FieldRow,
+  InputBox,
+} from '@rocket.chat/fuselage';
 import type { Meta, Story } from '@storybook/react';
 
 import { ActionLink, Form } from '..';
@@ -45,13 +53,13 @@ export const Default: Story = (props) => (
           </Form.Header>
           <Form.Container>
             <Field>
-              <Field.Label>Label</Field.Label>
-              <Field.Description>Description</Field.Description>
-              <Field.Row>
+              <FieldLabel>Label</FieldLabel>
+              <FieldDescription>Description</FieldDescription>
+              <FieldRow>
                 <InputBox.Skeleton />
-              </Field.Row>
-              <Field.Error>Error</Field.Error>
-              <Field.Hint>Hint</Field.Hint>
+              </FieldRow>
+              <FieldError>Error</FieldError>
+              <FieldHint>Hint</FieldHint>
             </Field>
           </Form.Container>
           <Form.Footer>footer</Form.Footer>
@@ -80,112 +88,112 @@ export const WithScroll: Story = (props) => (
         </Form.Header>
         <Form.Container>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldRow>Error</FieldRow>
+            <FieldHint>Hint</FieldHint>
           </Field>
         </Form.Container>
         <Form.Footer>footer</Form.Footer>
diff --git a/packages/layout/src/VerticalWizardLayout/VerticalWizardLayout.stories.tsx b/packages/layout/src/VerticalWizardLayout/VerticalWizardLayout.stories.tsx
index 942ed6c629..bb0f688666 100644
--- a/packages/layout/src/VerticalWizardLayout/VerticalWizardLayout.stories.tsx
+++ b/packages/layout/src/VerticalWizardLayout/VerticalWizardLayout.stories.tsx
@@ -1,4 +1,12 @@
-import { Field, InputBox } from '@rocket.chat/fuselage';
+import {
+  Field,
+  FieldDescription,
+  FieldError,
+  FieldHint,
+  FieldLabel,
+  FieldRow,
+  InputBox,
+} from '@rocket.chat/fuselage';
 import type { Meta, Story } from '@storybook/react';
 
 import Form from '../FormPageLayout';
@@ -25,13 +33,13 @@ export const Default: Story = () => (
         </Form.Header>
         <Form.Container>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>
         </Form.Container>
         <Form.Footer>footer</Form.Footer>
@@ -54,121 +62,121 @@ export const WithScroll: Story = () => (
         </Form.Header>
         <Form.Container>
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>{' '}
           <Field>
-            <Field.Label>Label</Field.Label>
-            <Field.Description>Description</Field.Description>
-            <Field.Row>
+            <FieldLabel>Label</FieldLabel>
+            <FieldDescription>Description</FieldDescription>
+            <FieldRow>
               <InputBox.Skeleton />
-            </Field.Row>
-            <Field.Error>Error</Field.Error>
-            <Field.Hint>Hint</Field.Hint>
+            </FieldRow>
+            <FieldError>Error</FieldError>
+            <FieldHint>Hint</FieldHint>
           </Field>
         </Form.Container>
         <Form.Footer>footer</Form.Footer>
diff --git a/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx b/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx
index 3edb8af36d..4948f53234 100644
--- a/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx
+++ b/packages/onboarding-ui/src/forms/AdminInfoForm/AdminInfoForm.tsx
@@ -8,6 +8,10 @@ import {
   TextInput,
   Box,
   CheckBox,
+  FieldLabel,
+  FieldRow,
+  FieldError,
+  FieldHint,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { Form } from '@rocket.chat/layout';
@@ -81,10 +85,10 @@ const AdminInfoForm = ({
       <Form.Container>
         <FieldGroup>
           <Field>
-            <Field.Label required htmlFor={fullnameField}>
+            <FieldLabel required htmlFor={fullnameField}>
               {t('form.adminInfoForm.fields.fullName.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <TextInput
                 {...register('fullname', {
                   required: true,
@@ -94,16 +98,16 @@ const AdminInfoForm = ({
                 )}
                 id={fullnameField}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.fullname && (
-              <Field.Error>{errors.fullname.message}</Field.Error>
+              <FieldError>{errors.fullname.message}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Label required htmlFor={usernameField}>
+            <FieldLabel required htmlFor={usernameField}>
               {t('form.adminInfoForm.fields.username.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <TextInput
                 {...register('username', {
                   required: true,
@@ -114,16 +118,16 @@ const AdminInfoForm = ({
                 )}
                 id={usernameField}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.username && (
-              <Field.Error>{errors.username.message}</Field.Error>
+              <FieldError>{errors.username.message}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Label required htmlFor={emailField}>
+            <FieldLabel required htmlFor={emailField}>
               {t('form.adminInfoForm.fields.email.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <EmailInput
                 {...register('email', {
                   required: true,
@@ -132,14 +136,14 @@ const AdminInfoForm = ({
                 placeholder={t('form.adminInfoForm.fields.email.placeholder')}
                 id={emailField}
               />
-            </Field.Row>
-            {errors.email && <Field.Error>{errors.email.message}</Field.Error>}
+            </FieldRow>
+            {errors.email && <FieldError>{errors.email.message}</FieldError>}
           </Field>
           <Field>
-            <Field.Label required htmlFor={passwordField}>
+            <FieldLabel required htmlFor={passwordField}>
               {t('form.adminInfoForm.fields.password.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <PasswordInput
                 {...register('password', {
                   required: true,
@@ -150,10 +154,10 @@ const AdminInfoForm = ({
                 )}
                 id={passwordField}
               />
-            </Field.Row>
-            <Field.Hint>{passwordRulesHint}</Field.Hint>
+            </FieldRow>
+            <FieldHint>{passwordRulesHint}</FieldHint>
             {errors.password && (
-              <Field.Error>{errors.password.message}</Field.Error>
+              <FieldError>{errors.password.message}</FieldError>
             )}
           </Field>
           {keepPosted && (
diff --git a/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx b/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx
index 0e14d8e1e9..0e4b54085f 100644
--- a/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx
+++ b/packages/onboarding-ui/src/forms/CreateCloudWorkspaceForm/CreateCloudWorkspaceForm.tsx
@@ -1,7 +1,10 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import {
+  FieldLabel,
+  FieldRow,
   FieldGroup,
   Field,
+  FieldError,
   ButtonGroup,
   Button,
   Box,
@@ -76,10 +79,10 @@ const CreateCloudWorkspaceForm = ({
 
       <FieldGroup mbs={16}>
         <Field>
-          <Field.Label>
-            {t('form.createCloudWorkspace.fields.orgEmail.label')}
-          </Field.Label>
-          <Field.Row>
+          <FieldLabel>
+            {t('form.createCloudWorkspace.fields.orgEmaillabel')}
+          </FieldLabel>
+          <FieldRow>
             <EmailInput
               {...register('organizationEmail', {
                 required: true,
@@ -88,38 +91,38 @@ const CreateCloudWorkspaceForm = ({
               defaultValue={defaultValues?.organizationEmail}
               error={errors?.organizationEmail?.type || undefined}
             />
-          </Field.Row>
+          </FieldRow>
           {errors?.organizationEmail && (
-            <Field.Error>{errors.organizationEmail.message}</Field.Error>
+            <FieldError>{errors.organizationEmail.message}</FieldError>
           )}
         </Field>
 
         <Field>
-          <Field.Label>
+          <FieldLabel>
             <Box display='inline' mie={8}>
-              {t('form.createCloudWorkspace.fields.workspaceName.label')}
+              {t('form.createCloudWorkspace.fields.workspaceNamelabel')}
             </Box>
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <TextInput
               {...register('workspaceName', { required: true })}
               defaultValue={defaultValues?.workspaceName}
               error={errors?.workspaceName?.type || undefined}
               onBlur={onNameBlur}
             />
-          </Field.Row>
+          </FieldRow>
           {errors.workspaceName && (
-            <Field.Error>{t('component.form.requiredField')}</Field.Error>
+            <FieldError>{t('component.form.requiredField')}</FieldError>
           )}
         </Field>
 
         <Field>
-          <Field.Label>
+          <FieldLabel>
             <Box display='inline' mie={8}>
-              {t('form.createCloudWorkspace.fields.workspaceUrl.label')}
+              {t('form.createCloudWorkspace.fields.workspaceUrllabel')}
             </Box>
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <WorkspaceUrlInput
               domain={domain}
               {...register('workspaceURL', {
@@ -128,26 +131,26 @@ const CreateCloudWorkspaceForm = ({
               })}
               defaultValue={defaultValues?.workspaceURL}
             />
-          </Field.Row>
+          </FieldRow>
           {errors?.workspaceURL && (
-            <Field.Error>{errors.workspaceURL.message}</Field.Error>
+            <FieldError>{errors.workspaceURL.message}</FieldError>
           )}
         </Field>
 
         <Grid mb={16}>
           <Grid.Item>
             <Field>
-              <Field.Label>
+              <FieldLabel>
                 <Box display='inline' mie={8}>
-                  {t('form.createCloudWorkspace.fields.serverRegion.label')}
+                  {t('form.createCloudWorkspace.fields.serverRegionlabel')}
                 </Box>
                 <Tooltip
                   text={t(
                     'form.createCloudWorkspace.fields.serverRegion.tooltip'
                   )}
                 />
-              </Field.Label>
-              <Field.Row>
+              </FieldLabel>
+              <FieldRow>
                 <Controller
                   name='serverRegion'
                   control={control}
@@ -158,26 +161,26 @@ const CreateCloudWorkspaceForm = ({
                       {...field}
                       options={serverRegionOptions}
                       placeholder={t(
-                        'form.createCloudWorkspace.fields.serverRegion.label'
+                        'form.createCloudWorkspace.fields.serverRegionlabel'
                       )}
                     />
                   )}
                 />
-              </Field.Row>
+              </FieldRow>
             </Field>
           </Grid.Item>
 
           <Grid.Item>
             <Field>
-              <Field.Label>
+              <FieldLabel>
                 <Box display='inline' mie={8}>
-                  {t('form.createCloudWorkspace.fields.language.label')}
+                  {t('form.createCloudWorkspace.fields.languagelabel')}
                 </Box>
                 <Tooltip
                   text={t('form.createCloudWorkspace.fields.language.tooltip')}
                 />
-              </Field.Label>
-              <Field.Row>
+              </FieldLabel>
+              <FieldRow>
                 <Controller
                   name='language'
                   control={control}
@@ -188,12 +191,12 @@ const CreateCloudWorkspaceForm = ({
                       {...field}
                       options={languageOptions}
                       placeholder={t(
-                        'form.createCloudWorkspace.fields.language.label'
+                        'form.createCloudWorkspace.fields.languagelabel'
                       )}
                     />
                   )}
                 />
-              </Field.Row>
+              </FieldRow>
             </Field>
           </Grid.Item>
         </Grid>
@@ -201,7 +204,7 @@ const CreateCloudWorkspaceForm = ({
         <Divider mb={0} />
 
         <Field>
-          <Field.Row justifyContent='flex-start'>
+          <FieldRow justifyContent='flex-start'>
             <CheckBox {...register('agreement', { required: true })} mie={8} />
             <Box is='label' htmlFor='agreement' withRichContent fontScale='c1'>
               <Trans i18nKey='component.form.termsAndConditions'>
@@ -223,19 +226,19 @@ const CreateCloudWorkspaceForm = ({
                 </a>
               </Trans>
             </Box>
-          </Field.Row>
+          </FieldRow>
           {errors.agreement?.type === 'required' && (
-            <Field.Error>{t('component.form.requiredField')}</Field.Error>
+            <FieldError>{t('component.form.requiredField')}</FieldError>
           )}
         </Field>
 
         <Field>
-          <Field.Row justifyContent='flex-start'>
+          <FieldRow justifyContent='flex-start'>
             <CheckBox {...register('updates')} mie={8} />
             <Box fontScale='c1'>
               {t('form.createCloudWorkspace.fields.keepMeInformed')}
             </Box>
-          </Field.Row>
+          </FieldRow>
         </Field>
       </FieldGroup>
 
diff --git a/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx b/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx
index 3bf542c439..eed996fcb3 100644
--- a/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx
+++ b/packages/onboarding-ui/src/forms/CreateFirstMemberForm/CreateFirstMemberForm.tsx
@@ -7,6 +7,9 @@ import {
   PasswordInput,
   TextInput,
   Throbber,
+  FieldLabel,
+  FieldRow,
+  FieldError,
 } from '@rocket.chat/fuselage';
 import { Form } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
@@ -58,12 +61,12 @@ const CreateFirstMemberForm = ({
 
       <FieldGroup mbs={16}>
         <Field>
-          <Field.Label>
+          <FieldLabel>
             <Box display='inline' mie={8}>
               {t('form.createFirstMemberForm.fields.username.label')}
             </Box>
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <TextInput
               {...register('username', {
                 validate: validateUsername,
@@ -72,17 +75,17 @@ const CreateFirstMemberForm = ({
               defaultValue={defaultValues?.username}
               error={errors?.username?.type || undefined}
             />
-          </Field.Row>
+          </FieldRow>
           {errors?.username && (
-            <Field.Error>{errors.username.message}</Field.Error>
+            <FieldError>{errors.username.message}</FieldError>
           )}
         </Field>
 
         <Field>
-          <Field.Label>
+          <FieldLabel>
             {t('form.createFirstMemberForm.fields.password.label')}
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <PasswordInput
               {...register('password', {
                 validate: validatePassword,
@@ -90,9 +93,9 @@ const CreateFirstMemberForm = ({
               })}
               defaultValue={defaultValues?.password}
             />
-          </Field.Row>
+          </FieldRow>
           {errors.password && (
-            <Field.Error>{errors.password.message}</Field.Error>
+            <FieldError>{errors.password.message}</FieldError>
           )}
         </Field>
       </FieldGroup>
diff --git a/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx b/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx
index 0c03d0c277..d47e434970 100644
--- a/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx
+++ b/packages/onboarding-ui/src/forms/CreateNewPassword/CreateNewPassword.tsx
@@ -4,6 +4,9 @@ import {
   PasswordInput,
   ButtonGroup,
   Button,
+  FieldLabel,
+  FieldRow,
+  FieldError,
 } from '@rocket.chat/fuselage';
 import { Form } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
@@ -47,10 +50,10 @@ const CreateNewPassword = ({
       <Form.Container>
         <FieldGroup>
           <Field>
-            <Field.Label>
+            <FieldLabel>
               {t('form.createPasswordForm.fields.password.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <PasswordInput
                 {...register('password', {
                   validate: validatePassword,
@@ -60,16 +63,16 @@ const CreateNewPassword = ({
                   'form.createPasswordForm.fields.password.placeholder'
                 )}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.password && (
-              <Field.Error>{errors.password.message}</Field.Error>
+              <FieldError>{errors.password.message}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Label>
+            <FieldLabel>
               {t('form.createPasswordForm.fields.confirmPassword.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <PasswordInput
                 {...register('passwordConfirmation', {
                   validate: validatePasswordConfirmation,
@@ -79,9 +82,9 @@ const CreateNewPassword = ({
                   'form.createPasswordForm.fields.confirmPassword.placeholder'
                 )}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.passwordConfirmation && (
-              <Field.Error>{errors.passwordConfirmation.message}</Field.Error>
+              <FieldError>{errors.passwordConfirmation.message}</FieldError>
             )}
           </Field>
         </FieldGroup>
diff --git a/packages/onboarding-ui/src/forms/LoginForm/LoginForm.tsx b/packages/onboarding-ui/src/forms/LoginForm/LoginForm.tsx
index e02dbb5d9d..ff4c0671b8 100644
--- a/packages/onboarding-ui/src/forms/LoginForm/LoginForm.tsx
+++ b/packages/onboarding-ui/src/forms/LoginForm/LoginForm.tsx
@@ -5,6 +5,9 @@ import {
   PasswordInput,
   Button,
   Box,
+  FieldLabel,
+  FieldRow,
+  FieldError,
 } from '@rocket.chat/fuselage';
 import { Form, ActionLink } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
@@ -61,32 +64,32 @@ const LoginForm = ({
       <Form.Container>
         <FieldGroup>
           <Field>
-            <Field.Label>{t('form.loginForm.fields.email.label')}</Field.Label>
-            <Field.Row>
+            <FieldLabel>{t('form.loginForm.fields.email.label')}</FieldLabel>
+            <FieldRow>
               <EmailInput
                 {...register('email', {
                   required: String(t('component.form.requiredField')),
                 })}
                 placeholder={t('form.loginForm.fields.email.placeholder')}
               />
-            </Field.Row>
-            {errors.email && <Field.Error>{errors.email.message}</Field.Error>}
+            </FieldRow>
+            {errors.email && <FieldError>{errors.email.message}</FieldError>}
           </Field>
           {!isPasswordLess && (
             <Field>
-              <Field.Label>
+              <FieldLabel>
                 {t('form.loginForm.fields.password.label')}
-              </Field.Label>
-              <Field.Row>
+              </FieldLabel>
+              <FieldRow>
                 <PasswordInput
                   {...register('password', { required: true })}
                   placeholder={t('form.loginForm.fields.password.placeholder')}
                 />
-              </Field.Row>
+              </FieldRow>
               {(formError || errors.password) && (
-                <Field.Error>
+                <FieldError>
                   {t('form.loginForm.fields.password.error')}
-                </Field.Error>
+                </FieldError>
               )}
             </Field>
           )}
diff --git a/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx b/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx
index 602d5f423b..58c1a99e31 100644
--- a/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx
+++ b/packages/onboarding-ui/src/forms/NewAccountForm/NewAccountForm.tsx
@@ -8,6 +8,9 @@ import {
   TextInput,
   Box,
   CheckBox,
+  FieldLabel,
+  FieldRow,
+  FieldError,
 } from '@rocket.chat/fuselage';
 import { Form } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
@@ -56,66 +59,66 @@ const NewAccountForm = ({
       <Form.Container>
         <FieldGroup>
           <Field>
-            <Field.Label>
+            <FieldLabel>
               {t('form.newAccountForm.fields.name.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <TextInput
                 {...register('name', {
                   required: String(t('component.form.requiredField')),
                 })}
               />
-            </Field.Row>
-            {errors.name && <Field.Error>{errors.name.message}</Field.Error>}
+            </FieldRow>
+            {errors.name && <FieldError>{errors.name.message}</FieldError>}
           </Field>
           <Field>
-            <Field.Label>
+            <FieldLabel>
               {t('form.newAccountForm.fields.email.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <EmailInput
                 {...register('email', {
                   validate: validateEmail,
                   required: true,
                 })}
               />
-            </Field.Row>
-            {errors?.email && <Field.Error>{errors.email.message}</Field.Error>}
+            </FieldRow>
+            {errors?.email && <FieldError>{errors.email.message}</FieldError>}
           </Field>
           <Field>
-            <Field.Label>
+            <FieldLabel>
               {t('form.newAccountForm.fields.password.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <PasswordInput
                 {...register('password', {
                   required: true,
                   validate: validatePassword,
                 })}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.password && (
-              <Field.Error>{errors.password.message}</Field.Error>
+              <FieldError>{errors.password.message}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Label>
+            <FieldLabel>
               {t('form.newAccountForm.fields.confirmPassword.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <PasswordInput
                 {...register('confirmPassword', {
                   required: true,
                   validate: validateConfirmationPassword,
                 })}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.confirmPassword && (
-              <Field.Error>{errors.confirmPassword.message}</Field.Error>
+              <FieldError>{errors.confirmPassword.message}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Row justifyContent='flex-start'>
+            <FieldRow justifyContent='flex-start'>
               <CheckBox
                 {...register('agreement', { required: true })}
                 mie={8}
@@ -145,9 +148,9 @@ const NewAccountForm = ({
                   </a>
                 </Trans>
               </Box>
-            </Field.Row>
+            </FieldRow>
             {errors.agreement?.type === 'required' && (
-              <Field.Error>{t('component.form.requiredField')}</Field.Error>
+              <FieldError>{t('component.form.requiredField')}</FieldError>
             )}
           </Field>
         </FieldGroup>
diff --git a/packages/onboarding-ui/src/forms/OrganizationInfoForm/OrganizationInfoForm.tsx b/packages/onboarding-ui/src/forms/OrganizationInfoForm/OrganizationInfoForm.tsx
index 3eb40206e8..a2c5bd05b3 100644
--- a/packages/onboarding-ui/src/forms/OrganizationInfoForm/OrganizationInfoForm.tsx
+++ b/packages/onboarding-ui/src/forms/OrganizationInfoForm/OrganizationInfoForm.tsx
@@ -1,5 +1,8 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import {
+  FieldError,
+  FieldLabel,
+  FieldRow,
   FieldGroup,
   Field,
   ButtonGroup,
@@ -82,10 +85,10 @@ const OrganizationInfoForm = ({
       <Form.Container>
         <FieldGroup>
           <Field>
-            <Field.Label required htmlFor={organizationNameField}>
+            <FieldLabel required htmlFor={organizationNameField}>
               {t('form.organizationInfoForm.fields.organizationName.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <TextInput
                 {...register('organizationName', { required: true })}
                 placeholder={t(
@@ -93,16 +96,16 @@ const OrganizationInfoForm = ({
                 )}
                 id={organizationNameField}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.organizationName && (
-              <Field.Error>{t('component.form.requiredField')}</Field.Error>
+              <FieldError>{t('component.form.requiredField')}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Label required htmlFor={organizationIndustryField}>
+            <FieldLabel required htmlFor={organizationIndustryField}>
               {t('form.organizationInfoForm.fields.organizationIndustry.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <Controller
                 name='organizationIndustry'
                 control={control}
@@ -118,16 +121,16 @@ const OrganizationInfoForm = ({
                   />
                 )}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.organizationIndustry && (
-              <Field.Error>{t('component.form.requiredField')}</Field.Error>
+              <FieldError>{t('component.form.requiredField')}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Label required htmlFor={organizationSizeField}>
+            <FieldLabel required htmlFor={organizationSizeField}>
               {t('form.organizationInfoForm.fields.organizationSize.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <Controller
                 name='organizationSize'
                 control={control}
@@ -143,16 +146,16 @@ const OrganizationInfoForm = ({
                   />
                 )}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.organizationSize && (
-              <Field.Error>{t('component.form.requiredField')}</Field.Error>
+              <FieldError>{t('component.form.requiredField')}</FieldError>
             )}
           </Field>
           <Field>
-            <Field.Label required htmlFor={countryField}>
+            <FieldLabel required htmlFor={countryField}>
               {t('form.organizationInfoForm.fields.country.label')}
-            </Field.Label>
-            <Field.Row>
+            </FieldLabel>
+            <FieldRow>
               <Controller
                 name='country'
                 control={control}
@@ -168,9 +171,9 @@ const OrganizationInfoForm = ({
                   />
                 )}
               />
-            </Field.Row>
+            </FieldRow>
             {errors.country && (
-              <Field.Error>{t('component.form.requiredField')}</Field.Error>
+              <FieldError>{t('component.form.requiredField')}</FieldError>
             )}
           </Field>
         </FieldGroup>
diff --git a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
index d3d99802c4..cd5479c776 100644
--- a/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
+++ b/packages/onboarding-ui/src/forms/RegisterServerForm/RegisterServerForm.tsx
@@ -5,7 +5,10 @@ import {
   Field,
   EmailInput,
   CheckBox,
-  Label,
+  Icon,
+  FieldLabel,
+  FieldRow,
+  FieldError,
 } from '@rocket.chat/fuselage';
 import { useUniqueId, useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import { Form, ActionLink } from '@rocket.chat/layout';
@@ -77,15 +80,23 @@ const RegisterServerForm = ({
         {!offline && (
           <Form.Container>
             <Field>
-              <Field.Label
+              <FieldLabel
                 required
                 display='flex'
                 alignItems='center'
                 htmlFor={emailField}
               >
                 {t('form.registeredServerForm.fields.accountEmail.inputLabel')}
-              </Field.Label>
-              <Field.Row>
+                <Icon
+                  title={t(
+                    'form.registeredServerForm.fields.accountEmail.tooltipLabel'
+                  )}
+                  mis={4}
+                  size='x16'
+                  name='info'
+                />
+              </FieldLabel>
+              <FieldRow>
                 <EmailInput
                   {...register('email', {
                     required: true,
@@ -96,9 +107,9 @@ const RegisterServerForm = ({
                   )}
                   id={emailField}
                 />
-              </Field.Row>
+              </FieldRow>
               {errors.email && (
-                <Field.Error>{t('component.form.requiredField')}</Field.Error>
+                <FieldError>{t('component.form.requiredField')}</FieldError>
               )}
             </Field>
             <Box mbs={24}>
@@ -117,7 +128,7 @@ const RegisterServerForm = ({
                   {t('form.registeredServerForm.keepInformed')}
                 </Box>
               </Box>
-              <Box
+              <Field
                 display='flex'
                 flexDirection='row'
                 alignItems='flex-start'
@@ -128,7 +139,7 @@ const RegisterServerForm = ({
                 <Box mie={8}>
                   <CheckBox {...register('agreement', { required: true })} />{' '}
                 </Box>
-                <Label htmlFor='agreement' withRichContent required>
+                <FieldLabel htmlFor='agreement' withRichContent required>
                   <Trans i18nKey='component.form.termsAndConditions'>
                     I agree with
                     <a
@@ -147,8 +158,8 @@ const RegisterServerForm = ({
                       Privacy Policy
                     </a>
                   </Trans>
-                </Label>
-              </Box>
+                </FieldLabel>
+              </Field>
             </Box>
           </Form.Container>
         )}
diff --git a/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx b/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx
index 29b1950c25..59524ae65a 100644
--- a/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx
+++ b/packages/onboarding-ui/src/forms/RequestTrialForm/RequestTrialForm.tsx
@@ -1,5 +1,9 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import {
+  FieldDescription,
+  FieldError,
+  FieldLabel,
+  FieldRow,
   Button,
   Field,
   Box,
@@ -58,10 +62,10 @@ const RequestTrialForm = ({
     <Form onSubmit={handleSubmit(onSubmit)}>
       <FieldGroup>
         <Field>
-          <Field.Label>
+          <FieldLabel>
             {t('form.requestTrialForm.fields.emailAddress.label')}
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <EmailInput
               {...register('email', {
                 validate: validateEmail,
@@ -73,14 +77,14 @@ const RequestTrialForm = ({
               defaultValue={defaultValues?.email}
               error={errors?.email?.message || undefined}
             />
-          </Field.Row>
-          {errors?.email && <Field.Error>{errors.email.message}</Field.Error>}
+          </FieldRow>
+          {errors?.email && <FieldError>{errors.email.message}</FieldError>}
         </Field>
         <Field>
-          <Field.Label>
+          <FieldLabel>
             {t('form.requestTrialForm.fields.organizationName.label')}
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <TextInput
               {...register('organizationName', { required: true })}
               placeholder={t(
@@ -88,16 +92,16 @@ const RequestTrialForm = ({
               )}
               defaultValue={defaultValues?.organizationName}
             />
-          </Field.Row>
+          </FieldRow>
           {errors?.organizationName && (
-            <Field.Error>{t('component.form.requiredField')}</Field.Error>
+            <FieldError>{t('component.form.requiredField')}</FieldError>
           )}
         </Field>
         <Field>
-          <Field.Label>
+          <FieldLabel>
             {t('form.requestTrialForm.fields.organizationSize.label')}
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <Controller
               name='organizationSize'
               control={control}
@@ -114,13 +118,13 @@ const RequestTrialForm = ({
               )}
               defaultValue={defaultValues?.organizationSize}
             />
-          </Field.Row>
+          </FieldRow>
         </Field>
         <Field>
-          <Field.Label>
+          <FieldLabel>
             {t('form.requestTrialForm.fields.country.label')}
-          </Field.Label>
-          <Field.Row>
+          </FieldLabel>
+          <FieldRow>
             <Controller
               name='country'
               control={control}
@@ -137,7 +141,7 @@ const RequestTrialForm = ({
               )}
               defaultValue={defaultValues?.country}
             />
-          </Field.Row>
+          </FieldRow>
         </Field>
         <Field>
           <Box mbs={24}>
@@ -187,12 +191,12 @@ const RequestTrialForm = ({
         </Field>
 
         <Field>
-          <Field.Label>
+          <FieldLabel>
             {t('form.requestTrialForm.hasWorkspace.label')}
-          </Field.Label>
-          <Field.Description>
+          </FieldLabel>
+          <FieldDescription>
             {t('form.requestTrialForm.hasWorkspace.description')}
-          </Field.Description>
+          </FieldDescription>
         </Field>
       </FieldGroup>
       <Form.Footer>
diff --git a/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx b/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
index 0c2fe3880f..3556364971 100644
--- a/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
+++ b/packages/onboarding-ui/src/forms/ResetPasswordForm/ResetPasswordForm.tsx
@@ -4,6 +4,10 @@ import {
   EmailInput,
   ButtonGroup,
   Button,
+  FieldLabel,
+  FieldDescription,
+  FieldRow,
+  FieldError,
 } from '@rocket.chat/fuselage';
 import { Form } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
@@ -44,13 +48,13 @@ const ResetPasswordForm = ({
       <Form.Container>
         <FieldGroup>
           <Field>
-            <Field.Label>
+            <FieldLabel>
               {t('form.resetPasswordForm.fields.email.label')}
-            </Field.Label>
-            <Field.Description>
+            </FieldLabel>
+            <FieldDescription>
               {t('form.resetPasswordForm.content.subtitle')}
-            </Field.Description>
-            <Field.Row>
+            </FieldDescription>
+            <FieldRow>
               <EmailInput
                 {...register('email', {
                   validate: validateEmail,
@@ -60,8 +64,8 @@ const ResetPasswordForm = ({
                   'form.resetPasswordForm.fields.email.placeholder'
                 )}
               />
-            </Field.Row>
-            {errors.email && <Field.Error>{errors.email.message}</Field.Error>}
+            </FieldRow>
+            {errors.email && <FieldError>{errors.email.message}</FieldError>}
           </Field>
         </FieldGroup>
       </Form.Container>
diff --git a/packages/onboarding-ui/src/forms/TotpForm/TotpForm.tsx b/packages/onboarding-ui/src/forms/TotpForm/TotpForm.tsx
index e182ae368b..095c546430 100644
--- a/packages/onboarding-ui/src/forms/TotpForm/TotpForm.tsx
+++ b/packages/onboarding-ui/src/forms/TotpForm/TotpForm.tsx
@@ -4,6 +4,9 @@ import {
   NumberInput,
   TextInput,
   Button,
+  FieldLabel,
+  FieldRow,
+  FieldError,
 } from '@rocket.chat/fuselage';
 import { ActionLink, Form } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
@@ -50,15 +53,15 @@ const TotpForm = ({
         <FieldGroup>
           <Field>
             {isBackupCode ? (
-              <Field.Label>
+              <FieldLabel>
                 {t('form.totpForm.fields.backupCode.label')}
-              </Field.Label>
+              </FieldLabel>
             ) : (
-              <Field.Label>
+              <FieldLabel>
                 {t('form.totpForm.fields.totpCode.label')}
-              </Field.Label>
+              </FieldLabel>
             )}
-            <Field.Row>
+            <FieldRow>
               {isBackupCode ? (
                 <TextInput
                   {...register('backupCode', {
@@ -74,12 +77,12 @@ const TotpForm = ({
                   placeholder={t('form.totpForm.fields.totpCode.placeholder')}
                 />
               )}
-            </Field.Row>
+            </FieldRow>
             {errors.backupCode && (
-              <Field.Error>{errors.backupCode.message}</Field.Error>
+              <FieldError>{errors.backupCode.message}</FieldError>
             )}
             {errors.totpCode && (
-              <Field.Error>{errors.totpCode.message}</Field.Error>
+              <FieldError>{errors.totpCode.message}</FieldError>
             )}
           </Field>
         </FieldGroup>