diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index cece65761..b06143c8f 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1 @@
-custom: https://framasoft.org/en/#soutenir
+custom: ["https://joinpeertube.org/roadmap", "https://soutenir.framasoft.org/en/"]
diff --git a/.github/ISSUE_TEMPLATE/10-installation-issue.md b/.github/ISSUE_TEMPLATE/10-installation-issue.md
index 4f51fcbd9..4af9a1192 100644
--- a/.github/ISSUE_TEMPLATE/10-installation-issue.md
+++ b/.github/ISSUE_TEMPLATE/10-installation-issue.md
@@ -1,10 +1,10 @@
 ---
-name: Installation Issue
+name: 🚀 Installation Issue
 about: Use this template for build/installation issues
 ---
 
 <!--
-Please read the FAQ.md first.
+Please read the FAQ.md and docs.joinpeertube.org first.
 Please make sure your issue doesn't stem from a third-party package.
 Please search among past open/closed issues for a similar one beforehand.
 
diff --git a/.github/ISSUE_TEMPLATE/40-question.md b/.github/ISSUE_TEMPLATE/40-question.md
index 36a66668f..42355e574 100644
--- a/.github/ISSUE_TEMPLATE/40-question.md
+++ b/.github/ISSUE_TEMPLATE/40-question.md
@@ -1,6 +1,6 @@
 ---
 name: 🙋 Question
-about: Use this template to ask questions
+about: Use this template to ask questions that could not get solved over chat
 labels: 'Type: Question'
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index efd444bdc..42096433b 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,10 +2,10 @@ blank_issues_enabled: false
 contact_links:
   - name: 💬 IRC
     url: https://kiwiirc.com/client/irc.freenode.net/#peertube
-    about: Chat with us via IRC for quick Q/A here.
+    about: Chat with us via IRC for quick Q/A here
   - name: 💬 Matrix
     url: https://matrix.to/#/#peertube:matrix.org
-    about: Chat with us via Matrix for quick Q/A here.
+    about: Chat with us via Matrix for quick Q/A here
   - name: 🤷💻🤦 Forum
     url: https://framacolibri.org/c/peertube
-    about: You can ask and answer other questions here.
+    about: You can ask and answer other questions here
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..517d318b1
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,53 @@
+## Description
+<!-- Please include a summary of the change, with motivation and context -->
+
+## Related issues
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!-- start with closing keywords if any apply: https://docs.github.com/en/enterprise/2.16/user/github/managing-your-work-on-github/closing-issues-using-keywords -->
+
+## Type of change
+<!--- Put an `x` in all the boxes that apply: -->
+- [ ] ♻️ Refactor discussed in #
+- [ ] ✨ Feature as discussed in #
+- [ ] 🐛 Bug Fix
+- [ ] 👷 Optimization/Maintenance
+- [ ] 📝 Documentation Update
+- [ ] 🔖 Release
+- [ ] 🚩 Other
+
+## Has this been tested?
+<!--- Put an `x` in the box that applies: -->
+- [ ] 👍 yes, I added tests to the test suite
+- [ ] 👍 yes, light tests as follows are enough
+- [ ] 💭 no, because this PR is a draft and still needs work
+- [ ] 🙅 no, because they aren't needed
+- [ ] 🙋 no, because I need help
+
+<!--
+If you didn't test via unit-testing, you will still be asked to prove your fix is effective, doesn't have side-effects, or that your feature simply works:
+
+Please describe the tests that you ran to verify your changes.
+Provide instructions so we can reproduce.
+Please also list any relevant details for your test configuration(s):
+-->
+
+**Self-test configuration**:
+* NodeJS version: <!-- if PR change dependencies -->
+* Viewport sizes: <!-- if PR changes UI -->
+* Browser name/version: <!-- if PR changes UI -->
+
+## Screenshots
+<!-- delete if not relevant -->
+
+## Checklist:
+<!-- delete unrelevant entries -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+<!--- Put an `x` in all the boxes that apply: -->
+- [ ] I have read the [CONTRIBUTING](./.github/CONTRIBUTING.md) documentation.
+- [ ] I didn't make the linter cry
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made changes to the documentation as needed
+- [ ] I have made changes to the OpenAPI spec as needed
+- [ ] To the best of my knowledge, my changes introduce no known security vulnerability
+- [ ] I have corrected any misspellings in my code/comments
diff --git a/support/doc/plugins/guide.md b/support/doc/plugins/guide.md
index 2bd3fb6d2..101d3e094 100644
--- a/support/doc/plugins/guide.md
+++ b/support/doc/plugins/guide.md
@@ -658,7 +658,7 @@ registerHook({
   }
 })
 ```
-  * Don't try to require parent PeerTube modules, only use `peertubeHelpers`. If you need another helper or a specific hook, please [create an issue](https://github.com/Chocobozzz/PeerTube/issues/new)
+  * Don't try to require parent PeerTube modules, only use `peertubeHelpers`. If you need another helper or a specific hook, please [create an issue](https://github.com/Chocobozzz/PeerTube/issues/new/choose)
   * Don't use PeerTube dependencies. Use your own :)
 
 If your plugin is broken with a new PeerTube release, update your code and the `peertubeEngine` field of your `package.json` field.