diff --git a/figma/AvatarGroup.figma.tsx b/figma/AvatarGroup.figma.tsx
new file mode 100644
index 000000000..f6aa15da1
--- /dev/null
+++ b/figma/AvatarGroup.figma.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+import { Avatar, AvatarGroup } from '@/index';
+import figma from '@figma/code-connect';
+
+figma.connect(AvatarGroup, 'https://www.figma.com/design/w8sqBtJpvq86D06UE7gN0T/MDS---Web?node-id=37-593', {
+  imports: ["import { AvatarGroup } from '@innovaccer/design-system'"],
+  props: {
+    size: figma.enum('Size', {
+      Regular: 'regular',
+      Small: 'tiny',
+    }),
+    max: figma.enum('Count', {
+      'Less than three': 3,
+      'More than three': 2,
+    }),
+    list: figma.enum('Type', {
+      Initial: [
+        {
+          firstName: 'John',
+          lastName: 'Doe',
+        },
+        {
+          firstName: 'Jane',
+          lastName: 'Doe',
+        },
+      ],
+      Icon: [
+        {
+          firstName: 'Rachel',
+          lastName: 'Green',
+          icon: <Avatar.Icon name="person" />,
+        },
+        {
+          firstName: 'John',
+          lastName: 'Doe',
+          icon: <Avatar.Icon name="person" />,
+        },
+      ],
+      Image: [
+        {
+          firstName: 'John',
+          lastName: 'Doe',
+          image: <Avatar.Image src="url" />,
+        },
+        {
+          firstName: 'Rachel',
+          lastName: 'Green',
+          image: <Avatar.Image src="url" />,
+        },
+      ],
+    }),
+  },
+  example: (props) => <AvatarGroup {...props} />,
+});
diff --git a/figma/Tooltip.figma.tsx b/figma/Tooltip.figma.tsx
index f071773a5..08af22520 100644
--- a/figma/Tooltip.figma.tsx
+++ b/figma/Tooltip.figma.tsx
@@ -6,11 +6,11 @@ figma.connect(Tooltip, 'https://www.figma.com/design/w8sqBtJpvq86D06UE7gN0T/MDS-
   imports: ["import { Tooltip } from '@innovaccer/design-system'"],
   props: {
     position: figma.enum('Position', {
-      'Bottom': 'bottom',
-      'Top': 'top',
-      'Right': 'right',
-      'Left': 'left'
-    })
+      Bottom: 'bottom',
+      Top: 'top',
+      Right: 'right',
+      Left: 'left',
+    }),
   },
   example: (props) => <Tooltip tooltip="Tooltip" {...props} />,
 });