diff --git a/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.tsx b/packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.internal.tsx
similarity index 100%
rename from packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.tsx
rename to packages/grafana-ui/src/components/CallToActionCard/CallToActionCard.story.internal.tsx
diff --git a/packages/grafana-ui/src/components/Icon/Icon.story.tsx b/packages/grafana-ui/src/components/Icon/Icon.story.tsx
index 8bd9d24a159..720632c068b 100644
--- a/packages/grafana-ui/src/components/Icon/Icon.story.tsx
+++ b/packages/grafana-ui/src/components/Icon/Icon.story.tsx
@@ -10,7 +10,7 @@ import { useTheme, selectThemeVariant } from '../../themes';
 import mdx from './Icon.mdx';
 
 export default {
-  title: 'General/Icon',
+  title: 'Docs Overview//Icon',
   component: Icon,
   decorators: [withCenteredStory],
   parameters: {
diff --git a/packages/grafana-ui/src/components/Tags/Tag.story.tsx b/packages/grafana-ui/src/components/Tags/Tag.story.tsx
index aeeb124efda..6eac33423d1 100644
--- a/packages/grafana-ui/src/components/Tags/Tag.story.tsx
+++ b/packages/grafana-ui/src/components/Tags/Tag.story.tsx
@@ -5,7 +5,7 @@ import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import mdx from './Tag.mdx';
 
 export default {
-  title: 'General/Tags/Tag',
+  title: 'Forms/Tags/Tag',
   component: Tag,
   decorators: [withCenteredStory],
   parameters: {
diff --git a/packages/grafana-ui/src/components/Tags/TagList.story.tsx b/packages/grafana-ui/src/components/Tags/TagList.story.tsx
index dfecbb0ea57..0f42221e34f 100644
--- a/packages/grafana-ui/src/components/Tags/TagList.story.tsx
+++ b/packages/grafana-ui/src/components/Tags/TagList.story.tsx
@@ -5,7 +5,7 @@ import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 import mdx from './TagList.mdx';
 
 export default {
-  title: 'General/Tags/TagList',
+  title: 'Forms/Tags/TagList',
   component: TagList,
   decorators: [withCenteredStory],
   parameters: {
diff --git a/packages/grafana-ui/src/components/ThemeColors/ThemeColors.story.tsx b/packages/grafana-ui/src/components/ThemeColors/ThemeColors.story.tsx
index a40be2ac7cc..a855646bebe 100644
--- a/packages/grafana-ui/src/components/ThemeColors/ThemeColors.story.tsx
+++ b/packages/grafana-ui/src/components/ThemeColors/ThemeColors.story.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { ThemeColors } from './ThemeColors';
 
 export default {
-  title: 'General/ThemeColors',
+  title: 'Docs Overview/ThemeColors',
   component: ThemeColors,
   decorators: [],
   parameters: {