diff --git a/packages/ui/report.api.md b/packages/ui/report.api.md
index 00dd6d4d42..c3aca2718d 100644
--- a/packages/ui/report.api.md
+++ b/packages/ui/report.api.md
@@ -525,6 +525,12 @@ export const componentDefinitions: {
       readonly emptyState: 'bui-MenuEmptyState';
     };
   };
+  readonly PasswordField: {
+    readonly classNames: {
+      readonly root: 'bui-PasswordField';
+      readonly inputVisibility: 'bui-InputVisibility';
+    };
+  };
   readonly Popover: {
     readonly classNames: {
       readonly root: 'bui-Popover';
@@ -650,16 +656,6 @@ export const componentDefinitions: {
       readonly disabled: readonly [true, false];
     };
   };
-  readonly PasswordField: {
-    readonly classNames: {
-      readonly root: 'bui-PasswordField';
-      readonly inputVisibility: 'bui-InputVisibility';
-    };
-    readonly dataAttributes: {
-      readonly invalid: readonly [true, false];
-      readonly disabled: readonly [true, false];
-    };
-  };
   readonly Tooltip: {
     readonly classNames: {
       readonly tooltip: 'bui-Tooltip';
diff --git a/packages/ui/src/utils/componentDefinitions.ts b/packages/ui/src/utils/componentDefinitions.ts
index ff91831cc4..931bfacca7 100644
--- a/packages/ui/src/utils/componentDefinitions.ts
+++ b/packages/ui/src/utils/componentDefinitions.ts
@@ -174,6 +174,12 @@ export const componentDefinitions = {
       emptyState: 'bui-MenuEmptyState',
     },
   },
+  PasswordField: {
+    classNames: {
+      root: 'bui-PasswordField',
+      inputVisibility: 'bui-InputVisibility',
+    },
+  },
   Popover: {
     classNames: {
       root: 'bui-Popover',
@@ -293,16 +299,6 @@ export const componentDefinitions = {
       disabled: [true, false] as const,
     },
   },
-  PasswordField: {
-    classNames: {
-      root: 'bui-PasswordField',
-      inputVisibility: 'bui-InputVisibility',
-    },
-    dataAttributes: {
-      invalid: [true, false] as const,
-      disabled: [true, false] as const,
-    },
-  },
   Tooltip: {
     classNames: {
       tooltip: 'bui-Tooltip',