diff --git a/.changeset/seven-eyes-whisper.md b/.changeset/seven-eyes-whisper.md
new file mode 100644
index 00000000000..ece8c2850af
--- /dev/null
+++ b/.changeset/seven-eyes-whisper.md
@@ -0,0 +1,7 @@
+---
+"@hashicorp/design-system-components": patch
+---
+
+`Accordion` - Set `aria-controls` of `Accordion::Item::Button` to `contentId` from `DisclosurePrimitve` for a11y improvements with toggled content
+`DisclosurePrimitve` - Changed DOM structure of content section and exposed `contentId` for a11y improvements with toggled content
+`Reveal` - Set `aria-controls` of `Reveal::Toggle` to `contentId` from `DisclosurePrimitve` for a11y improvements with toggled content
diff --git a/packages/components/src/components/hds/accordion/item/index.hbs b/packages/components/src/components/hds/accordion/item/index.hbs
index 046b1a92fd9..6deaac27611 100644
--- a/packages/components/src/components/hds/accordion/item/index.hbs
+++ b/packages/components/src/components/hds/accordion/item/index.hbs
@@ -14,7 +14,7 @@
       <Hds::Accordion::Item::Button
         @isOpen={{t.isOpen}}
         @onClickToggle={{t.onClickToggle}}
-        @contentId={{this._contentId}}
+        @contentId={{t.contentId}}
         @ariaLabel={{@ariaLabel}}
         @ariaLabelledBy={{this.ariaLabelledBy}}
         @size={{this.size}}
@@ -35,14 +35,7 @@
   </:toggle>
 
   <:content as |c|>
-    <Hds::Text::Body
-      class="hds-accordion-item__content"
-      @tag="div"
-      @size="200"
-      @weight="regular"
-      @color="primary"
-      id={{this._contentId}}
-    >
+    <Hds::Text::Body class="hds-accordion-item__content" @tag="div" @size="200" @weight="regular" @color="primary">
       {{yield (hash close=c.close) to="content"}}
     </Hds::Text::Body>
   </:content>
diff --git a/packages/components/src/components/hds/accordion/item/index.ts b/packages/components/src/components/hds/accordion/item/index.ts
index c5562edba96..b93eeb29bd9 100644
--- a/packages/components/src/components/hds/accordion/item/index.ts
+++ b/packages/components/src/components/hds/accordion/item/index.ts
@@ -57,12 +57,6 @@ export interface HdsAccordionItemSignature {
 }
 
 export default class HdsAccordionItem extends Component<HdsAccordionItemSignature> {
-  /**
-   * Generates a unique ID for the Content
-   *
-   * @param _contentId
-   */
-  private _contentId = 'content-' + guidFor(this);
   private _titleId = 'title-' + guidFor(this);
 
   get ariaLabelledBy(): string | undefined {
diff --git a/packages/components/src/components/hds/disclosure-primitive/index.hbs b/packages/components/src/components/hds/disclosure-primitive/index.hbs
index 2761166073b..0867c02a868 100644
--- a/packages/components/src/components/hds/disclosure-primitive/index.hbs
+++ b/packages/components/src/components/hds/disclosure-primitive/index.hbs
@@ -4,11 +4,11 @@
 }}
 <div class="hds-disclosure-primitive" {{did-update this.onStateChange @isOpen}} ...attributes>
   <div class="hds-disclosure-primitive__toggle">
-    {{yield (hash onClickToggle=this.onClickToggle isOpen=this.isOpen) to="toggle"}}
+    {{yield (hash onClickToggle=this.onClickToggle isOpen=this.isOpen contentId=this._contentId) to="toggle"}}
   </div>
-  {{#if this.isOpen}}
-    <div class="hds-disclosure-primitive__content">
+  <div class="hds-disclosure-primitive__content" id={{this._contentId}}>
+    {{#if this.isOpen}}
       {{yield (hash close=this.close) to="content"}}
-    </div>
-  {{/if}}
+    {{/if}}
+  </div>
 </div>
\ No newline at end of file
diff --git a/packages/components/src/components/hds/disclosure-primitive/index.ts b/packages/components/src/components/hds/disclosure-primitive/index.ts
index 13a368c52bc..d475d664d12 100644
--- a/packages/components/src/components/hds/disclosure-primitive/index.ts
+++ b/packages/components/src/components/hds/disclosure-primitive/index.ts
@@ -7,6 +7,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { schedule } from '@ember/runloop';
+import { guidFor } from '@ember/object/internals';
 
 export interface HdsDisclosurePrimitiveSignature {
   Args: {
@@ -19,6 +20,7 @@ export interface HdsDisclosurePrimitiveSignature {
   Blocks: {
     toggle: [
       {
+        contentId: string;
         isOpen: boolean;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         onClickToggle: (...args: any[]) => void;
@@ -37,6 +39,7 @@ export interface HdsDisclosurePrimitiveSignature {
 export default class HdsDisclosurePrimitive extends Component<HdsDisclosurePrimitiveSignature> {
   @tracked private _isOpen = false;
   @tracked private _isControlled = this.args.isOpen !== undefined;
+  private _contentId = 'content-' + guidFor(this);
 
   get isOpen(): boolean {
     if (this._isControlled) {
diff --git a/packages/components/src/components/hds/reveal/index.hbs b/packages/components/src/components/hds/reveal/index.hbs
index 968888f213d..c16f9ca2b84 100644
--- a/packages/components/src/components/hds/reveal/index.hbs
+++ b/packages/components/src/components/hds/reveal/index.hbs
@@ -6,7 +6,7 @@
 <Hds::DisclosurePrimitive class="hds-reveal" @isOpen={{@isOpen}} ...attributes>
   <:toggle as |t|>
     <Hds::Reveal::Toggle::Button
-      aria-controls={{this._contentId}}
+      aria-controls={{t.contentId}}
       @text={{this.getText t.isOpen}}
       @isOpen={{t.isOpen}}
       {{on "click" t.onClickToggle}}
@@ -14,7 +14,7 @@
   </:toggle>
 
   <:content>
-    <div class="hds-reveal__content hds-typography-body-200 hds-foreground-primary" id={{this._contentId}}>
+    <div class="hds-reveal__content hds-typography-body-200 hds-foreground-primary">
       {{yield}}
     </div>
   </:content>
diff --git a/packages/components/src/components/hds/reveal/index.ts b/packages/components/src/components/hds/reveal/index.ts
index 853f6de8f0b..d4267f73fa3 100644
--- a/packages/components/src/components/hds/reveal/index.ts
+++ b/packages/components/src/components/hds/reveal/index.ts
@@ -4,7 +4,6 @@
  */
 
 import Component from '@glimmer/component';
-import { guidFor } from '@ember/object/internals';
 import { assert } from '@ember/debug';
 
 import type { HdsDisclosurePrimitiveSignature } from '../disclosure-primitive';
@@ -23,13 +22,6 @@ export interface HdsRevealSignature {
 }
 
 export default class HdsReveal extends Component<HdsRevealSignature> {
-  /**
-   * Generates a unique ID for the Content
-   *
-   * @param _contentId
-   */
-  private _contentId = 'content-' + guidFor(this);
-
   /**
    * @param getText
    * @type {string}
diff --git a/showcase/tests/integration/components/hds/accordion/index-test.js b/showcase/tests/integration/components/hds/accordion/index-test.js
index 7faed071efa..b408dcb5e6f 100644
--- a/showcase/tests/integration/components/hds/accordion/index-test.js
+++ b/showcase/tests/integration/components/hds/accordion/index-test.js
@@ -188,7 +188,7 @@ module('Integration | Component | hds/accordion/index', function (hooks) {
       .hasAttribute('aria-expanded', 'true');
   });
 
-  test('the AccordionItem toggle button has an aria-controls attribute with a value matching the content id', async function (assert) {
+  test('the AccordionItem toggle button has an aria-controls attribute with a value matching the DisclosurePrimitive content id', async function (assert) {
     await render(
       hbs`
         <Hds::Accordion as |A|>
@@ -201,14 +201,13 @@ module('Integration | Component | hds/accordion/index', function (hooks) {
     );
     await click('.hds-accordion-item__button');
     assert.dom('.hds-accordion-item__button').hasAttribute('aria-controls');
-    assert.dom('.hds-accordion-item__content').hasAttribute('id');
 
     assert.strictEqual(
       this.element
         .querySelector('.hds-accordion-item__button')
         .getAttribute('aria-controls'),
       this.element
-        .querySelector('.hds-accordion-item__content')
+        .querySelector('.hds-disclosure-primitive__content')
         .getAttribute('id')
     );
   });
diff --git a/showcase/tests/integration/components/hds/disclosure-primitive/index-test.js b/showcase/tests/integration/components/hds/disclosure-primitive/index-test.js
index 40f53aac4bc..d170d49a9ee 100644
--- a/showcase/tests/integration/components/hds/disclosure-primitive/index-test.js
+++ b/showcase/tests/integration/components/hds/disclosure-primitive/index-test.js
@@ -34,11 +34,15 @@ module(
         <:toggle>
           <button type="button" id="test-disclosure-primitive-button" />
         </:toggle>
+        <:content>
+          <a id="test-disclosure-primitive-link" href="#">test</a>
+        </:content>
       </Hds::DisclosurePrimitive>
     `);
       assert.dom('.hds-disclosure-primitive__toggle').exists();
       assert.dom('button#test-disclosure-primitive-button').exists();
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
+      assert.dom('.hds-disclosure-primitive__content').exists();
+      assert.dom('a#test-disclosure-primitive-link').doesNotExist();
     });
     test('it should render the "content" when the "toggle" is clicked', async function (assert) {
       await render(hbs`
@@ -52,7 +56,6 @@ module(
       </Hds::DisclosurePrimitive>
     `);
       await click('button#test-disclosure-primitive-button');
-      assert.dom('.hds-disclosure-primitive__content').exists();
       assert.dom('a#test-disclosure-primitive-link').exists();
     });
 
@@ -70,11 +73,9 @@ module(
         </:content>
       </Hds::DisclosurePrimitive>
     `);
-      assert.dom('.hds-disclosure-primitive__content').exists();
       assert.dom('a#test-disclosure-primitive-link').exists();
 
       this.set('isOpen', false);
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
       assert.dom('a#test-disclosure-primitive-link').doesNotExist();
     });
 
@@ -90,11 +91,9 @@ module(
       </Hds::DisclosurePrimitive>
     `);
       await click('button#test-toggle-button');
-      assert.dom('.hds-disclosure-primitive__content').exists();
       assert.dom('a#test-disclosure-primitive-link').exists();
 
       this.set('isOpen', false);
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
       assert.dom('a#test-disclosure-primitive-link').doesNotExist();
     });
 
@@ -109,11 +108,9 @@ module(
         </:content>
       </Hds::DisclosurePrimitive>
     `);
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
       assert.dom('a#test-disclosure-primitive-link').doesNotExist();
 
       this.set('isOpen', true);
-      assert.dom('.hds-disclosure-primitive__content').exists();
       assert.dom('a#test-disclosure-primitive-link').exists();
     });
 
@@ -129,11 +126,9 @@ module(
         </:content>
       </Hds::DisclosurePrimitive>
     `);
-      assert.dom('.hds-disclosure-primitive__content').exists();
       assert.dom('a#test-disclosure-primitive-link').exists();
 
       await click('button#test-toggle-button');
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
       assert.dom('a#test-disclosure-primitive-link').doesNotExist();
     });
 
@@ -149,14 +144,28 @@ module(
         </:content>
       </Hds::DisclosurePrimitive>
     `);
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
       assert.dom('a#test-disclosure-primitive-link').doesNotExist();
 
       await click('button#test-toggle-button');
-      assert.dom('.hds-disclosure-primitive__content').exists();
       assert.dom('a#test-disclosure-primitive-link').exists();
     });
 
+    // contentId
+
+    test('it should set the contentId on the content block', async function (assert) {
+      await render(hbs`
+      <Hds::DisclosurePrimitive>
+        <:toggle>
+          <button type="button" id="test-disclosure-primitive-button" />
+        </:toggle>
+        <:content>
+          <a id="test-disclosure-primitive-link" href="#">test</a>
+        </:content>
+      </Hds::DisclosurePrimitive>
+    `);
+      assert.dom('.hds-disclosure-primitive__content').hasAttribute('id');
+    });
+
     // CLOSE DISCLOSED CONTENT ON CLICK
 
     test('it should hide the "content" when an interactive element triggers `close`', async function (assert) {
@@ -171,10 +180,8 @@ module(
       </Hds::DisclosurePrimitive>
     `);
       await click('button#test-toggle-button');
-      assert.dom('.hds-disclosure-primitive__content').exists();
       assert.dom('button#test-content-button').exists();
       await click('button#test-content-button');
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
       assert.dom('button#test-content-button').doesNotExist();
     });
 
@@ -196,11 +203,11 @@ module(
       // toggle to open
       await click('button#test-toggle-button');
       assert.true(opened);
-      assert.dom('.hds-disclosure-primitive__content').exists();
+      assert.dom('a#test-disclosure-primitive-link').exists();
       // toggle to close
       await click('button#test-toggle-button');
       assert.false(opened);
-      assert.dom('.hds-disclosure-primitive__content').doesNotExist();
+      assert.dom('a#test-disclosure-primitive-link').doesNotExist();
     });
   }
 );
diff --git a/showcase/tests/integration/components/hds/reveal/index-test.js b/showcase/tests/integration/components/hds/reveal/index-test.js
index 2e5b5a48be8..b7f4370362f 100644
--- a/showcase/tests/integration/components/hds/reveal/index-test.js
+++ b/showcase/tests/integration/components/hds/reveal/index-test.js
@@ -66,19 +66,20 @@ module('Integration | Component | hds/reveal/index', function (hooks) {
       .hasAttribute('aria-expanded', 'true');
   });
 
-  test('the toggle button has an aria-controls attribute with a value matching the content id', async function (assert) {
+  test('the toggle button has an aria-controls attribute with a value matching the DisclosurePrimitive content id', async function (assert) {
     await render(
       hbs`<Hds::Reveal @text="More options">Additional content</Hds::Reveal>`
     );
     await click('.hds-reveal__toggle-button');
     assert.dom('.hds-reveal__toggle-button').hasAttribute('aria-controls');
-    assert.dom('.hds-reveal__content').hasAttribute('id');
 
     assert.strictEqual(
       this.element
         .querySelector('.hds-reveal__toggle-button')
         .getAttribute('aria-controls'),
-      this.element.querySelector('.hds-reveal__content').getAttribute('id')
+      this.element
+        .querySelector('.hds-disclosure-primitive__content')
+        .getAttribute('id')
     );
   });