diff --git a/packages/components/access-right-select/access-right-select.mdx b/packages/components/access-right-select/access-right-select.mdx
index 0737dbde59..9928f93e8f 100644
--- a/packages/components/access-right-select/access-right-select.mdx
+++ b/packages/components/access-right-select/access-right-select.mdx
@@ -1,4 +1,4 @@
-import { Meta, Story, ArgsTable, Canvas } from "@storybook/addon-docs/blocks";
+import { Meta, Story, ArgsTable, Canvas } from "@storybook/blocks";
 
 import AccessRightSelect from "./";
 import * as stories from "./access-right-select.stories.js";
diff --git a/packages/components/combobox/combobox-docs..mdx b/packages/components/combobox/combobox-docs..mdx
index e023d99943..928e567614 100644
--- a/packages/components/combobox/combobox-docs..mdx
+++ b/packages/components/combobox/combobox-docs..mdx
@@ -1,10 +1,4 @@
-import {
-  Meta,
-  Story,
-  ArgsTable,
-  Canvas,
-  Controls,
-} from "@storybook/addon-docs/blocks";
+import { Meta, Story, ArgsTable, Canvas, Controls } from "@storybook/blocks";
 import CatalogEmployeeReactSvg from "PUBLIC_DIR/images/catalog.employee.react.svg?url";
 import ComboBox from "./";
 import * as stories from "./combobox.stories.js";
diff --git a/packages/components/email-chips/email-chips.mdx b/packages/components/email-chips/email-chips.mdx
index 9c96e30776..8891a4a7a6 100644
--- a/packages/components/email-chips/email-chips.mdx
+++ b/packages/components/email-chips/email-chips.mdx
@@ -1,4 +1,4 @@
-import { Meta, Story, ArgsTable, Canvas } from "@storybook/addon-docs/blocks";
+import { Meta, Story, ArgsTable, Canvas } from "@storybook/blocks";
 import EmailChips from "./";
 import * as stories from "./email-chips.stories.js";
 
diff --git a/packages/components/email-input/email-input.mdx b/packages/components/email-input/email-input.mdx
index 1bcee7206f..e6e47f7947 100644
--- a/packages/components/email-input/email-input.mdx
+++ b/packages/components/email-input/email-input.mdx
@@ -1,4 +1,4 @@
-import { Meta, Story, ArgsTable, Canvas } from "@storybook/addon-docs/blocks";
+import { Meta, Story, ArgsTable, Canvas } from "@storybook/blocks";
 
 import EmailInput from "./";
 import * as stories from "./email-input.stories.js";
diff --git a/packages/components/main-button-mobile/main-button-mobile-docs.mdx b/packages/components/main-button-mobile/main-button-mobile-docs.mdx
index 4dd4f268be..54548f4af4 100644
--- a/packages/components/main-button-mobile/main-button-mobile-docs.mdx
+++ b/packages/components/main-button-mobile/main-button-mobile-docs.mdx
@@ -1,10 +1,4 @@
-import {
-  Meta,
-  Story,
-  ArgsTable,
-  Canvas,
-  Controls,
-} from "@storybook/addon-docs/blocks";
+import { Meta, Story, ArgsTable, Canvas, Controls } from "@storybook/blocks";
 
 import * as stories from "./main-button-mobile.stories.js";
 import MainButtonMobile from "./index.js";
@@ -18,7 +12,7 @@ import MainButtonMobile from "./index.js";
 # MainButtonMobile
 
 <Canvas>
-  <Story story={stories.Default} />
+  <Story of={stories.Default} />
 </Canvas>
 
 ## Properties
diff --git a/packages/components/password-input/password-input.mdx b/packages/components/password-input/password-input.mdx
index 1587d6d208..2205e76c64 100644
--- a/packages/components/password-input/password-input.mdx
+++ b/packages/components/password-input/password-input.mdx
@@ -1,34 +1,24 @@
-import { Meta, Story, ArgsTable, Canvas } from "@storybook/addon-docs/blocks";
+import { Meta, Story, ArgsTable, Canvas, Controls } from "@storybook/blocks";
 
 import PasswordInput from "./";
 import * as stories from "./password-input.stories.js";
 import InputBlock from "../input-block";
 
-<Meta
-  title="Components/PasswordInput"
-  component={PasswordInput}
-  subcomponents={{ InputBlock }}
-  argTypes={{
-    onChange: { action: "onChange" },
-    onValidateInput: { action: "onValidateInput" },
-    onCopyToClipboard: { action: "onCopyToClipboard" },
-    onKeyDown: { onKeyDown: "onKeyDown" },
-  }}
-/>
+<Meta title="Components/PasswordInput" component={PasswordInput} />
 
 # PasswordInput
 
 Password entry field with advanced capabilities for displaying, validation of correspondence and generation based on settings
 
 <Canvas>
-  <Story story={stories.basic} name="Default" />
+  <Story of={stories.Default} />
 </Canvas>
 
 ### Properties
 
 You can apply all the parameters of the InputBlock component to the component.
 
-<ArgsTable story="Default" />
+<Controls />
 
 ## Description
 
diff --git a/packages/components/row-content/row-content.mdx b/packages/components/row-content/row-content.mdx
index 40b67169b2..de2cc66979 100644
--- a/packages/components/row-content/row-content.mdx
+++ b/packages/components/row-content/row-content.mdx
@@ -1,4 +1,4 @@
-import { Meta, Story, ArgsTable, Canvas } from "@storybook/addon-docs/blocks";
+import { Meta, Story, ArgsTable, Canvas } from "@storybook/blocks";
 
 import RowContent from "./";
 import * as stories from "./row-content.stories.js";
diff --git a/packages/components/submenu/submenu.mdx b/packages/components/submenu/submenu.mdx
index eb23546ab4..34b3181bf4 100644
--- a/packages/components/submenu/submenu.mdx
+++ b/packages/components/submenu/submenu.mdx
@@ -1,4 +1,4 @@
-import { Canvas, Meta, Story } from "@storybook/addon-docs/blocks";
+import { Canvas, Meta, Story } from "@storybook/blocks";
 
 import Submenu from "./";
 import * as stories from "./submenu.stories.js";
diff --git a/packages/components/tabs-container/tabs-container.mdx b/packages/components/tabs-container/tabs-container.mdx
index 1759d0465b..46eae74b7d 100644
--- a/packages/components/tabs-container/tabs-container.mdx
+++ b/packages/components/tabs-container/tabs-container.mdx
@@ -1,4 +1,4 @@
-import { Story, ArgsTable, Canvas, Meta } from "@storybook/addon-docs/blocks";
+import { Story, ArgsTable, Canvas, Meta } from "@storybook/blocks";
 import * as stories from "./tabs-container.stories.js";
 import TabContainer from "./";
 
diff --git a/packages/components/toast/toast.mdx b/packages/components/toast/toast.mdx
index 6e371388fd..7bf4a108dd 100644
--- a/packages/components/toast/toast.mdx
+++ b/packages/components/toast/toast.mdx
@@ -1,4 +1,4 @@
-import { Story, ArgsTable, Canvas, Meta } from "@storybook/addon-docs/blocks";
+import { Story, ArgsTable, Canvas, Meta } from "@storybook/blocks";
 import * as stories from "./toast.stories.js";
 
 import Toast from "./";
diff --git a/packages/components/tooltip/tooltip.mdx b/packages/components/tooltip/tooltip.mdx
index 22e63d11e4..69400ef486 100644
--- a/packages/components/tooltip/tooltip.mdx
+++ b/packages/components/tooltip/tooltip.mdx
@@ -1,10 +1,4 @@
-import {
-  Story,
-  ArgsTable,
-  Canvas,
-  Meta,
-  Controls,
-} from "@storybook/addon-docs/blocks";
+import { Story, ArgsTable, Canvas, Meta, Controls } from "@storybook/blocks";
 import * as stories from "./tooltip.stories.js";
 
 import Tooltip from "./";
@@ -26,7 +20,7 @@ Custom tooltip
 #### See documentation: https://github.com/wwayne/react-tooltip
 
 <Canvas>
-  <Story story={stories.all} name="All" />
+  <Story of={stories.all} />
 </Canvas>
 
 ### Usage with IconButton
diff --git a/packages/components/tree-menu/tree-menu.mdx b/packages/components/tree-menu/tree-menu.mdx
index 8ffda558ec..d46a2df8a2 100644
--- a/packages/components/tree-menu/tree-menu.mdx
+++ b/packages/components/tree-menu/tree-menu.mdx
@@ -1,4 +1,4 @@
-import { Story, ArgsTable, Canvas, Meta } from "@storybook/addon-docs/blocks";
+import { Story, ArgsTable, Canvas, Meta } from "@storybook/blocks";
 import * as stories from "./tree-menu.stories.js";
 
 import TreeMenu from "./";