diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 9f3d2e654..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: "\U0001F41B Bug Report"
-about: Report unexpected behavior with stancl/tenancy.
-title: ''
-labels: bug
-assignees: stancl
-
----
-
-#### Describe the bug
-<!-- A clear and concise description of what the bug is. -->
-
-#### Steps to reproduce
-
-
-#### Expected behavior
-A clear and concise description of what you expected to happen.
-
-#### Your setup
- - Laravel version: [e.g. 8.2.0]
- - stancl/tenancy version: [e.g. 3.1.0]
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 000000000..75e345b28
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,48 @@
+name: 🐛 Bug Report
+description: Report unexpected behavior with stancl/tenancy.
+labels: ["bug"]
+assignees:
+  - stancl
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before opening a bug report, please search for the behaviour in the existing issues.
+        ---
+        Thank you for taking the time to file a bug report. To address this bug as fast as possible, we need some information.
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug description
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: Step-by-step guide for reproducing the bug in a fresh Laravel application.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+
+  - type: input
+    id: laravel-version
+    attributes:
+      label: Laravel version
+      placeholder: "e.g. 8.2.0"
+    validations:
+      required: true
+  - type: input
+    id: tenancy-version
+    attributes:
+      label: stancl/tenancy version
+      placeholder: "e.g. 3.1.0"
+    validations:
+      required: true