diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index c76fd1d62..1f0484019 100755
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -1,26 +1,38 @@
----
-name: Bug report
-about: Create a report to help us improve nRF Mesh
-
----
-
-**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.
-
-**Platform details:**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Library Version (or Commit)
-
-**Logs / Screenshots**
-Add any logs or screenshots that can help us debug the issue faster
+name: Bug Report
+description: Create a report to help us improve nRF Mesh.
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      options:
+        - 4.0.1 (Latest)
+        - 4.0.0
+        - 3.2.0
+      default: 0
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Describe the issue
+      description: Describe the issue, expected and actual result.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. Scroll down to '...'
+        4. ...
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md
index 0f093e232..e9e0d89af 100755
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,17 +1,27 @@
----
 name: Feature request
-about: Suggest an idea for nRF Mesh
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
+description: Propose a new feature.
+labels: ["improvement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this form!
+  - type: dropdown
+    id: type
+    attributes:
+      label: Target
+      description: Are you proposing it a feature in nRF Mesh app or the library?
+      options:
+        - Library
+        - App
+      default: 0
+    validations:
+      required: true
+  - type: textarea
+    id: proposal
+    attributes:
+      label: Describe the feature
+      description: What do you need? You may include screenshots if needed.
+      placeholder: Please add...
+    validations:
+      required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/user-story.md b/.github/ISSUE_TEMPLATE/user-story.md
deleted file mode 100644
index 422234d33..000000000
--- a/.github/ISSUE_TEMPLATE/user-story.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: User Story
-about: Create a new user story for a functional requirement
-
----
-
-As a *type of user*, I want < some goal > so that < some reason >.