diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 9821b18..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
----
-
-<!-- Please do not use this issue tracker for support or questions, use Forum or Slack listed here:
-     https://plugins.jetbrains.com/docs/intellij/getting-help.html
-     Please **always** provide link to sources if possible. -->
-
-**Describe the bug:**
-<!-- A clear and concise description of what the bug is. -->
-
-**Steps to reproduce:** 
-<!-- Steps to reproduce the issue. -->
-
-**Expected behavior:**
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Additional context:**
-<!-- Add any other context about the problem here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..bd9f9fb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,63 @@
+name: Bug report
+description: Create a report to help us improve
+labels: ["bug"]
+body:
+
+  - type: textarea
+    id: issue
+    attributes:
+      label: What happened?
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output or stack trace
+      description: |
+        Please copy and paste any relevant log output.
+        Add the full stack trace if available.
+        If possible, run the failing task with `--stacktrace` flag.
+        
+        *This will be automatically formatted into code, so there is no need for backticks.*
+      render: shell
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behavior – provide your build configuration.
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Gradle IntelliJ Plugin version
+      placeholder: 1.16.0
+    validations:
+      required: true
+
+  - type: input
+    id: gradle
+    attributes:
+      label: Gradle version
+      placeholder: 8.2.1
+    validations:
+      required: true
+
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating System
+      options:
+        - macOS
+        - Linux
+        - Windows
+
+  - type: input
+    id: url
+    attributes:
+      label: Link to build, i.e. failing GitHub Action job
+      placeholder: https://github.com/username/project/actions/runs/1234567890
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..58278e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Documentation
+    url: https://github.com/JetBrains/intellij-platform-plugin-template
+    about: Check the README file in the first place.
+  - name: Getting Help
+    url: https://plugins.jetbrains.com/docs/intellij/getting-help.html
+    about: Check if you search for a help in plugin development.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000..9c13061
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,32 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: ["enhancement"]
+body:
+
+  - type: textarea
+    id: cause
+    attributes:
+      label: Describe the need of your request
+      description: A clear and concise description of what the need or problem is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Proposed solution
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives you've considered
+      description: What did you try so far to accomplish the goal?
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.