diff --git a/packages/grafana-ui/src/components/Layout/Layout.tsx b/packages/grafana-ui/src/components/Layout/Layout.tsx
index d56b07d4b6b..7fcd44af454 100644
--- a/packages/grafana-ui/src/components/Layout/Layout.tsx
+++ b/packages/grafana-ui/src/components/Layout/Layout.tsx
@@ -30,6 +30,9 @@ export interface ContainerProps {
   shrink?: number;
 }
 
+/**
+ * @deprecated use Stack component instead
+ */
 export const Layout = ({
   children,
   orientation = Orientation.Horizontal,
@@ -58,6 +61,9 @@ export const Layout = ({
   );
 };
 
+/**
+ * @deprecated use Stack component instead
+ */
 export const HorizontalGroup = ({
   children,
   spacing,
@@ -79,6 +85,10 @@ export const HorizontalGroup = ({
     {children}
   </Layout>
 );
+
+/**
+ * @deprecated use Stack component with the "column" direction instead
+ */
 export const VerticalGroup = ({
   children,
   spacing,