diff --git a/packages/code-connect/components/AboutModal/AboutModal.figma.tsx b/packages/code-connect/components/AboutModal/AboutModal.figma.tsx
index fb15f4065b1..f260198aa70 100644
--- a/packages/code-connect/components/AboutModal/AboutModal.figma.tsx
+++ b/packages/code-connect/components/AboutModal/AboutModal.figma.tsx
@@ -8,7 +8,7 @@ import { AboutModal, Button, Content } from '@patternfly/react-core';
 
 figma.connect(
   AboutModal,
-  'https://www.figma.com/design/aEBBvq0J3EPXxHvv6WgDx9/PatternFly-6--Components-Test?node-id=2879-13973&t=15CEJpGgVui7qP5Q-11',
+  'https://www.figma.com/design/VMEX8Xg2nzhBX8rfBx53jp/PatternFly-6--Components?node-id=2879-13973',
   {
     props: {
       productName: figma.string('Product name')
diff --git a/packages/code-connect/components/Accordion/Accordion.figma.tsx b/packages/code-connect/components/Accordion/Accordion.figma.tsx
index 9ef35289b62..f651e7479dd 100644
--- a/packages/code-connect/components/Accordion/Accordion.figma.tsx
+++ b/packages/code-connect/components/Accordion/Accordion.figma.tsx
@@ -5,21 +5,21 @@ import { Accordion } from '@patternfly/react-core';
 
 figma.connect(
   Accordion,
-  'https://www.figma.com/file/aEBBvq0J3EPXxHvv6WgDx9/PatternFly-6%3A-Components-Test?node-id=2621-623',
+  'https://www.figma.com/design/VMEX8Xg2nzhBX8rfBx53jp/PatternFly-6--Components?node-id=2621-623',
   {
     props: {
       // enum
-      displaySize: figma.enum('Type', { 'Large Bordered': 'lg' }),
+      displaySize: figma.enum('Type', { 'Large bordered': 'lg' }),
       isBordered: figma.enum('Type', {
         Bordered: true,
-        'Large Bordered': true
+        'Large bordered': true
       }),
-      togglePosition: figma.enum('Caret position', { Left: 'start' }),
+      togglePosition: figma.enum('Caret position', { 'At start': 'start' }),
 
       children: figma.children('Accordion toggle')
     },
     example: (props) => (
-      <Accordion togglePosition={props.togglePosition} isBordered={props.isBordered} displaySize={props.displaySize}>
+      <Accordion isBordered={props.isBordered} displaySize={props.displaySize} togglePosition={props.togglePosition}>
         {props.children}
       </Accordion>
     )
diff --git a/packages/code-connect/components/Accordion/AccordionToggle.figma.tsx b/packages/code-connect/components/Accordion/AccordionToggle.figma.tsx
index 4f5708cdb6a..b455e433ea1 100644
--- a/packages/code-connect/components/Accordion/AccordionToggle.figma.tsx
+++ b/packages/code-connect/components/Accordion/AccordionToggle.figma.tsx
@@ -6,27 +6,24 @@ import { AccordionItem, AccordionToggle, AccordionContent } from '@patternfly/re
 
 figma.connect(
   AccordionToggle,
-  'https://www.figma.com/design/aEBBvq0J3EPXxHvv6WgDx9/PatternFly-6--Components-Test?node-id=1423-687',
+  'https://www.figma.com/design/VMEX8Xg2nzhBX8rfBx53jp/PatternFly-6--Components?node-id=1423-687',
   {
     props: {
       // string
-      expandText: figma.string('Expand Text'),
+      expandedContentText: figma.string('Expanded content text'),
+      expandedToggleText: figma.string('Expanded toggle text'),
+      toggleText: figma.string('Toggle text'),
 
       // enum
-      open: figma.enum('State', { Expanded: true }),
-      toggleTextExpanded: figma.enum('State', {
-        Default: figma.string('Toggle Text'),
-        Hover: figma.string('Toggle Text'),
-        Expanded: figma.string('Toggle Text Expanded')
-      })
+      isExpanded: figma.enum('State', { Expanded: true })
     },
     example: (props) => (
-      <AccordionItem isExpanded={props.open}>
+      <AccordionItem isExpanded={props.isExpanded}>
         <AccordionToggle onClick={() => {}} id="<your-id>">
-          {props.toggleTextExpanded}
+          {props.expandedToggleText}
         </AccordionToggle>
         <AccordionContent id="accordion-content-example">
-          <p>{props.expandText}</p>
+          <p>{props.expandedContentText}</p>
         </AccordionContent>
       </AccordionItem>
     )
diff --git a/packages/code-connect/components/ActionList/ActionList.figma.tsx b/packages/code-connect/components/ActionList/ActionList.figma.tsx
index e92199479ab..dfb4272369a 100644
--- a/packages/code-connect/components/ActionList/ActionList.figma.tsx
+++ b/packages/code-connect/components/ActionList/ActionList.figma.tsx
@@ -7,7 +7,7 @@ import { ActionList } from '@patternfly/react-core';
 
 figma.connect(
   ActionList,
-  'https://www.figma.com/design/aEBBvq0J3EPXxHvv6WgDx9/PatternFly-6--Components-Test?node-id=6780-15839',
+  'https://www.figma.com/design/VMEX8Xg2nzhBX8rfBx53jp/PatternFly-6--Components?node-id=6780-15839',
   {
     props: {
       // enum
diff --git a/packages/code-connect/components/ClipboardCopy/ClipboardCopyBasic.figma.tsx b/packages/code-connect/components/ClipboardCopy/ClipboardCopyBasic.figma.tsx
index 8f5047d7e1c..dd77fc877d1 100644
--- a/packages/code-connect/components/ClipboardCopy/ClipboardCopyBasic.figma.tsx
+++ b/packages/code-connect/components/ClipboardCopy/ClipboardCopyBasic.figma.tsx
@@ -5,7 +5,7 @@ import { ClipboardCopy } from '@patternfly/react-core';
 
 figma.connect(
   ClipboardCopy,
-  'https://www.figma.com/design/aEBBvq0J3EPXxHvv6WgDx9/PatternFly-6--Components-Test?node-id=9914-75835',
+  'https://www.figma.com/design/VMEX8Xg2nzhBX8rfBx53jp/PatternFly-6--Components?node-id=9914-75835',
   {
     props: {
       // enum
diff --git a/packages/code-connect/components/ClipboardCopy/ClipboardCopyInlineCompact.figma.tsx b/packages/code-connect/components/ClipboardCopy/ClipboardCopyInlineCompact.figma.tsx
index 5a990fae565..cab2db46db2 100644
--- a/packages/code-connect/components/ClipboardCopy/ClipboardCopyInlineCompact.figma.tsx
+++ b/packages/code-connect/components/ClipboardCopy/ClipboardCopyInlineCompact.figma.tsx
@@ -5,7 +5,7 @@ import { ClipboardCopy } from '@patternfly/react-core';
 
 figma.connect(
   ClipboardCopy,
-  'https://www.figma.com/design/aEBBvq0J3EPXxHvv6WgDx9/PatternFly-6--Components-Test?node-id=9914-75768',
+  'https://www.figma.com/design/VMEX8Xg2nzhBX8rfBx53jp/PatternFly-6--Components?node-id=2722-13543',
   {
     props: {
       children: figma.children('*')
diff --git a/packages/code-connect/figma.config.json b/packages/code-connect/figma.config.json
index 2537e14be2b..53ef35f59ef 100644
--- a/packages/code-connect/figma.config.json
+++ b/packages/code-connect/figma.config.json
@@ -2,11 +2,11 @@
   "codeConnect": {
     "parser": "react",
     "include": [
-      "components/DatePicker/*.tsx",
-      "components/EmptyState/*.tsx",
-      "components/FileUpload/*.tsx",
-      "components/Hint/*.tsx",
-      "components/InlineEdit/*.tsx"
+      "components/AboutModal/*.tsx",
+      "components/Accordion/*.tsx",
+      "components/ActionList/*.tsx",
+      "components/BackgroundImage/*.tsx",
+      "components/ClipboardCopy/*.tsx"
     ],
     "paths": {
       "src/components": "src/components"