diff --git a/webapp/src/app/ui/avatar/avatar.stories.ts b/webapp/src/app/ui/avatar/avatar.stories.ts
index d315c9cc..d77b60e4 100644
--- a/webapp/src/app/ui/avatar/avatar.stories.ts
+++ b/webapp/src/app/ui/avatar/avatar.stories.ts
@@ -1,34 +1,61 @@
-import { moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
+import { argsToTemplate, moduleMetadata, type Meta, type StoryObj } from '@storybook/angular';
 import { AvatarComponent } from './avatar.component';
 import { AvatarImageComponent } from './avatar-image.component';
 import { AvatarFallbackComponent } from './avatar-fallback.component';
 
-const meta: Meta<AvatarComponent> = {
+type CustomArgs = {
+  src: string;
+  alt: string;
+  delayMs: number;
+};
+
+const meta: Meta<CustomArgs> = {
   title: 'UI/Avatar',
   component: AvatarComponent,
-  subcomponents: {
-    AvatarImageComponent,
-    AvatarFallbackComponent
-  },
   decorators: [
     moduleMetadata({
       imports: [AvatarImageComponent, AvatarFallbackComponent]
     })
   ],
-  tags: ['autodocs']
+  tags: ['autodocs'],
+  args: {
+    src: 'https://github.com/shadcn.png',
+    alt: '@shadcn',
+    delayMs: 600
+  },
+  argTypes: {
+    src: {
+      control: {
+        type: 'text'
+      }
+    },
+    alt: {
+      control: {
+        type: 'text'
+      }
+    },
+    delayMs: {
+      control: {
+        type: 'number'
+      }
+    }
+  }
 };
 
 export default meta;
 type Story = StoryObj<AvatarComponent>;
 
 export const Default: Story = {
-  render: (args) => ({
-    props: args,
-    template: `
+  render: (args) => {
+    console.log(args);
+    return {
+      props: args,
+      template: `
       <app-avatar>
-        <app-avatar-image src="https://github.com/shadcn.png" alt="@shadcn" />
-        <app-avatar-fallback>CN</app-avatar-fallback>
+        <app-avatar-image ${argsToTemplate(args)}/>
+        <app-avatar-fallback ${argsToTemplate(args)}>CN</app-avatar-fallback>
       </app-avatar>
     `
-  })
+    };
+  }
 };