diff --git a/.github/ISSUE_TEMPLATE/01-bug.yml b/.github/ISSUE_TEMPLATE/01-bug.yml
new file mode 100644
index 00000000..8267bd70
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/01-bug.yml
@@ -0,0 +1,73 @@
+name: Bug report
+description: File a bug report for chrome-devtools-mcp
+title: '<short description of the bug>'
+labels:
+  - 'bug'
+body:
+  - id: description
+    type: textarea
+    attributes:
+      label: Description of the bug
+      description: >
+        A clear and concise description of what the bug is.
+      placeholder:
+    validations:
+      required: true
+
+  - id: reproduce
+    type: textarea
+    attributes:
+      label: Reproduction
+      description: >
+        Steps to reproduce the behavior:
+      placeholder: |
+        1. Use tool '...'
+        2. Then use tool '...'
+
+  - id: expectation
+    type: textarea
+    attributes:
+      label: Expectation
+      description: A clear and concise description of what you expected to happen.
+
+  - id: mcp-configuration
+    type: textarea
+    attributes:
+      label: MCP configuration
+
+  - id: node-version
+    type: input
+    attributes:
+      label: Node version
+      description: >
+        Please verify you have the minimal supported version listed in the README.md
+
+  - id: chrome-version
+    type: input
+    attributes:
+      label: Chrome version
+
+  - id: coding-agent-version
+    type: input
+    attributes:
+      label: Coding agent version
+
+  - id: model-version
+    type: input
+    attributes:
+      label: Model version
+
+  - id: chat-log
+    type: input
+    attributes:
+      label: Chat log
+
+  - id: operating-system
+    type: dropdown
+    attributes:
+      label: Operating system
+      description: What supported operating system are you running?
+      options:
+        - Windows
+        - macOS
+        - Linux
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 96e9aee3..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Chrome version:**
-**Coding agent version:**
-**Model version:**
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Chat log**
-The full log of the chat with your coding agent.