diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
index ec81b032d..09c4cb95b 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
@@ -33,6 +33,20 @@ body:
   attributes:
     label: Version
     description: Which version of ZITADEL are you using.
+- type: dropdown
+  id: database
+  attributes:
+    label: Database
+    description: What database are you using? (self-hosters only)
+    options:
+    - CockroachDB
+    - PostgreSQL
+    - Other (describe below!)
+- type: input
+  id: database-version
+  attributes:
+    label: Database Version
+    description: Which version of the selected database are you using? (self-hosters only)
 - type: textarea
   id: impact
   attributes: