diff --git a/source/docs/help/index.md b/source/docs/help/index.md
index a86a0e0b..c95b3c75 100644
--- a/source/docs/help/index.md
+++ b/source/docs/help/index.md
@@ -5,20 +5,22 @@ description: "Help"
 
 ## Browse the documentation
 
-Learn more using the [documentation on this site](/index.md).
+Read the docs on the [using HACS](/docs/use/index.md), on [publishing your own custom element to HACS](/docs/publish/index.md), or on [developing HACS](/docs/contribute/index.md).
+
+## FAQ
+
+Maybe your question has already been answered in the [Frequently Asked Questions](/docs/faq/index.md).
 
 ## Stay up to date
 
 Find out what's new with this project over at [GitHub](https://github.com/hacs).
 
-## Want to submit a Bug?
+## Want to submit a bug?
 
-[Before you do make sure you first have a look here.](/docs/help/issues.md)
+If you're having an issue with a custom element, [report an issue for that repository](/docs/use/repositories/dashboard.md/#reporting-an-issue-with-a-repository).
 
-## Discord
+Experiencing an issue with HACS itself? [Create an issue for HACS](/docs/help/issues.md).
 
-For questions, you can join the [discord server](https://discord.gg/apgchf8), issues do still belong on GitHub.
-
-## FAQ
+## Discord
 
-[Frequently Asked Questions](/docs/faq/index.md)
\ No newline at end of file
+For questions, join the [discord server](https://discord.gg/apgchf8) to get help from the community.