diff --git a/.github/DISCUSSION_TEMPLATE/q-a.yml b/.github/DISCUSSION_TEMPLATE/q-a.yml
new file mode 100644
index 00000000..cf02916f
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/q-a.yml
@@ -0,0 +1,62 @@
+title: "[Question and support] "
+labels: ["question/support"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Describe the problem/question: A clear and concise description of what the problem/issue or question is.
+  - type: checkboxes
+    attributes:
+      label: Please tick this to confirm
+      options:
+        - label: Yes, I have read [the FAQ](https://github.com/PrivateBin/PrivateBin/wiki/FAQ) and I found no solution/answer there.
+  - type: markdown
+    attributes:
+      value: |
+        ## What you did
+        Tell us how to reproduce the problem.
+
+        1.
+        2.
+  - type: textarea
+    id: what_happens
+    attributes:
+      label: What happens
+  - type: textarea
+    id: what_should_happen
+    attributes:
+      label: What should happen
+  - type: textarea
+    id: additional_info
+    attributes:
+      label: Additional information
+      description: If you have access to the server log files, copy them here.
+  - type: input
+    id: server_address
+    attributes:
+      label: Server address
+  - type: input
+    id: server_os
+    attributes:
+      label: Server OS
+  - type: input
+    id: webserver
+    attributes:
+      label: Webserver
+  - type: input
+    id: browser
+    attributes:
+      label: Browser
+  - type: input
+    id: privatebin_version
+    attributes:
+      label: PrivateBin version
+  - type: radio
+    id: reproduce_issue
+    attributes:
+      label: I can reproduce this issue on [https://privatebin.net](https://privatebin.net)
+      options:
+        - label: Yes
+          value: Yes
+        - label: No
+          value: No
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0541a10f..9a02c084 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,15 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a report to help us improve (only for software bugs)
 title: ''
 labels: bug
 assignees: ''
 
 ---
 
+<!-- Please make sure to **only** use this template when it is about bugs in the PrivateBin PHO project.
+Otherwise, for help and support issues e.g. for deployment issues, please go back and chose the appropiate category. -->
+
 <-- Describe the bug: A clear and concise description of what the bug is. -->
 
 ## Steps to reproduce
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..2df8210a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,13 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question and support
+    url: https://github.com/orgs/PrivateBin/discussions/new?category=q-a
+    about: Your setup is not working and you need help or you have a question regarding
+  PrivateBin
+  - name: Problem with the container image
+    url: https://github.com/PrivateBin/docker-nginx-fpm-alpine/issues/new
+    about: Please report all problems that apply **only** to the official (Docker) image `docker-nginx-fpm-alpine` here.
+  - name: Security issue
+    url: https://github.com/PrivateBin/PrivateBin/security/policy
+    about: Please report security vulnerabilities and other security issues here.
+
diff --git a/.github/ISSUE_TEMPLATE/question-and-support.md b/.github/ISSUE_TEMPLATE/question-and-support.md
deleted file mode 100644
index 973deadf..00000000
--- a/.github/ISSUE_TEMPLATE/question-and-support.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-name: Question and support
-about: Your setup is not working and you need help or you have a question regarding
-  PrivateBin
-title: ''
-labels: question/support
-assignees: ''
-
----
-
-<-- Describe the problem/question: A clear and concise description of what the bug is. -->
-
-<!-- Please tick this to confirm, you did it.-->
-* [ ] Yes I have read [the FAQ](https://github.com/PrivateBin/PrivateBin/wiki/FAQ) and I found no solution/answer there.
-
-## What you did
-<!-- Tell us how to reproduce the problem. -->
-1.
-2.
-
-### What happens
-
-
-### What should happen
-
-
-## Additional information
-<!--
-Here you can add screenshots. If the issue is e.g. a client-side issue (= an issue, which happens in your browser) press F12 and copy and paste the console output or add a screenshot.
-If you have access to the server log files, also copy them here.
--->
-
-## Basic information
-
-<!-- If you use a public server enter the address of it here. -->
-**Server address**:
-
-<!-- The Operation System of your server -->
-**Server OS:**
-
-<!-- The webserver running on your server, preferably including the version -->
-**Webserver:**
-
-<!-- The version of your browser (when it is a client-side issue) -->
-**Browser:**
-
-<!-- The version of PrivateBin, if you use an unstable version paste the commit hash or the GitHub link to the commit here (you can get it by running `git rev-parse HEAD`) -->
-**PrivateBin version:**
-
-I can reproduce this issue on <https://privatebin.net>: Yes / No