diff --git a/.changeset/fast-fans-wash.md b/.changeset/fast-fans-wash.md
new file mode 100644
index 0000000000..c7f1eda9ce
--- /dev/null
+++ b/.changeset/fast-fans-wash.md
@@ -0,0 +1,5 @@
+---
+'@swisspost/design-system-documentation': minor
+---
+
+Updated the Accessibility documentation, reorganized in mutliple folders and added Grouping Controls section
diff --git a/.changeset/proud-moons-impress.md b/.changeset/proud-moons-impress.md
new file mode 100644
index 0000000000..3a4278245e
--- /dev/null
+++ b/.changeset/proud-moons-impress.md
@@ -0,0 +1,5 @@
+---
+'@swisspost/design-system-documentation': patch
+---
+
+Updated the text of the Accessibility Forms Control Grouping section and corrected the last example
diff --git a/packages/documentation/src/stories/foundation/accessibility/accessibility.docs.mdx b/packages/documentation/src/stories/foundation/accessibility/forms/forms.docs.mdx
similarity index 54%
rename from packages/documentation/src/stories/foundation/accessibility/accessibility.docs.mdx
rename to packages/documentation/src/stories/foundation/accessibility/forms/forms.docs.mdx
index c9edb9ac2d..cf830c0334 100644
--- a/packages/documentation/src/stories/foundation/accessibility/accessibility.docs.mdx
+++ b/packages/documentation/src/stories/foundation/accessibility/forms/forms.docs.mdx
@@ -1,27 +1,13 @@
import { Meta, Source, Canvas } from '@storybook/blocks';
-import * as AccessibilityStories from './accessibility.stories';
-import liveRegionAtomicSample from './liveregion-atomic.sample.html?raw';
-import liveRegionGoodAngularSample from './liveregion-good-angular.sample.html?raw';
-import liveRegionBadAngularSample from './liveregion-bad-angular.sample.html?raw';
+import * as FormsStories from './forms.stories';
-
-# Accessibility
+
-
-## Forms
+# Forms
-### Disabled state
+## Disabled state
Disabled states of input fields or buttons pose many accessibility issues.
@@ -102,51 +88,74 @@ Disabled states of input fields or buttons pose many accessibility issues.
### Form bad example
-