diff --git a/issue_template/bug.yaml b/issue_template/bug.yaml
index c7e2f6b788..52b769f517 100644
--- a/issue_template/bug.yaml
+++ b/issue_template/bug.yaml
@@ -1,6 +1,14 @@
 name: Bug Report
 about: File a bug report
 title: "[Bug]: "
+blank_issues_enabled: true
+contact_links:
+  - name: Support Matrix
+    url: https://matrix.to/#/%23calckey:matrix.fedibird.com
+    about: Having trouble with deployment? Ask the support chat!
+	- name: Resposible Disclosure
+		url: https://codeberg.org/calckey/calckey/src/branch/develop/SECURITY.md
+		about: Found a security vulnerability? Please report it here!
 body:
   - type: markdown
     attributes:
@@ -29,7 +37,7 @@ body:
     attributes:
       label: Version
       description: What version of calckey is your instance running? You can find this by clicking your instance's logo at the bottom left and then clicking instance information.
-      placeholder: Calckey Version 13.0.4
+      placeholder: v13.1.4.1
     validations:
       required: true
   - type: input
@@ -37,13 +45,23 @@ body:
     attributes:
       label: Instance
       description: What instance of calckey are you using?
-      placeholder: stop.voring.me
+      placeholder: calckey.social
     validations:
       required: false
+	- type: dropdown
+		id: issue-type
+		attributes:
+			label: What type of issue is this?
+			description: If this happens on your device and has to do with the user interface, it's client-side. If this happens on either with the API or the backend, or you got a server-side error in the client, it's server-side.
+			multiple: false
+			options:
+				- Client-side
+				- Server-side
+				- Other (Please Specify)
   - type: dropdown
     id: browsers
     attributes:
-      label: What browser are you using?
+      label: What browser are you using? (Client-side issues only)
       multiple: false
       options:
         - Firefox
@@ -54,6 +72,33 @@ body:
         - Safari
         - Microsoft Edge
         - Other (Please Specify)
+	- type: dropdown
+		id: device
+		attributes:
+			label: What operating system are you using? (Client-side issues only)
+			multiple: false
+			options:
+				- Windows
+				- MacOS
+				- Linux
+				- Android
+				- iOS
+				- Other (Please Specify)
+	- type: dropdown
+		id: operating-system
+		attributes:
+			label: What operating system are you using? (Server-side issues only)
+			multiple: false
+			options:
+				- Ubuntu >= 22.04
+				- Ubuntu < 22.04
+				- Debian
+				- Arch
+				- RHEL (CentOS/AlmaLinux/Rocky Linux)
+				- FreeBSD
+				- OpenBSD
+				- Android
+				- Other (Please Specify)
   - type: textarea
     id: logs
     attributes: