diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 7c4c783d..12377170 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -24,5 +24,5 @@ contact_links:
   about: Ask for support and any questions you might have on reddit
 
 - name: "Code of Conduct"
-  url: https://github.com/safing/portmaster/blob/develop/CODE_OF_CONDUCT.md
+  url: https://docs.safing.io/community/code-of-conduct
   about: Be nice to other community members
diff --git a/.github/ISSUE_TEMPLATE/report-bug.md b/.github/ISSUE_TEMPLATE/report-bug.md
index feb873eb..0c7e0252 100644
--- a/.github/ISSUE_TEMPLATE/report-bug.md
+++ b/.github/ISSUE_TEMPLATE/report-bug.md
@@ -10,10 +10,10 @@ Please disclose security related issues privately to support@safing.io.
 
 **Pre-Submit Checklist**:
 
-- Check known issues:
-  - [Windows](https://docs.safing.io/portmaster/install/windows#known-issues)
-  - [Linux](https://docs.safing.io/portmaster/install/linux#compatibility)
-- Search for similar/existing issues on Github.
+- Check applicable sources for existing issues:
+  - [Windows Known Issues](https://docs.safing.io/portmaster/install/windows#known-issues)
+  - [Linux Known Issues](https://docs.safing.io/portmaster/install/linux#compatibility)
+  - [Github Issues](../issues?q=is%3Aissue+label%3Abug)
 
 **What happened**:
 
@@ -34,7 +34,8 @@ Paste debug information below:
 - General issue: Click on "Copy Debug Information" on the Settings page.
 - App related issue: Click on "Copy Debug Information" in the dropdown menu of an app in the Monitor view.
 
-⚠ Please check the "Unexpected Logs" and "Network Connections" sections in the preview mode for sensitive or otherwise private information and remove them!
+⚠ Please remove sensitive/private information from the "Unexpected Logs" and "Network Connections" sections.
+This is easiest to do in the preview mode.
 
 Additional logs can be found here:
 - Linux: `/var/lib/portmaster/logs`
diff --git a/.github/ISSUE_TEMPLATE/report-compatibility.md b/.github/ISSUE_TEMPLATE/report-compatibility.md
index 1a273906..630fbf1c 100644
--- a/.github/ISSUE_TEMPLATE/report-compatibility.md
+++ b/.github/ISSUE_TEMPLATE/report-compatibility.md
@@ -6,17 +6,16 @@ labels: compatibility
 
 **Pre-Submit Checklist**:
 
-- Check applicable sources for existing issues
+- Check applicable sources for existing issues:
   - [Linux Compatibility](https://docs.safing.io/portmaster/install/linux#compatibility)
   - [VPN Compatibility](https://docs.safing.io/portmaster/install/status/vpn-compatibility)
-  - [Github Issues (all our repos)](https://github.com/issues?q=user%3Asafing)
+  - [Github Issues](../issues?q=is%3Aissue+label%3Ain%2Fcompatibility)
 
-**Which Linux Distro, VPN Client or General Software is this about?**:
-
-<!-- Please provide name and version. -->
+**What worked?**
 
 
-**Does it work? If not, what happened?**
+
+**What did not work?**
 
 
 
@@ -27,7 +26,8 @@ Paste debug information below if reporting a problem:
 - General issue: Click on "Copy Debug Information" on the Settings page.
 - App related issue: Click on "Copy Debug Information" in the dropdown menu of an app in the Monitor view.
 
-⚠ Please check the "Unexpected Logs" and "Network Connections" sections in the preview mode for sensitive or otherwise private information and remove them!
+⚠ Please remove sensitive/private information from the "Unexpected Logs" and "Network Connections" sections.
+This is easiest to do in the preview mode.
 
 If needed, additional logs can be found here:
 - Linux: `/var/lib/portmaster/logs`
diff --git a/.github/ISSUE_TEMPLATE/suggest-feature.md b/.github/ISSUE_TEMPLATE/suggest-feature.md
index cd19abb2..81556352 100644
--- a/.github/ISSUE_TEMPLATE/suggest-feature.md
+++ b/.github/ISSUE_TEMPLATE/suggest-feature.md
@@ -9,3 +9,5 @@ labels: feature
 
 
 **Why do you and others need this?**:
+
+