diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 504467f2..00000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-name: Bug Report
-about: Report a bug encountered while using the Portmaster
-labels: bug
-
----
-
-<!--
-Please use this template when reporting a bug and provide as much info as possible.
-Not doing so may cause the bug to receive lower priority.
-You can remove any sections from this template that does not fit your issue.
-
-Note that this repository is for the Portmaster service daemon, if you want to report
-a UI issue please report it at https://github.com/safing/portmaster-ui/issues/new
-
-Thank you!
-
-For security related reports, please disclose it privately to support@safing.io.
--->
-
-**Checklist**:
-
-- [ ] I'm using the official portmaster release (i.e no custom builds)
-- [ ] I searched for similar/existing issues first.
-- [ ] My issue is not mentioned in the Known Issues section of my [OS](https://github.com/safing/portmaster/wiki)
-
-**What happened**:
-
-**What you expected to happen**:
-
-**How to reproduce it (as minimally and precisely as possible)**:
-
-**Anything else we need to know?**:
-
-**Environment**:
-
-Portmaster Version: 
-
-<details>
-  <summary>Versions from the `About` page in Portmaster's UI</summary>
-  <!-- Copy output here -->
-</details>
-
-Operating System:
-- [ ] Windows 7
-- [ ] Windows 8/8.1
-- [ ] Windows 10
-- [ ] Linux
-  - Please provide the output of `cat /etc/os-release`
-
-If applicable you can provide related sections from the log files and ensure to **remove sensitive or otherwise private information**.
- - Linux: `/var/lib/portmaster/logs`
- - Windows: `%PROGRAMDATA%\Safing\Portmaster\logs`
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 4ab1dc2b..12377170 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,12 +2,27 @@
 # Ref: https://help.github.com/en/github/building-a-strong-community/configuring-issue-templates-for-your-repository#configuring-the-template-chooser
 blank_issues_enabled: true  # default: true
 contact_links:
-- name: User Interface Issues 💻
+
+# - name: "🛠 Create Issue for Portmaster"
+#   url: https://github.com/safing/portmaster/issues/new/choose
+#   about: "Create issue related to the main application"
+
+- name: "🎨 Create Issue for User Interface"
   url: https://github.com/safing/portmaster-ui/issues/new/choose
-  about: Report any issues or feature requests for the Portmaster UI here
-- name: Support Requests & Community 🤷
+  about: "Create issue for everything connected to the Portmaster's User Interface"
+
+- name: "📦 Create Issue for Packaging & Installers"
+  url: https://github.com/safing/portmaster-packaging/issues/new/choose
+  about: "Create issue for things related to Portmaster's installers, packaging and distribution"
+
+- name: "Contribution Guideline"
+  url: https://docs.safing.io/portmaster/guides/contribute
+  about: Learn how to best contribute and make sure your work is aligned with Safing’s current goals and focus
+
+- name: "Support Requests & Community"
   url: https://www.reddit.com/r/safing
-  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
-  about: Be nice to other community members ❤
+  about: Ask for support and any questions you might have on reddit
+
+- name: "Code of Conduct"
+  url: https://docs.safing.io/community/code-of-conduct
+  about: Be nice to other community members
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
deleted file mode 100644
index 87f04413..00000000
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-name: Feature Request
-about: Suggest an enhancement or feature to the Portmaster
-labels: feature
-
----
-<!--
-Please only use this template for submitting enhancement requests
-for the Portmaster service daemon. For UI requests, please refer
-to the safing/portmaster-ui repository.
--->
-
-**What would you like to be added**:
-
-**Why is this needed**:
diff --git a/.github/ISSUE_TEMPLATE/report-bug.md b/.github/ISSUE_TEMPLATE/report-bug.md
new file mode 100644
index 00000000..fe211908
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report-bug.md
@@ -0,0 +1,43 @@
+---
+name: "🐞 Report a Bug"
+about: Report a bug encountered while using the Portmaster
+labels: bug
+---
+
+<!--
+Please disclose security related issues privately to support@safing.io.
+-->
+
+**Pre-Submit Checklist**:
+
+- 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](https://github.com/safing/portmaster/issues?q=is%3Aissue+label%3Abug)
+
+**What happened**:
+
+
+
+**What did you expect to happen?**:
+
+
+
+**How did you reproduce it?**:
+
+
+
+**Debug Information**:
+
+<!--
+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 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`
+- Windows: `%PROGRAMDATA%\Safing\Portmaster\logs`
+-->
diff --git a/.github/ISSUE_TEMPLATE/report-compatibility.md b/.github/ISSUE_TEMPLATE/report-compatibility.md
new file mode 100644
index 00000000..d6a9a6e6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report-compatibility.md
@@ -0,0 +1,35 @@
+---
+name: "📝 Make a Compatibility Report"
+about: Report Portmaster in/compatibility with Linux Distros, VPN Clients or general Software
+labels: "in/compatibility"
+---
+
+**Pre-Submit Checklist**:
+
+- 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](https://github.com/safing/portmaster/issues?q=is%3Aissue+label%3Ain%2Fcompatibility)
+
+**What worked?**
+
+
+
+**What did not work?**
+
+
+
+**Debug Information**:
+
+<!--
+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 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`
+- Windows: `%PROGRAMDATA%\Safing\Portmaster\logs`
+-->
diff --git a/.github/ISSUE_TEMPLATE/suggest-feature.md b/.github/ISSUE_TEMPLATE/suggest-feature.md
new file mode 100644
index 00000000..81556352
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/suggest-feature.md
@@ -0,0 +1,13 @@
+---
+name: "💡 Suggest an Improvement or Feature"
+about: Suggest an enhancement or a new feature for the Portmaster
+labels: feature
+---
+
+**What would you like to add or change?**:
+
+
+
+**Why do you and others need this?**:
+
+