diff --git a/src/lib/components/data-encoder-settings.svelte b/src/lib/components/data-encoder-settings.svelte
index b5fdc5712..03f2adb07 100644
--- a/src/lib/components/data-encoder-settings.svelte
+++ b/src/lib/components/data-encoder-settings.svelte
@@ -4,7 +4,7 @@
 
   import { page } from '$app/stores';
 
-  import Accordion from '$lib/holocene/accordion.svelte';
+  import Accordion from '$lib/holocene/accordion/accordion.svelte';
   import Button from '$lib/holocene/button.svelte';
   import Link from '$lib/holocene/link.svelte';
   import { translate } from '$lib/i18n/translate';
diff --git a/src/lib/components/schedule/schedule-advanced-settings.svelte b/src/lib/components/schedule/schedule-advanced-settings.svelte
index a03a70c55..70596c18a 100644
--- a/src/lib/components/schedule/schedule-advanced-settings.svelte
+++ b/src/lib/components/schedule/schedule-advanced-settings.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Accordion from '$lib/holocene/accordion.svelte';
+  import Accordion from '$lib/holocene/accordion/accordion.svelte';
   import { translate } from '$lib/i18n/translate';
 
   import ScheduleNotes from './schedule-notes.svelte';
diff --git a/src/lib/components/schedule/schedule-search-attributes.svelte b/src/lib/components/schedule/schedule-search-attributes.svelte
index df9124fd4..7da235bf7 100644
--- a/src/lib/components/schedule/schedule-search-attributes.svelte
+++ b/src/lib/components/schedule/schedule-search-attributes.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Accordion from '$lib/holocene/accordion.svelte';
+  import Accordion from '$lib/holocene/accordion/accordion.svelte';
   import { translate } from '$lib/i18n/translate';
   import type { SearchAttribute } from '$lib/types';
   import { decodePayloadAttributes } from '$lib/utilities/decode-payload';
diff --git a/src/lib/components/workflow/pending-activities.svelte b/src/lib/components/workflow/pending-activities.svelte
index cfaa316cf..1b288f0f8 100644
--- a/src/lib/components/workflow/pending-activities.svelte
+++ b/src/lib/components/workflow/pending-activities.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { page } from '$app/stores';
 
-  import Accordion from '$lib/holocene/accordion.svelte';
+  import Accordion from '$lib/holocene/accordion/accordion.svelte';
   import Badge from '$lib/holocene/badge.svelte';
   import CodeBlock from '$lib/holocene/code-block.svelte';
   import Icon from '$lib/holocene/icon/icon.svelte';
diff --git a/src/lib/components/workflow/workflow-summary.svelte b/src/lib/components/workflow/workflow-summary.svelte
index 223738437..eb0b01713 100644
--- a/src/lib/components/workflow/workflow-summary.svelte
+++ b/src/lib/components/workflow/workflow-summary.svelte
@@ -2,7 +2,7 @@
   import { page } from '$app/stores';
 
   import WorkflowDetail from '$lib/components/workflow/workflow-detail.svelte';
-  import Accordion from '$lib/holocene/accordion.svelte';
+  import Accordion from '$lib/holocene/accordion/accordion.svelte';
   import { translate } from '$lib/i18n/translate';
   import { relativeTime, timeFormat } from '$lib/stores/time-format';
   import {
diff --git a/src/lib/holocene/accordion/accordion-group.svelte b/src/lib/holocene/accordion/accordion-group.svelte
new file mode 100644
index 000000000..7bdc4e0ae
--- /dev/null
+++ b/src/lib/holocene/accordion/accordion-group.svelte
@@ -0,0 +1,5 @@
+<div
+  class="*:rounded-none *:border-t-0 [&>*:first-child]:rounded-t-2xl [&>*:first-child]:border-t-2 [&>*:last-child]:rounded-b-2xl"
+>
+  <slot />
+</div>
diff --git a/src/lib/holocene/accordion.stories.svelte b/src/lib/holocene/accordion/accordion.stories.svelte
similarity index 67%
rename from src/lib/holocene/accordion.stories.svelte
rename to src/lib/holocene/accordion/accordion.stories.svelte
index 0ec142fd8..d85f386b4 100644
--- a/src/lib/holocene/accordion.stories.svelte
+++ b/src/lib/holocene/accordion/accordion.stories.svelte
@@ -33,12 +33,27 @@
 <script lang="ts">
   import { action } from '@storybook/addon-actions';
   import { Story, Template } from '@storybook/addon-svelte-csf';
+
+  import AccordionGroup from './accordion-group.svelte';
 </script>
 
 <Template let:args>
-  <Accordion {...args} onToggle={action('onToggle')}>
-    <p>Accordion Content</p>
-  </Accordion>
+  <div class="flex flex-col gap-2">
+    <Accordion {...args} onToggle={action('onToggle')}>
+      <p>Accordion Content</p>
+    </Accordion>
+    <AccordionGroup>
+      <Accordion {...args} onToggle={action('onToggle')}>
+        <p>Accordion Content</p>
+      </Accordion>
+      <Accordion {...args} onToggle={action('onToggle')}>
+        <p>Accordion Content</p>
+      </Accordion>
+      <Accordion {...args} onToggle={action('onToggle')}>
+        <p>Accordion Content</p>
+      </Accordion>
+    </AccordionGroup>
+  </div>
 </Template>
 
 <Story name="Default" args={{ open: false }} />
diff --git a/src/lib/holocene/accordion.svelte b/src/lib/holocene/accordion/accordion.svelte
similarity index 89%
rename from src/lib/holocene/accordion.svelte
rename to src/lib/holocene/accordion/accordion.svelte
index e44208546..1ca62a631 100644
--- a/src/lib/holocene/accordion.svelte
+++ b/src/lib/holocene/accordion/accordion.svelte
@@ -6,11 +6,9 @@
   import { v4 } from 'uuid';
 
   import Badge from '$lib/holocene/badge.svelte';
-  import Card from '$lib/holocene/card.svelte';
+  import type { IconName } from '$lib/holocene/icon';
   import Icon from '$lib/holocene/icon/icon.svelte';
 
-  import type { IconName } from './icon';
-
   interface $$Props extends HTMLAttributes<HTMLDivElement> {
     title: string;
     id?: string;
@@ -44,7 +42,7 @@
 {#if expandable}
   <div
     class={merge(
-      'surface-primary flex w-full cursor-default flex-col rounded-2xl border-2 border-subtle p-2 text-primary focus-within:ring-4 focus-within:ring-primary/70',
+      'surface-primary w-full rounded-2xl border-2 border-subtle p-2 focus-within:ring-4 focus-within:ring-inset focus-within:ring-primary/70',
       className,
     )}
     {...$$restProps}
@@ -67,6 +65,7 @@
           class="flex flex-row items-center gap-2 pr-2"
           on:click|stopPropagation
           on:keyup|stopPropagation
+          role="none"
         >
           <slot name="action" />
         </div>
@@ -91,7 +90,10 @@
     </div>
   </div>
 {:else}
-  <Card class="w-full" {...$$restProps}>
+  <div
+    class="surface-primary w-full rounded-2xl border-2 border-subtle p-4"
+    {...$$restProps}
+  >
     <div class="flex w-full flex-col rounded-lg">
       <div class="space-between flex w-full flex-row items-center">
         <h3 class="flex w-full items-center gap-2">
@@ -114,5 +116,5 @@
     <div class="mt-6 block w-full" class:hidden={!open}>
       <slot />
     </div>
-  </Card>
+  </div>
 {/if}
diff --git a/src/lib/holocene/card.svelte b/src/lib/holocene/card.svelte
index 2537d7efc..5928f00b3 100644
--- a/src/lib/holocene/card.svelte
+++ b/src/lib/holocene/card.svelte
@@ -4,6 +4,6 @@
 
 <style lang="postcss">
   .card {
-    @apply rounded-2xl border-2 border-subtle p-5;
+    @apply rounded-2xl border-2 border-subtle p-4;
   }
 </style>