diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..c0f508363
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+    - name: ❓ Community Support and Help
+      url: https://help.nextcloud.com/
+      about: Configuration, webserver/proxy or performance issues and other questions
+    - name: 💼 Nextcloud Enterprise
+      url: https://portal.nextcloud.com/
+      about: If you are a Nextcloud Enterprise customer, or need Professional support, so it can be resolved directly by our dedicated engineers more quickly
diff --git a/.github/ISSUE_TEMPLATE/improvement_suggestion.md b/.github/ISSUE_TEMPLATE/improvement_suggestion.md
new file mode 100644
index 000000000..5d70f237c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/improvement_suggestion.md
@@ -0,0 +1,32 @@
+---
+name: Documentation improvement
+about: Suggest an improvement or report a mistake
+labels: 0. Needs triage
+---
+
+### Thanks for helping improve our documentation! 
+
+* There is always room for improvement!
+* All contributions (changes and change ideas) - from the largest **to the tiniest** - help make Nextcloud better and easier to use!
+
+---
+
+<!-- Please insert your suggestion or idea below this line -->
+
+Example: My amazing idea is [...] <!-- Feel free to delete this line -->
+
+<!-- Please insert your suggestion or idea above this line -->
+
+---
+
+#### Notes
+
+* Please be patient: this is a large open source project that is overseen by a mixture of volunteers and non-volunteers which are all ultimately busy.
+* If your suggestion is a troubleshooting scenario or one you're not 100% certain about, please post for feedback on the [Nextcloud Help Forum](https://help.nextcloud.com) first.
+  - *Then* return here to bring back your experience to help improve the documentation for clarity, etc. (and link back to the forum discussion in your report!)
+
+#### Protip: If you want to help move things along (or just help out in other ways too) here are some suggestions:
+* Look for areas where you can assist - even seemingly unrelated areas - *because doing so frees up resources for your favorite topics and ideas*.
+* Submit a proposed change - that attempts to addresses your issue - as a pull request.
+* Participate in a discussion on some other unresolved [submitted idea ("issues")](https://github.com/nextcloud/documentation/issues) to help move it along.
+* Post a comment or review on someone else's [proposed change ("pull request")](https://github.com/nextcloud/documentation/pulls) to help move it along.