diff --git a/.gitea/ISSUE_TEMPLATE.yml b/.gitea/ISSUE_TEMPLATE.yml
index eec8a98..6bb685f 100644
--- a/.gitea/ISSUE_TEMPLATE.yml
+++ b/.gitea/ISSUE_TEMPLATE.yml
@@ -15,3 +15,10 @@ body:
     validations:
       required: true
 blank_issues_enabled: true
+contact_links:
+  - name: Ask a question in our Matrix room
+    about: If you prefer a chat-like conversation or in need for quick help, this might be an alternative to opening an issue.
+    url: https://matrix.to/#/#woodpecker:matrix.org
+  - name: Frequently Asked Questions
+    url: https://woodpecker-ci.org/faq
+    about: Check the FAQs for common questions.
diff --git a/.gitea/ISSUE_TEMPLATE/bug_report.yml b/.gitea/ISSUE_TEMPLATE/bug_report.yml
index 669c33b..76dac7d 100644
--- a/.gitea/ISSUE_TEMPLATE/bug_report.yml
+++ b/.gitea/ISSUE_TEMPLATE/bug_report.yml
@@ -3,6 +3,7 @@ about: This template is used to report bugs!
 title: ""
 labels:
   - bug
+body:
   - type: markdown
     attributes:
       value: |
diff --git a/.gitea/PULL_REQUEST_TEMPLATE.yml b/.gitea/PULL_REQUEST_TEMPLATE.yml
index 533db78..15e71da 100644
--- a/.gitea/PULL_REQUEST_TEMPLATE.yml
+++ b/.gitea/PULL_REQUEST_TEMPLATE.yml
@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        > **Note**: Thanks for contributing to this project with your pull request!
+        Thanks for contributing to this project with your pull request!
   - type: textarea
     id: summary
     attributes: