diff --git a/SUPPORT.md b/SUPPORT.md
deleted file mode 100644
index ed64f24..0000000
--- a/SUPPORT.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Support
-
-Support can consist of voluntairy open source project support or commercial support.
-
-Their are multiple ways to reach out for volutairy community support:
-- File Github issues
-- Join one of the meetings
-- LF energy slack channel
-
-
-## _Key Links_
-
-- Website: [CoMPAS - LF Energy](https://www.compas.energy/)
-- [Artwork](https://github.com/lf-energy/artwork/tree/main/projects/compas)
-- Mailing lists:
- - [CoMPAS](https://lists.lfenergy.org/g/CoMPAS)
- - [CoMPAS-tsc](https://lists.lfenergy.org/g/CoMPAS-tsc)
-- [slack](https://lfenergy.slack.com/) (find the #COMPAS channel)
-- [Calender](https://zoom-lfx.platform.linuxfoundation.org/meetings/compas)
diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md
new file mode 100644
index 0000000..448e924
--- /dev/null
+++ b/docs/SUPPORT.md
@@ -0,0 +1,53 @@
+# Support
+
+## Voluntary Support Channels
+
+### LF Energy Slack
+
+Join the LF Energy Slack workspace to connect with the CoMPAS community:
+
+- **Workspace**: [LF Energy Slack](https://lfenergy.slack.com/)
+- **Channel**: `#compas`
+
+### Github Issues
+
+For bug reports, feature requests or questions, please use GitHub Issues in the relevant repository, for example:
+
+- [CoMPAS Open SCD Issues](https://github.com/com-pas/compas-open-scd/issues)
+- [CoMPAS SCL Data Service Issues](https://github.com/com-pas/compas-scl-data-service/issues)
+- [CoMPAS CIM Mapping Issues](https://github.com/com-pas/compas-cim-mapping/issues)
+- [CoMPAS Core Issues](https://github.com/com-pas/compas-core/issues)
+
+_For a complete list of all CoMPAS repositories, visit the [CoMPAS GitHub organization](https://github.com/com-pas)._
+
+When creating an issue, please use the appropriate issue template (bug report, feature request, etc.) and provide all the requested information. This helps maintainers understand and address your issue more efficiently.
+
+#### Security Vulnerabilities
+
+If you discover a security vulnerability in any CoMPAS component, please report it (privately) through GitHub Security Advisories. Our contributors aim to respond within one week of your report with an acknowledgment and a preliminary plan for addressing the issue, including any necessary fixes and additional security tests.
+
+**Security Advisory Links per Repository (examples):**
+
+- [CoMPAS Open SCD Security Advisories](https://github.com/com-pas/compas-open-scd/security/advisories)
+- [CoMPAS SCL Data Service Security Advisories](https://github.com/com-pas/compas-scl-data-service/security/advisories)
+- [CoMPAS CIM Mapping Security Advisories](https://github.com/com-pas/compas-cim-mapping/security/advisories)
+- [CoMPAS Core Security Advisories](https://github.com/com-pas/compas-core/security/advisories)
+
+_For security advisories for all other CoMPAS repositories, navigate to the specific repository and access the Security tab._
+
+### Useful Links
+
+- Website: [CoMPAS - LF Energy](https://www.lfenergy.org/projects/compas/)
+- [Artwork](https://github.com/lf-energy/artwork/tree/main/projects/compas)
+- Mailing lists:
+ - [CoMPAS](https://lists.lfenergy.org/g/CoMPAS)
+ - [CoMPAS-dev](https://lists.lfenergy.org/g/CoMPAS-dev)
+ - [CoMPAS-tsc](https://lists.lfenergy.org/g/CoMPAS-tsc)
+- [Calender](https://zoom-lfx.platform.linuxfoundation.org/meetings/compas)
+
+## Professional Services
+
+The following companies provide commercial support for CoMPAS:
+
+- [BearingPoint](https://www.bearingpoint.com/)
+- [SprintEins](https://sprinteins.com/)
diff --git a/docs/_includes/sidebar.html b/docs/_includes/sidebar.html
index 18710a1..526cac0 100644
--- a/docs/_includes/sidebar.html
+++ b/docs/_includes/sidebar.html
@@ -45,6 +45,9 @@
+
+
+