diff --git a/packages/components/config/plop/templates/add/component/{{componentName}}.component.ts.hbs b/packages/components/config/plop/templates/add/component/{{componentName}}.component.ts.hbs
index 664650d2c..689712ff8 100644
--- a/packages/components/config/plop/templates/add/component/{{componentName}}.component.ts.hbs
+++ b/packages/components/config/plop/templates/add/component/{{componentName}}.component.ts.hbs
@@ -5,7 +5,7 @@ import { Component } from '../../models';
 /**
  * {{componentName}} component, which ...
  *
- * @tagname {{componentName}}
+ * @tagname {{prefix}}{{separator}}{{componentName}}
  *
  * @slot default - This is a default/unnamed slot
  *
diff --git a/packages/components/config/plop/templates/add/component/{{componentName}}.stories.ts.hbs b/packages/components/config/plop/templates/add/component/{{componentName}}.stories.ts.hbs
index 9dc08d37c..9abd03ca6 100644
--- a/packages/components/config/plop/templates/add/component/{{componentName}}.stories.ts.hbs
+++ b/packages/components/config/plop/templates/add/component/{{componentName}}.stories.ts.hbs
@@ -8,6 +8,7 @@ const render = (args: Args) => html`
 
 const meta: Meta = {
   title: 'Work In Progress/{{componentName}}',
+  tags: ['autodocs'],
   component: '{{prefix}}{{separator}}{{componentName}}',
   render,
   parameters: {