diff --git a/packages/orbit-components/src/InputGroup/InputGroup.stories.tsx b/packages/orbit-components/src/InputGroup/InputGroup.stories.tsx
index 0100d8da0c..a485b27976 100644
--- a/packages/orbit-components/src/InputGroup/InputGroup.stories.tsx
+++ b/packages/orbit-components/src/InputGroup/InputGroup.stories.tsx
@@ -1,20 +1,59 @@
 import * as React from "react";
+import type { Meta, StoryObj } from "@storybook/react";
 import { action } from "@storybook/addon-actions";
 
 import Stack from "../Stack";
 import InputField from "../InputField";
 import Select from "../Select";
-import { SIZE_OPTIONS } from "./consts";
 import CountryFlag from "../CountryFlag";
 import RenderInRtl from "../utils/rtl/RenderInRtl";
 import { SPACINGS_AFTER } from "../common/consts";
 
 import InputGroup from ".";
 
-export default {
+type InputGroupPropsAndCustomArgs = React.ComponentProps<typeof InputGroup> & {
+  inputValue?: string | number;
+  placeholder?: string;
+  selectValue?: string | number;
+  errorGroup?: string;
+  helpGroup?: string;
+  errorSingleField?: string;
+  helpSingleField?: string;
+};
+
+const meta: Meta<InputGroupPropsAndCustomArgs> = {
   title: "InputGroup",
+  component: InputGroup,
+
+  parameters: {
+    controls: {
+      exclude: ["onChange", "onFocus", "onBlur", "onBlurGroup", "size"],
+    },
+  },
+
+  args: {
+    error: "",
+    help: "",
+    helpClosable: true,
+    onChange: action("onChange"),
+    onFocus: action("onFocus"),
+    onBlur: action("onBlur"),
+    onBlurGroup: action("onBlurGroup"),
+  },
+
+  argTypes: {
+    spaceAfter: {
+      options: Object.values(SPACINGS_AFTER),
+      control: {
+        type: "select",
+      },
+    },
+  },
 };
 
+export default meta;
+type Story = StoryObj<InputGroupPropsAndCustomArgs>;
+
 const selectOptionsMonths = [
   { value: "January", label: "January" },
   { value: "February", label: "February" },
@@ -30,16 +69,9 @@ const selectOptionsMonths = [
   { value: "December", label: "December" },
 ];
 
-export const DateOfBirth = ({ label, flex, error, help, selectValue }) => {
-  return (
-    <InputGroup
-      label={label}
-      flex={flex}
-      onChange={action("onChange")}
-      onFocus={action("onFocus")}
-      onBlur={action("onBlur")}
-      onBlurGroup={action("onBlurGroup")}
-    >
+export const DateOfBirth: Story = {
+  render: ({ error, help, selectValue, ...args }) => (
+    <InputGroup {...args}>
       <InputField
         placeholder="DD"
         error={error}
@@ -51,92 +83,63 @@ export const DateOfBirth = ({ label, flex, error, help, selectValue }) => {
       <Select options={selectOptionsMonths} value={selectValue} placeholder="Month" />
       <InputField placeholder="YYYY" />
     </InputGroup>
-  );
-};
-
-DateOfBirth.story = {
-  name: "Date of birth",
+  ),
 
-  parameters: {
-    info: "Some description about this type of InputGroup in general.",
+  args: {
+    label: "Date of birth",
+    flex: ["0 0 60px", "1 1 100%", "0 0 90px"],
+    selectValue: selectOptionsMonths[0].value,
   },
-};
-
-DateOfBirth.args = {
-  label: "Date of birth",
-  flex: ["0 0 60px", "1 1 100%", "0 0 90px"],
-  error: "",
-  help: "",
-  selectValue: selectOptionsMonths[0].value,
-};
 
-DateOfBirth.argTypes = {
-  selectValue: {
-    options: selectOptionsMonths.map(opt => opt.value),
-    control: {
-      type: "select",
+  argTypes: {
+    selectValue: {
+      options: selectOptionsMonths.map(opt => opt.value),
+      control: {
+        type: "select",
+      },
     },
   },
 };
 
 const selectOptionsPhoneNumber = [
-  { value: 0, label: "Czech Republic (+420)" },
-  { value: 1, label: "Slovak Republic (+421)" },
-  { value: 2, label: "United States (+1)" },
+  { value: 0, label: "Czech Republic (+420)", code: "cz" },
+  { value: 1, label: "Slovak Republic (+421)", code: "sk" },
+  { value: 2, label: "United States (+1)", code: "us" },
 ];
 
-export const PhoneNumber = ({
-  flex,
-  error,
-  help,
-  selectValue,
-  customValueText,
-  placeholder,
-  inputValue,
-}) => {
-  return (
-    <InputGroup
-      flex={flex}
-      onChange={action("onChange")}
-      onFocus={action("onFocus")}
-      onBlur={action("onBlur")}
-    >
-      <Select
-        options={selectOptionsPhoneNumber}
-        value={selectValue}
-        customValueText={customValueText}
-        prefix={<CountryFlag code="cz" />}
-        error={error}
-        help={help}
-      />
-      <InputField placeholder={placeholder} maxLength={11} value={inputValue} />
-    </InputGroup>
-  );
-};
-
-PhoneNumber.story = {
-  name: "Phone number",
-
-  parameters: {
-    info: "Some description about this type of InputGroup in general.",
+export const PhoneNumber: Story = {
+  render: ({ error, help, selectValue, placeholder, inputValue, ...args }) => {
+    const countryFlagCode = selectOptionsPhoneNumber.filter(
+      option => option.value === selectValue,
+    )[0].code;
+
+    return (
+      <InputGroup {...args}>
+        <Select
+          options={selectOptionsPhoneNumber}
+          value={selectValue}
+          prefix={<CountryFlag code={countryFlagCode} />}
+          error={error}
+          help={help}
+        />
+        <InputField placeholder={placeholder} maxLength={11} value={inputValue} />
+      </InputGroup>
+    );
   },
-};
 
-PhoneNumber.args = {
-  flex: ["0 0 110px", "1 1 100%"],
-  error: "",
-  help: "",
-  selectValue: selectOptionsPhoneNumber[0].value,
-  customValueText: "+420",
-  placeholder: "e.g. 123 456 789",
-  inputValue: "",
-};
+  args: {
+    flex: ["0 0 250px", "1 1 100%"],
+    selectValue: selectOptionsPhoneNumber[0].value,
+    placeholder: "e.g. 123 456 789",
+    inputValue: "",
+  },
 
-PhoneNumber.argTypes = {
-  selectValue: {
-    options: selectOptionsPhoneNumber.map(opt => opt.value),
-    control: {
-      type: "select",
+  argTypes: {
+    selectValue: {
+      options: selectOptionsPhoneNumber.map(opt => opt.value),
+      control: {
+        type: "select",
+      },
     },
   },
 };
@@ -155,53 +158,46 @@ const selectOptionsError = [
   { value: "November", label: "November" },
   { value: "December", label: "December" },
 ];
-export const Error = ({ label, flex, error, help, selectValue }) => {
-  return (
-    <InputGroup
-      label={label}
-      flex={flex}
-      onChange={action("onChange")}
-      onFocus={action("onFocus")}
-      onBlur={action("onBlur")}
-    >
-      <InputField placeholder="DD" error={error} help={help} />
+
+export const Error: Story = {
+  render: ({ error, selectValue, ...args }) => (
+    <InputGroup {...args}>
+      <InputField placeholder="DD" error={error} />
       <Select
         options={selectOptionsError}
         value={selectValue}
         placeholder="Month"
         error="Something went wrong on month field"
-        help={help}
       />
-      <InputField placeholder="YYYY" error="Something went wrong on year field" help={help} />
+      <InputField placeholder="YYYY" />
     </InputGroup>
-  );
-};
+  ),
 
-Error.args = {
-  label: "Label",
-  flex: ["0 0 60px", "1 1 100%", "0 0 90px"],
-  error: "Something went wrong on day field",
-  help: "",
-  selectValue: selectOptionsError[0].value,
-};
+  parameters: {
+    controls: {
+      exclude: ["onChange", "onFocus", "onBlur", "onBlurGroup", "size", "help", "helpClosable"],
+    },
+  },
 
-Error.argTypes = {
-  selectValue: {
-    options: selectOptionsError.map(opt => opt.value),
-    control: {
-      type: "select",
+  args: {
+    label: "Label",
+    flex: ["0 0 60px", "1 1 100%", "0 0 90px"],
+    selectValue: selectOptionsError[0].value,
+    error: "Something went wrong on day field",
+  },
+
+  argTypes: {
+    selectValue: {
+      options: selectOptionsError.map(opt => opt.value),
+      control: {
+        type: "select",
+      },
     },
   },
 };
 
-export const ValidationApproaches = ({
-  inputValue,
-  errorGroup,
-  helpGroup,
-  errorSingleField,
-  helpSingleField,
-}) => {
-  return (
+export const ValidationApproaches: Story = {
+  render: ({ inputValue, errorGroup, helpGroup, errorSingleField, helpSingleField }) => (
     <Stack direction="column">
       <InputGroup
         label="Events and states on group"
@@ -215,7 +211,7 @@ export const ValidationApproaches = ({
         <InputField placeholder="b" maxLength={11} value={inputValue} />
       </InputGroup>
 
-      <InputGroup label="Events andd states on children" error={errorGroup}>
+      <InputGroup label="Events and states on children" error={errorGroup} help={helpGroup}>
         <InputField
           placeholder="c"
           maxLength={11}
@@ -238,27 +234,35 @@ export const ValidationApproaches = ({
         />
       </InputGroup>
     </Stack>
-  );
-};
-
-ValidationApproaches.story = {
-  name: "Validation approches",
+  ),
 
   parameters: {
-    info: "Some description about this type of InputGroup in general.",
+    controls: {
+      exclude: [
+        "onChange",
+        "onFocus",
+        "onBlur",
+        "onBlurGroup",
+        "error",
+        "help",
+        "helpClosable",
+        "size",
+        "spaceAfter",
+      ],
+    },
   },
-};
 
-ValidationApproaches.args = {
-  inputValue: "",
-  errorGroup: "Something went wrong on day field",
-  helpGroup: "",
-  errorSingleField: "Something went wrong on day field",
-  helpSingleField: "",
+  args: {
+    inputValue: "",
+    errorGroup: "Something went wrong on day field",
+    helpGroup: "",
+    errorSingleField: "Something went wrong on day field",
+    helpSingleField: "",
+  },
 };
 
-export const OnChangeBehavior = ({ inputValue }) => {
-  return (
+export const OnChangeBehavior: Story = {
+  render: ({ inputValue }) => (
     <Stack direction="column">
       <InputGroup label="Change in group" onChange={action("onChange a+b")}>
         <InputField placeholder="a" maxLength={11} value={inputValue} />
@@ -280,32 +284,41 @@ export const OnChangeBehavior = ({ inputValue }) => {
         />
       </InputGroup>
     </Stack>
-  );
-};
-
-OnChangeBehavior.story = {
-  name: "onChange behaviour",
+  ),
 
   parameters: {
-    info: "Some description about this type of InputGroup in general.",
+    controls: {
+      exclude: [
+        "onChange",
+        "onFocus",
+        "onBlur",
+        "onBlurGroup",
+        "error",
+        "help",
+        "helpClosable",
+        "size",
+        "spaceAfter",
+      ],
+    },
   },
-};
 
-OnChangeBehavior.args = {
-  inputValue: "",
+  args: {
+    inputValue: "",
+  },
 };
 
-export const Disabled = () => {
-  return (
-    <InputGroup disabled label="Disabled">
+export const Disabled: Story = {
+  render: args => (
+    <InputGroup {...args}>
       <InputField placeholder="a" maxLength={11} />
       <InputField placeholder="b" maxLength={11} />
     </InputGroup>
-  );
-};
+  ),
 
-Disabled.story = {
-  name: "Disabled",
+  args: {
+    label: "Disabled",
+    disabled: true,
+  },
 };
 
 const selectOptionsPlayground = [
@@ -313,116 +326,63 @@ const selectOptionsPlayground = [
   { value: 2, label: "Second item" },
 ];
 
-export const Playground = ({
-  label,
-  flex,
-  size,
-  error,
-  help,
-  selectValue,
-  placeholder,
-  inputValue,
-  dataTest,
-  spaceAfter,
-}) => {
-  return (
-    <InputGroup
-      label={label}
-      flex={flex}
-      size={size}
-      onChange={action("onChange")}
-      onFocus={action("onFocus")}
-      onBlur={action("onBlur")}
-      dataTest={dataTest}
-      spaceAfter={spaceAfter}
-    >
+export const Playground: Story = {
+  render: ({ error, help, selectValue, placeholder, inputValue, ...args }) => (
+    <InputGroup {...args}>
       <Select options={selectOptionsPlayground} value={selectValue} error={error} help={help} />
       <InputField placeholder={placeholder} value={inputValue} />
       <Select options={selectOptionsPlayground} value={selectValue} />
       <InputField placeholder={placeholder} value={inputValue} />
     </InputGroup>
-  );
-};
-
-Playground.story = {
-  parameters: {
-    info: "Some description about this type of InputGroup in general.",
+  ),
+
+  args: {
+    label: "Label",
+    flex: ["1 0 200px", "1 1 100%", "1 0 150px", "0 1 50%"],
+    selectValue: selectOptionsPlayground[0].value,
+    placeholder: "Placeholder",
+    inputValue: "",
+    spaceAfter: SPACINGS_AFTER.MEDIUM,
+    disabled: false,
   },
-};
 
-Playground.args = {
-  label: "Phone number",
-  flex: ["1 0 200px", "1 1 100%", "1 0 150px", "0 1 50%"],
-  size: SIZE_OPTIONS.NORMAL,
-  error: "",
-  help: "",
-  selectValue: selectOptionsPlayground[0].value,
-  placeholder: "Placeholder",
-  inputValue: "",
-  dataTest: "test",
-  spaceAfter: SPACINGS_AFTER.MEDIUM,
-};
-
-Playground.argTypes = {
-  size: {
-    options: Object.values(SIZE_OPTIONS),
-    control: {
-      type: "select",
-    },
-  },
-  selectValue: {
-    options: selectOptionsPlayground.map(opt => opt.value),
-    control: {
-      type: "select",
-    },
-  },
-  spaceAfter: {
-    options: Object.values(SPACINGS_AFTER),
-    control: {
-      type: "select",
+  argTypes: {
+    selectValue: {
+      options: selectOptionsPlayground.map(opt => opt.value),
+      control: {
+        type: "select",
+      },
     },
   },
 };
 
-export const Rtl = ({ flex, selectValue, error, help, label }) => {
-  return (
+export const Rtl: Story = {
+  render: ({ selectValue, error, help, ...args }) => (
     <RenderInRtl>
-      <InputGroup
-        flex={flex}
-        onChange={action("onChange")}
-        onFocus={action("onFocus")}
-        onBlur={action("onBlur")}
-        label={label}
-      >
+      <InputGroup {...args}>
         <InputField placeholder="DD" help={help} error={error} />
         <Select options={selectOptionsMonths} value={selectValue} placeholder="Month" />
         <InputField placeholder="YYYY" />
       </InputGroup>
     </RenderInRtl>
-  );
-};
-
-Rtl.story = {
-  name: "RTL",
+  ),
 
   parameters: {
     info: "This is a preview of this component in RTL setup.",
   },
-};
 
-Rtl.args = {
-  flex: ["0 0 60px", "1 1 100%", "0 0 90px"],
-  selectValue: selectOptionsMonths[0].value,
-  error: "",
-  help: "",
-  label: "Phone number",
-};
+  args: {
+    label: "Date of birth",
+    flex: ["0 0 60px", "1 1 100%", "0 0 90px"],
+    selectValue: selectOptionsMonths[0].value,
+  },
 
-Rtl.argTypes = {
-  selectValue: {
-    options: selectOptionsMonths.map(opt => opt.value),
-    control: {
-      type: "select",
+  argTypes: {
+    selectValue: {
+      options: selectOptionsMonths.map(opt => opt.value),
+      control: {
+        type: "select",
+      },
     },
   },
 };