diff --git a/app/components/CollapsibleSection.vue b/app/components/CollapsibleSection.vue
index 961e3502e5..1d83a22cda 100644
--- a/app/components/CollapsibleSection.vue
+++ b/app/components/CollapsibleSection.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { shallowRef, computed } from 'vue'
-import { LinkBase } from '#components'
 
 interface Props {
   title: string
@@ -104,14 +103,18 @@ useHead({
           />
         </button>
 
-        <span>
-          <LinkBase :to="`#${id}`">
-            {{ title }}
-          </LinkBase>
+        <button
+          type="button"
+          class="text-start focus-visible:outline-accent/70 rounded"
+          :aria-expanded="isOpen"
+          :aria-controls="contentId"
+          @click="toggle"
+        >
+          {{ title }}
           <span v-if="subtitle" class="block text-2xs normal-case tracking-normal">{{
             subtitle
           }}</span>
-        </span>
+        </button>
       </component>
 
       <!-- Actions slot for buttons or other elements -->
diff --git a/test/nuxt/a11y.spec.ts b/test/nuxt/a11y.spec.ts
index d5827c61ee..1364a0658c 100644
--- a/test/nuxt/a11y.spec.ts
+++ b/test/nuxt/a11y.spec.ts
@@ -2247,6 +2247,59 @@ describe('component accessibility audits', () => {
       const results = await runAxe(component)
       expect(results.violations).toEqual([])
     })
+
+    it('title button has aria-expanded=true when open and false after click', async () => {
+      const component = await mountSuspended(CollapsibleSection, {
+        props: { title: 'Dependencies', id: 'deps-section' },
+        slots: { default: '<p>Some content</p>' },
+      })
+
+      // Find the title button (second button in the heading — the one with visible text)
+      const buttons = component.findAll('button')
+      const titleButton = buttons.find(b => b.text().includes('Dependencies'))
+      expect(titleButton).toBeDefined()
+
+      // Initially open
+      expect(titleButton!.attributes('aria-expanded')).toBe('true')
+
+      // After click it should be collapsed
+      await titleButton!.trigger('click')
+      expect(titleButton!.attributes('aria-expanded')).toBe('false')
+
+      // Click again to re-expand
+      await titleButton!.trigger('click')
+      expect(titleButton!.attributes('aria-expanded')).toBe('true')
+    })
+
+    it('title button has aria-controls pointing to the content element', async () => {
+      const component = await mountSuspended(CollapsibleSection, {
+        props: { title: 'Section Title', id: 'ctrl-test' },
+        slots: { default: '<p>Controlled content</p>' },
+      })
+
+      const buttons = component.findAll('button')
+      const titleButton = buttons.find(b => b.text().includes('Section Title'))
+      expect(titleButton).toBeDefined()
+
+      const controls = titleButton!.attributes('aria-controls')
+      expect(controls).toBe('ctrl-test-collapsible-content')
+
+      // The referenced content element should exist
+      expect(component.find(`#${controls}`).exists()).toBe(true)
+    })
+
+    it('should have no accessibility violations with a subtitle', async () => {
+      const component = await mountSuspended(CollapsibleSection, {
+        props: {
+          title: 'Section Title',
+          subtitle: 'A subtitle that describes the section',
+          id: 'subtitle-section',
+        },
+        slots: { default: '<p>Content</p>' },
+      })
+      const results = await runAxe(component)
+      expect(results.violations).toEqual([])
+    })
   })
 
   describe('TerminalExecute', () => {