diff --git a/.github/ISSUE_TEMPLATE/01-webapp-bug.yml b/.github/ISSUE_TEMPLATE/01-webapp-bug.yml
new file mode 100644
index 0000000000..4a52e519f3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01-webapp-bug.yml
@@ -0,0 +1,64 @@
+name: Bug Report (webapp)
+description: File a bug report for the issue in browser.
+labels: ["bug"]
+type: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    id: notafeature
+    attributes:
+      label: Pre-checks
+      options:
+        - label: This is not a feature request. Existing functionality does not work as intended, **not** missing
+            functionality. I will request features via [discussions](https://github.com/tutao/tutanota/discussions/),
+            [reddit](https://www.reddit.com/r/tutanota/) or [support](https://tuta.com/support)
+          required: true
+        - label: I've searched and did not find a similar issue.
+          required: true
+        - label: My report does not have personal or private information like email address or recovery code
+          required: true
+  - type: input
+    attributes:
+      label: App version
+      description: Can be found on the bottom of the login screen or in the bottom left corner of Settings -> About
+      placeholder: "123.456789.10"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Browser
+      placeholder: "Chromium, Firefox, Safari etc"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Browser version
+      placeholder: "123.456789.10"
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Operating System
+      options:
+        - Linux
+        - macOS
+        - Windows
+        - other
+      default: 0
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: What happened?
+      description: What steps you took and what you expected to happen?
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Other context
+      description: Any other useful information e.g. your OS version
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a2382ce53a..e693ddafe0 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,11 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Discussions on Github
+    url: https://github.com/tutao/tutanota/discussions/
+    about: Good for feature requests and help with contributions
   - name: Forum
     url: https://www.reddit.com/r/tutanota/
-    about: Please send feature requests, ask and answer questions here.
+    about: More general discussion and questions
   - name: Contact
     url: https://tuta.com/contact/
     about: Contact page
\ No newline at end of file