diff --git a/docs/snippets/angular/button-story.ts.mdx b/docs/snippets/angular/button-story.ts.mdx
index 6caf5179049..2d760058a54 100644
--- a/docs/snippets/angular/button-story.ts.mdx
+++ b/docs/snippets/angular/button-story.ts.mdx
@@ -1,7 +1,7 @@
 ```ts
 // Button.stories.ts
 
-import { Meta, Story } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 import { Button } from './button.component';
 
@@ -14,7 +14,7 @@ export default {
   component: Button,
 } as Meta;
 
-export const Primary: Story = () => ({
+export const Primary: StoryFn = () => ({
   props: {
     label: 'Button',
     primary: true,
diff --git a/docs/snippets/angular/component-story-custom-args-icons.ts.mdx b/docs/snippets/angular/component-story-custom-args-icons.ts.mdx
index a8fb8434a9d..a2db4b2b85c 100644
--- a/docs/snippets/angular/component-story-custom-args-icons.ts.mdx
+++ b/docs/snippets/angular/component-story-custom-args-icons.ts.mdx
@@ -1,7 +1,7 @@
 ```ts
 // Icon.stories.ts
 
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 import Icon from './icon.component';
 
diff --git a/docs/snippets/angular/component-story-figma-integration.ts.mdx b/docs/snippets/angular/component-story-figma-integration.ts.mdx
index 81294442093..e7f3260a3ba 100644
--- a/docs/snippets/angular/component-story-figma-integration.ts.mdx
+++ b/docs/snippets/angular/component-story-figma-integration.ts.mdx
@@ -1,7 +1,7 @@
 ```ts
 // MyComponent.stories.ts
 
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 import { withDesign } from 'storybook-addon-designs';
 
@@ -15,7 +15,7 @@ export default {
 } as Meta;
 
 // More on component templates: https://storybook.js.org/docs/angular/writing-stories/introduction#using-args
-const Template: Story = () => ({
+const Template: StoryFn = () => ({
   props: {},
 });
 
diff --git a/docs/snippets/angular/component-story-static-asset-without-import.ts.mdx b/docs/snippets/angular/component-story-static-asset-without-import.ts.mdx
index 04357f1f455..3418520c367 100644
--- a/docs/snippets/angular/component-story-static-asset-without-import.ts.mdx
+++ b/docs/snippets/angular/component-story-static-asset-without-import.ts.mdx
@@ -1,7 +1,7 @@
 ```ts
 // MyComponent.stories.ts
 
-import { Meta, Story } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 import { MyComponent } from './MyComponent.component';
 
@@ -15,7 +15,7 @@ export default {
 } as Meta;
 
 // Assume image.png is located in the "public" directory.
-export const WithAnImage: Story = () => ({
+export const WithAnImage: StoryFn = () => ({
   props: {
     src: '/image.png',
     alt: 'my image',
diff --git a/docs/snippets/angular/list-story-with-subcomponents.ts.mdx b/docs/snippets/angular/list-story-with-subcomponents.ts.mdx
index 459bf8791a6..d56a8761723 100644
--- a/docs/snippets/angular/list-story-with-subcomponents.ts.mdx
+++ b/docs/snippets/angular/list-story-with-subcomponents.ts.mdx
@@ -1,7 +1,7 @@
 ```ts
 // List.stories.ts
 
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
+import { Meta, moduleMetadata, StoryFn } from '@storybook/angular';
 
 import { CommonModule } from '@angular/common';
 
@@ -24,13 +24,13 @@ export default {
   ],
 } as Meta;
 
-export const Empty: Story = () => ({
+export const Empty: StoryFn = () => ({
   props: {
     args,
   },
 });
 
-export const OneItem: Story = () => ({
+export const OneItem: StoryFn = () => ({
   props: {
     args,
   },
diff --git a/examples/angular-cli/src/stories/addons/actions/addon-actions.stories.ts b/examples/angular-cli/src/stories/addons/actions/addon-actions.stories.ts
index 17d79bb9397..e262e4d1f05 100644
--- a/examples/angular-cli/src/stories/addons/actions/addon-actions.stories.ts
+++ b/examples/angular-cli/src/stories/addons/actions/addon-actions.stories.ts
@@ -1,5 +1,5 @@
 import { action } from '@storybook/addon-actions';
-import { Meta, Story } from '@storybook/angular';
+import { Meta, StoryFn } from '@storybook/angular';
 import { Button } from '../../angular-demo';
 
 export default {
@@ -7,7 +7,7 @@ export default {
   title: 'Addons/Actions',
 } as Meta;
 
-export const ComponentOutputWithEventEmitter: Story = () => ({
+export const ComponentOutputWithEventEmitter: StoryFn = () => ({
   props: {
     text: 'Button 🥁',
     onClick: action('On click'),
@@ -15,7 +15,7 @@ export const ComponentOutputWithEventEmitter: Story = () => ({
 });
 ComponentOutputWithEventEmitter.storyName = 'Component Output with EventEmitter';
 
-export const UseActionInMethod: Story = () => ({
+export const UseActionInMethod: StoryFn = () => ({
   props: {
     text: 'Button 🥁',
     onClick: (e) => {
@@ -27,7 +27,7 @@ export const UseActionInMethod: Story = () => ({
 });
 UseActionInMethod.storyName = 'Use action in method';
 
-export const StoryTemplate: Story = () => ({
+export const StoryTemplate: StoryFn = () => ({
   template: `<button (click)="onClick($event)" (mouseover)="onOver()">Button</button>`,
   props: {
     onClick: action('On click'),
@@ -36,7 +36,7 @@ export const StoryTemplate: Story = () => ({
 });
 StoryTemplate.storyName = 'Story with template';
 
-export const ComponentOutputWithArgsTypes: Story = (args) => ({
+export const ComponentOutputWithArgsTypes: StoryFn = (args) => ({
   props: {
     text: 'Button 🥁',
     ...args,
diff --git a/examples/angular-cli/src/stories/addons/backgrounds/addon-background.stories.ts b/examples/angular-cli/src/stories/addons/backgrounds/addon-background.stories.ts
index 518f918f94d..fcf5527877d 100644
--- a/examples/angular-cli/src/stories/addons/backgrounds/addon-background.stories.ts
+++ b/examples/angular-cli/src/stories/addons/backgrounds/addon-background.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { Button } from '../../angular-demo';
 
 export default {
@@ -15,11 +15,11 @@ export default {
   },
 } as Meta;
 
-export const WithComponent: Story = () => ({
+export const WithComponent: StoryFn = () => ({
   props: { text: 'Button' },
 });
 
-export const WithTemplate: Story = () => ({
+export const WithTemplate: StoryFn = () => ({
   template: `<storybook-button-component [text]="text" (onClick)="onClick($event)"></storybook-button-component>`,
   props: { text: 'Button' },
 });
diff --git a/examples/angular-cli/src/stories/addons/controls/addon-controls.stories.ts b/examples/angular-cli/src/stories/addons/controls/addon-controls.stories.ts
index 634641218af..162d73b7c85 100644
--- a/examples/angular-cli/src/stories/addons/controls/addon-controls.stories.ts
+++ b/examples/angular-cli/src/stories/addons/controls/addon-controls.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { DocButtonComponent, ISomeInterface } from '../docs/doc-button/doc-button.component';
 
 export default {
diff --git a/examples/angular-cli/src/stories/basics/angular-forms/customControlValueAccessor/custom-cva-component.stories.ts b/examples/angular-cli/src/stories/basics/angular-forms/customControlValueAccessor/custom-cva-component.stories.ts
index d3532b3c443..d438e2cc08a 100644
--- a/examples/angular-cli/src/stories/basics/angular-forms/customControlValueAccessor/custom-cva-component.stories.ts
+++ b/examples/angular-cli/src/stories/basics/angular-forms/customControlValueAccessor/custom-cva-component.stories.ts
@@ -1,6 +1,6 @@
 import { FormsModule } from '@angular/forms';
 import { action } from '@storybook/addon-actions';
-import { moduleMetadata, Meta, Story } from '@storybook/angular';
+import { moduleMetadata, Meta, StoryFn } from '@storybook/angular';
 import { CustomCvaComponent } from './custom-cva.component';
 
 export default {
@@ -18,7 +18,7 @@ export default {
   ],
 } as Meta;
 
-export const SimpleInput: Story = () => ({
+export const SimpleInput: StoryFn = () => ({
   props: {
     ngModel: 'Type anything',
     ngModelChange: action('ngModelChange'),
diff --git a/examples/angular-cli/src/stories/basics/component-with-enums/enums.component.stories.ts b/examples/angular-cli/src/stories/basics/component-with-enums/enums.component.stories.ts
index fcd6a0b9d37..276e652608e 100644
--- a/examples/angular-cli/src/stories/basics/component-with-enums/enums.component.stories.ts
+++ b/examples/angular-cli/src/stories/basics/component-with-enums/enums.component.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import {
   EnumsComponent,
   EnumNumeric,
diff --git a/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-about-parent.stories.ts b/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-about-parent.stories.ts
index 88be0da6a1f..6978b39c44d 100644
--- a/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-about-parent.stories.ts
+++ b/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-about-parent.stories.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { componentWrapperDecorator, moduleMetadata } from '@storybook/angular';
 
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 @Component({
   selector: 'sb-button',
@@ -38,13 +38,13 @@ export default {
 
 // By default storybook uses the default export component if no template or component is defined in the story
 // So Storybook nests the component twice because it is first added by the componentWrapperDecorator.
-export const AlwaysDefineTemplateOrComponent: Story = () => ({});
+export const AlwaysDefineTemplateOrComponent: StoryFn = () => ({});
 
-export const EmptyButton: Story = () => ({
+export const EmptyButton: StoryFn = () => ({
   template: '',
 });
 
-export const WithDynamicContentAndArgs: Story = (args) => ({
+export const WithDynamicContentAndArgs: StoryFn = (args) => ({
   template: `${args.content}`,
 });
 WithDynamicContentAndArgs.argTypes = {
@@ -52,7 +52,7 @@ WithDynamicContentAndArgs.argTypes = {
 };
 WithDynamicContentAndArgs.args = { content: 'My button text' };
 
-export const InH1: Story = () => ({
+export const InH1: StoryFn = () => ({
   template: 'My button in h1',
 });
 InH1.decorators = [componentWrapperDecorator((story) => `<h1>${story}</h1>`)];
@@ -74,7 +74,7 @@ class SbEmojiComponent {
   emoji = '👾';
 }
 
-export const WithComponent: Story = () => ({
+export const WithComponent: StoryFn = () => ({
   // Override the default component
   // It is therefore necessary to manually declare the parent component with moduleMetadata
   component: SbEmojiComponent,
@@ -85,7 +85,7 @@ WithComponent.decorators = [
   }),
 ];
 
-export const WithComponentAndArgs: Story = (args) => {
+export const WithComponentAndArgs: StoryFn = (args) => {
   return {
     props: args,
     component: SbEmojiComponent,
diff --git a/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-simple.stories.ts b/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-simple.stories.ts
index ab3fffd3316..ee684e74c19 100644
--- a/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-simple.stories.ts
+++ b/examples/angular-cli/src/stories/basics/component-with-ng-content/ng-content-simple.stories.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 
-import type { Story, Meta } from '@storybook/angular/';
+import type { Meta, StoryFn } from '@storybook/angular/';
 
 @Component({
   selector: 'storybook-with-ng-content',
@@ -14,13 +14,13 @@ export default {
   component: WithNgContentComponent,
 } as Meta;
 
-export const OnlyComponent: Story = () => ({});
+export const OnlyComponent: StoryFn = () => ({});
 
-export const Default: Story = () => ({
+export const Default: StoryFn = () => ({
   template: `<storybook-with-ng-content><h1>This is rendered in ng-content</h1></storybook-with-ng-content>`,
 });
 
-export const WithDynamicContentAndArgs: Story = (args) => ({
+export const WithDynamicContentAndArgs: StoryFn = (args) => ({
   template: `<storybook-with-ng-content><h1>${args.content}</h1></storybook-with-ng-content>`,
 });
 WithDynamicContentAndArgs.argTypes = {
diff --git a/examples/angular-cli/src/stories/basics/component-with-ng-on-destroy/component-with-on-destroy.stories.ts b/examples/angular-cli/src/stories/basics/component-with-ng-on-destroy/component-with-on-destroy.stories.ts
index 4dbc7d0240e..6e12aae1c44 100644
--- a/examples/angular-cli/src/stories/basics/component-with-ng-on-destroy/component-with-on-destroy.stories.ts
+++ b/examples/angular-cli/src/stories/basics/component-with-ng-on-destroy/component-with-on-destroy.stories.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 @Component({
   selector: 'on-destroy',
@@ -37,6 +37,6 @@ export default {
   },
 } as Meta;
 
-export const SimpleComponent: Story = () => ({
+export const SimpleComponent: StoryFn = () => ({
   component: OnDestroyComponent,
 });
diff --git a/examples/angular-cli/src/stories/basics/component-with-pipe/custom-pipes.stories.ts b/examples/angular-cli/src/stories/basics/component-with-pipe/custom-pipes.stories.ts
index f8c4343737d..95602e0d780 100644
--- a/examples/angular-cli/src/stories/basics/component-with-pipe/custom-pipes.stories.ts
+++ b/examples/angular-cli/src/stories/basics/component-with-pipe/custom-pipes.stories.ts
@@ -1,4 +1,4 @@
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
+import { Meta, moduleMetadata, StoryFn } from '@storybook/angular';
 
 import { CustomPipePipe } from './custom.pipe';
 import { WithPipeComponent } from './with-pipe.component';
@@ -13,13 +13,13 @@ export default {
   ],
 } as Meta;
 
-export const Simple: Story = () => ({
+export const Simple: StoryFn = () => ({
   props: {
     field: 'foobar',
   },
 });
 
-export const WithArgsStory: Story = (args) => ({
+export const WithArgsStory: StoryFn = (args) => ({
   props: args,
 });
 WithArgsStory.storyName = 'With args';
diff --git a/examples/angular-cli/src/stories/basics/component-without-selector/without-selector.stories.ts b/examples/angular-cli/src/stories/basics/component-without-selector/without-selector.stories.ts
index 14892020032..d0660093f45 100644
--- a/examples/angular-cli/src/stories/basics/component-without-selector/without-selector.stories.ts
+++ b/examples/angular-cli/src/stories/basics/component-without-selector/without-selector.stories.ts
@@ -1,4 +1,4 @@
-import { moduleMetadata, Story, Meta } from '@storybook/angular';
+import { moduleMetadata, StoryFn, Meta } from '@storybook/angular';
 import { WithoutSelectorComponent, WITHOUT_SELECTOR_DATA } from './without-selector.component';
 
 export default {
@@ -11,11 +11,11 @@ export default {
   ],
 } as Meta;
 
-export const SimpleComponent: Story = () => ({});
+export const SimpleComponent: StoryFn = () => ({});
 
 // Live changing of args by controls does not work for now. When changing args storybook does not fully
 // reload and therefore does not take into account the change of provider.
-export const WithInjectionTokenAndArgs: Story = (args) => ({
+export const WithInjectionTokenAndArgs: StoryFn = (args) => ({
   props: args,
   moduleMetadata: {
     providers: [
diff --git a/examples/angular-cli/src/stories/core/moduleMetadata/in-export-default.stories.ts b/examples/angular-cli/src/stories/core/moduleMetadata/in-export-default.stories.ts
index aa6e01e8a90..ad05fd12f07 100644
--- a/examples/angular-cli/src/stories/core/moduleMetadata/in-export-default.stories.ts
+++ b/examples/angular-cli/src/stories/core/moduleMetadata/in-export-default.stories.ts
@@ -1,4 +1,4 @@
-import { moduleMetadata, Story, Meta } from '@storybook/angular';
+import { moduleMetadata, StoryFn, Meta } from '@storybook/angular';
 import { TokenComponent, ITEMS, DEFAULT_NAME } from './angular-src/token.component';
 
 export default {
@@ -21,7 +21,7 @@ export default {
   ],
 } as Meta;
 
-export const Story1: Story = () => ({
+export const Story1: StoryFn = () => ({
   template: `<storybook-simple-token-component [name]="name"></storybook-simple-token-component>`,
   props: {
     name: 'Prop Name',
@@ -30,7 +30,7 @@ export const Story1: Story = () => ({
 
 Story1.storyName = 'Story 1';
 
-export const Story2: Story = () => ({
+export const Story2: StoryFn = () => ({
   template: `<storybook-simple-token-component></storybook-simple-token-component>`,
 });
 
diff --git a/examples/angular-cli/src/stories/core/moduleMetadata/in-stories.stories.ts b/examples/angular-cli/src/stories/core/moduleMetadata/in-stories.stories.ts
index bfd46f2bd9a..22bb6a8c4ba 100644
--- a/examples/angular-cli/src/stories/core/moduleMetadata/in-stories.stories.ts
+++ b/examples/angular-cli/src/stories/core/moduleMetadata/in-stories.stories.ts
@@ -1,11 +1,11 @@
-import { Meta, Story } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { TokenComponent, ITEMS, DEFAULT_NAME } from './angular-src/token.component';
 
 export default {
   title: 'Core / ModuleMetadata / In stories',
 } as Meta;
 
-export const Individual1: Story = () => ({
+export const Individual1: StoryFn = () => ({
   template: `<storybook-simple-token-component [name]="name"></storybook-simple-token-component>`,
   props: {
     name: 'Prop Name',
@@ -24,7 +24,7 @@ export const Individual1: Story = () => ({
 
 Individual1.storyName = 'Individual 1';
 
-export const Individual2: Story = () => ({
+export const Individual2: StoryFn = () => ({
   template: `<storybook-simple-token-component></storybook-simple-token-component>`,
   moduleMetadata: {
     imports: [],
diff --git a/examples/angular-cli/src/stories/core/moduleMetadata/merge-default-and-story.stories.ts b/examples/angular-cli/src/stories/core/moduleMetadata/merge-default-and-story.stories.ts
index b14ca16572c..81fe1018180 100644
--- a/examples/angular-cli/src/stories/core/moduleMetadata/merge-default-and-story.stories.ts
+++ b/examples/angular-cli/src/stories/core/moduleMetadata/merge-default-and-story.stories.ts
@@ -1,4 +1,4 @@
-import { moduleMetadata, Meta, Story } from '@storybook/angular';
+import { moduleMetadata, Meta, StoryFn } from '@storybook/angular';
 import { TokenComponent, ITEMS, DEFAULT_NAME } from './angular-src/token.component';
 import { CustomPipePipe } from './angular-src/custom.pipe';
 
@@ -21,7 +21,7 @@ export default {
   ],
 } as Meta;
 
-export const MergeWithDefaultModuleMetadata: Story = () => ({
+export const MergeWithDefaultModuleMetadata: StoryFn = () => ({
   template: `<storybook-simple-token-component [name]="name | customPipe"></storybook-simple-token-component>`,
   props: {
     name: 'Prop Name',
diff --git a/examples/angular-cli/src/stories/core/parameters/all-parameters.stories.ts b/examples/angular-cli/src/stories/core/parameters/all-parameters.stories.ts
index 1de4c5655bd..f81dac8cbbb 100644
--- a/examples/angular-cli/src/stories/core/parameters/all-parameters.stories.ts
+++ b/examples/angular-cli/src/stories/core/parameters/all-parameters.stories.ts
@@ -1,5 +1,5 @@
 import { addParameters } from '@storybook/angular';
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { Button } from '../../angular-demo';
 
 const globalParameter = 'globalParameter';
diff --git a/examples/angular-cli/src/stories/core/parameters/layout.parameters.stories.ts b/examples/angular-cli/src/stories/core/parameters/layout.parameters.stories.ts
index b0d1e69d411..4bdc282a816 100644
--- a/examples/angular-cli/src/stories/core/parameters/layout.parameters.stories.ts
+++ b/examples/angular-cli/src/stories/core/parameters/layout.parameters.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { Button } from '../../angular-demo';
 
 export default {
@@ -6,26 +6,26 @@ export default {
   component: Button,
 } as Meta;
 
-export const Default: Story = () => ({
+export const Default: StoryFn = () => ({
   props: { text: 'Button' },
 });
 
-export const Fullscreen: Story = () => ({
+export const Fullscreen: StoryFn = () => ({
   template: `<div style="background-color: yellow;"><storybook-button-component text="Button"></storybook-button-component></div>`,
 });
 Fullscreen.parameters = { layout: 'fullscreen' };
 
-export const Centered: Story = () => ({
+export const Centered: StoryFn = () => ({
   props: { text: 'Button' },
 });
 Centered.parameters = { layout: 'centered' };
 
-export const Padded: Story = () => ({
+export const Padded: StoryFn = () => ({
   props: { text: 'Button' },
 });
 Padded.parameters = { layout: 'padded' };
 
-export const None: Story = () => ({
+export const None: StoryFn = () => ({
   props: { text: 'Button' },
 });
 None.parameters = { layout: 'none' };
diff --git a/examples/angular-cli/src/stories/core/styles/story-styles.stories.ts b/examples/angular-cli/src/stories/core/styles/story-styles.stories.ts
index e87bafcd171..2d3d7f08737 100644
--- a/examples/angular-cli/src/stories/core/styles/story-styles.stories.ts
+++ b/examples/angular-cli/src/stories/core/styles/story-styles.stories.ts
@@ -1,4 +1,4 @@
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
+import { Meta, moduleMetadata, StoryFn } from '@storybook/angular';
 import { action } from '@storybook/addon-actions';
 import { Button } from '../../angular-demo';
 
@@ -11,7 +11,7 @@ export default {
   ],
 } as Meta;
 
-export const TemplateStory: Story = () => ({
+export const TemplateStory: StoryFn = () => ({
   template: `<storybook-button-component [text]="text" (onClick)="onClick($event)"></storybook-button-component>`,
   props: {
     text: 'Button with custom styles',
@@ -28,7 +28,7 @@ export const TemplateStory: Story = () => ({
 });
 TemplateStory.storyName = 'With story template';
 
-export const WithArgsStory: Story = (args) => ({
+export const WithArgsStory: StoryFn = (args) => ({
   template: `<storybook-button-component [text]="text" (onClick)="onClick($event)"></storybook-button-component>`,
   props: args,
   styles: [
diff --git a/examples/angular-cli/src/stories/from-cli/Button.stories.ts b/examples/angular-cli/src/stories/from-cli/Button.stories.ts
index b7d4f738b58..50b07f736ba 100644
--- a/examples/angular-cli/src/stories/from-cli/Button.stories.ts
+++ b/examples/angular-cli/src/stories/from-cli/Button.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import Button from './button.component';
 
 // More on default export: https://storybook.js.org/docs/angular/writing-stories/introduction#default-export
diff --git a/examples/angular-cli/src/stories/legacy/component-in-story.stories.ts b/examples/angular-cli/src/stories/legacy/component-in-story.stories.ts
index e624b313fda..b6d1736f580 100644
--- a/examples/angular-cli/src/stories/legacy/component-in-story.stories.ts
+++ b/examples/angular-cli/src/stories/legacy/component-in-story.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { Button } from '../angular-demo';
 
 export default {
diff --git a/examples/angular-cli/src/stories/others/issues/12009-unknown-component.stories.ts b/examples/angular-cli/src/stories/others/issues/12009-unknown-component.stories.ts
index 8dab14604b4..7c5c2bce80f 100644
--- a/examples/angular-cli/src/stories/others/issues/12009-unknown-component.stories.ts
+++ b/examples/angular-cli/src/stories/others/issues/12009-unknown-component.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { Button } from '../../angular-demo';
 
 export default {
diff --git a/examples/angular-cli/src/stories/others/ngrx/ngrx-store.stories.ts b/examples/angular-cli/src/stories/others/ngrx/ngrx-store.stories.ts
index 1337b8e1de0..ba24cf01b11 100644
--- a/examples/angular-cli/src/stories/others/ngrx/ngrx-store.stories.ts
+++ b/examples/angular-cli/src/stories/others/ngrx/ngrx-store.stories.ts
@@ -1,7 +1,7 @@
 import { Store, StoreModule } from '@ngrx/store';
 import { Component } from '@angular/core';
 
-import { Meta, moduleMetadata, Story } from '@storybook/angular';
+import { Meta, moduleMetadata, StoryFn } from '@storybook/angular';
 
 @Component({
   selector: 'storybook-comp-with-store',
@@ -41,10 +41,10 @@ export default {
   ],
 } as Meta;
 
-export const WithComponent: Story = () => ({
+export const WithComponent: StoryFn = () => ({
   component: WithStoreComponent,
 });
 
-export const WithTemplate: Story = () => ({
+export const WithTemplate: StoryFn = () => ({
   template: `<storybook-comp-with-store></storybook-comp-with-store>`,
 });
diff --git a/examples/angular-cli/src/stories/welcome-angular.stories.ts b/examples/angular-cli/src/stories/welcome-angular.stories.ts
index b4db8a45313..200f29ea4aa 100644
--- a/examples/angular-cli/src/stories/welcome-angular.stories.ts
+++ b/examples/angular-cli/src/stories/welcome-angular.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { linkTo } from '@storybook/addon-links';
 import { AppComponent } from '../app/app.component';
 
@@ -6,7 +6,7 @@ export default {
   title: 'Welcome/ To Angular',
 } as Meta;
 
-export const ToAngular: Story = () => ({
+export const ToAngular: StoryFn = () => ({
   component: AppComponent,
   props: {
     showApp: linkTo('Button'),
diff --git a/examples/angular-cli/src/stories/welcome-storybook.stories.ts b/examples/angular-cli/src/stories/welcome-storybook.stories.ts
index 961ddee0f1d..326f727a9e4 100644
--- a/examples/angular-cli/src/stories/welcome-storybook.stories.ts
+++ b/examples/angular-cli/src/stories/welcome-storybook.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import { linkTo } from '@storybook/addon-links';
 import { Welcome } from './angular-demo';
 
@@ -6,7 +6,7 @@ export default {
   title: 'Welcome/ To Storybook',
 } as Meta;
 
-export const ToStorybook: Story = () => ({
+export const ToStorybook: StoryFn = () => ({
   component: Welcome,
   props: {
     showApp: linkTo('Button'),
diff --git a/examples/html-kitchen-sink/stories/from-essentials/Button.stories.ts b/examples/html-kitchen-sink/stories/from-essentials/Button.stories.ts
index 71529cb45f2..2457dda8f2a 100644
--- a/examples/html-kitchen-sink/stories/from-essentials/Button.stories.ts
+++ b/examples/html-kitchen-sink/stories/from-essentials/Button.stories.ts
@@ -1,4 +1,4 @@
-import type { Story, Meta } from '@storybook/html';
+import type { Meta, StoryFn } from '@storybook/html';
 import { createButton, ButtonProps } from './Button';
 
 export default {
diff --git a/examples/vue-3-cli/src/stories/CSF3.stories.ts b/examples/vue-3-cli/src/stories/CSF3.stories.ts
index bb27cf7102f..eaf9611daab 100644
--- a/examples/vue-3-cli/src/stories/CSF3.stories.ts
+++ b/examples/vue-3-cli/src/stories/CSF3.stories.ts
@@ -1,5 +1,5 @@
 import { userEvent, within } from '@storybook/testing-library';
-import type { Story, Meta } from '@storybook/vue3';
+import type { Meta, StoryFn } from '@storybook/vue3';
 import Button from './Button.vue';
 
 export default {
diff --git a/examples/web-components-kitchen-sink/src/stories/addons/a11y/addon-a11y.stories.ts b/examples/web-components-kitchen-sink/src/stories/addons/a11y/addon-a11y.stories.ts
index 28c3206317e..7af2e6e1024 100644
--- a/examples/web-components-kitchen-sink/src/stories/addons/a11y/addon-a11y.stories.ts
+++ b/examples/web-components-kitchen-sink/src/stories/addons/a11y/addon-a11y.stories.ts
@@ -1,5 +1,5 @@
 import { html } from 'lit';
-import type { Story, Meta } from '@storybook/web-components';
+import type { Meta, StoryFn } from '@storybook/web-components';
 
 const text = 'Testing the a11y addon';
 
diff --git a/examples/web-components-kitchen-sink/src/stories/addons/actions/addon-actions.stories.ts b/examples/web-components-kitchen-sink/src/stories/addons/actions/addon-actions.stories.ts
index 631996fca30..8725d0ae08b 100644
--- a/examples/web-components-kitchen-sink/src/stories/addons/actions/addon-actions.stories.ts
+++ b/examples/web-components-kitchen-sink/src/stories/addons/actions/addon-actions.stories.ts
@@ -1,5 +1,5 @@
 import { html } from 'lit';
-import type { Story, Meta } from '@storybook/web-components';
+import type { Meta, StoryFn } from '@storybook/web-components';
 
 export default {
   title: 'Addons / Actions',
diff --git a/examples/web-components-kitchen-sink/src/stories/addons/background/addon-background.stories.ts b/examples/web-components-kitchen-sink/src/stories/addons/background/addon-background.stories.ts
index b0c62c6af02..c9cf419711a 100644
--- a/examples/web-components-kitchen-sink/src/stories/addons/background/addon-background.stories.ts
+++ b/examples/web-components-kitchen-sink/src/stories/addons/background/addon-background.stories.ts
@@ -1,5 +1,5 @@
 import { html } from 'lit';
-import type { Story, Meta } from '@storybook/web-components';
+import type { Meta, StoryFn } from '@storybook/web-components';
 
 export default {
   title: 'Addons / Backgrounds',
diff --git a/examples/web-components-kitchen-sink/src/stories/addons/controls/addon-controls.stories.ts b/examples/web-components-kitchen-sink/src/stories/addons/controls/addon-controls.stories.ts
index 32246ac26cd..a1ba776a903 100644
--- a/examples/web-components-kitchen-sink/src/stories/addons/controls/addon-controls.stories.ts
+++ b/examples/web-components-kitchen-sink/src/stories/addons/controls/addon-controls.stories.ts
@@ -1,5 +1,5 @@
 import { html } from 'lit';
-import type { Story, Meta } from '@storybook/web-components';
+import type { Meta, StoryFn } from '@storybook/web-components';
 import '../../../components/sb-button';
 
 export default {
diff --git a/frameworks/angular/src/client/angular-beta/StorybookModule.ts b/frameworks/angular/src/client/angular-beta/StorybookModule.ts
index 275b490c18b..cebbb992938 100644
--- a/frameworks/angular/src/client/angular-beta/StorybookModule.ts
+++ b/frameworks/angular/src/client/angular-beta/StorybookModule.ts
@@ -17,7 +17,7 @@ const deprecatedStoryComponentWarning = deprecate(
         Instead, use \`export const default = () => ({ component: AppComponent });\`
         or
         \`\`\`
-        export const Primary: Story = () => ({});
+        export const Primary: StoryFn = () => ({});
         Primary.parameters = { component: AppComponent };
         \`\`\`
         Read more at 
diff --git a/lib/cli/src/frameworks/angular/Button.stories.ts b/lib/cli/src/frameworks/angular/Button.stories.ts
index 874e24a2462..4abadd48d2b 100644
--- a/lib/cli/src/frameworks/angular/Button.stories.ts
+++ b/lib/cli/src/frameworks/angular/Button.stories.ts
@@ -1,5 +1,5 @@
 // also exported from '@storybook/angular' if you can deal with breaking changes in 6.1
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 import Button from './button.component';
 
 // More on default export: https://storybook.js.org/docs/angular/writing-stories/introduction#default-export
diff --git a/lib/cli/src/frameworks/angular/Header.stories.ts b/lib/cli/src/frameworks/angular/Header.stories.ts
index 200ed576639..bdd9c7e3b68 100644
--- a/lib/cli/src/frameworks/angular/Header.stories.ts
+++ b/lib/cli/src/frameworks/angular/Header.stories.ts
@@ -1,6 +1,6 @@
 import { moduleMetadata } from '@storybook/angular';
 import { CommonModule } from '@angular/common';
-import type { Story, Meta } from '@storybook/angular';
+import type { Meta, StoryFn } from '@storybook/angular';
 
 import Button from './button.component';
 import Header from './header.component';