diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 55113bb..0000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-For general questions, please ask on ROS answers: https://answers.ros.org, make sure to include at least the `ros2` tag and the rosdistro version you are running, e.g. `ardent`.
-For general design discussions, please post on discourse: https://discourse.ros.org/c/ng-ros
-For Bug report or feature requests, please fill out the relevant category below
--->
-
-## Bug report
-
-**Required Info:**
-
-- Operating System:
-  - <!-- OS and version (e.g. Windows 10, Ubuntu 16.04...) -->
-- Installation type:
-  - <!-- binaries or from source  -->
-- Version or commit hash:
-  - <!-- Output of git rev-parse HEAD, release version, or repos file  -->
-- DDS implementation:
-  - <!-- rmw_implementation used (e.g. Fast-RTPS, RTI Connext, etc -->
-- Client library (if applicable):
-  - <!-- e.g. rclcpp, rclpy, or N/A -->
-
-#### Steps to reproduce issue
-<!-- Detailed instructions on how to reliably reproduce this issue http://sscce.org/
-``` code that can be copy-pasted is preferred ``` -->
-```
-
-```
-
-#### Expected behavior
-
-#### Actual behavior
-
-#### Additional information
-
-<!-- If you are reporting a bug delete everything below
-     If you are requesting a feature deleted everything above this line -->
-----
-## Feature request
-
-#### Feature description
-<!-- Description in a few sentences what the feature consists of and what problem it will solve -->
-
-#### Implementation considerations
-<!-- Relevant information on how the feature could be implemented and pros and cons of the different solutions -->
diff --git a/ISSUE_TEMPLATE/bug-report.yml b/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000..d893332
--- /dev/null
+++ b/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,85 @@
+name: Bug report
+description: Create a report to help us improve
+labels: ["bug"]
+body:
+  - type: input
+    id: os
+    attributes:
+      label: Operating System
+      placeholder: OS and version (e.g. Windows 10, Ubuntu 16.04...)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: installation-type
+    attributes:
+      label: Installation type
+      options:
+        - Pulled from Docker Hub
+        - Local source build
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version or commit hash
+      placeholder: Output of git rev-parse HEAD, release version, or repos file
+    validations:
+      required: true
+
+  - type: dropdown
+    id: rmw_implementation
+    attributes:
+      label: RMW Implementation
+      options:
+        - FastRTPS
+        - CycloneDDS
+        - RTIConnextDDS
+        - Other
+    validations:
+      required: true
+
+  - type: dropdown
+    id: rcl
+    attributes:
+      label: Client library (if applicable)
+      options:
+        - rclcpp
+        - rclpy
+        - Other
+        - N/A
+    validations:
+      required: true
+
+  - type: textarea
+    id: repro-steps
+    attributes:
+      label: Steps to reproduce issue
+      placeholder: Detailed instructions on how to reliably reproduce this issue http://sscce.org/. Code that can be copy-pasted is preferred.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      placeholder: Tell us what should happen
+    validations:
+      required: true
+
+  - type: textarea
+    id: actual
+    attributes:
+      label: Actual behavior
+      placeholder: Tell us what happens instead
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Backtrace or Console output
+      placeholder: Use a GitHub Gist to copy-paste the console output or segfault backtrace using gdb.
+    validations:
+      required: false
diff --git a/ISSUE_TEMPLATE/feature-request.yml b/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000..03dcd35
--- /dev/null
+++ b/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,19 @@
+name: Feature Request
+description: Suggest an idea for this project
+labels: ["enhancement"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature description
+      placeholder: Description in a few sentences what the feature consists of and what problem it will solve
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation
+    attributes:
+      label: Implementation considerations
+      placeholder: Relevant information on how the feature could be implemented and pros and cons of the different solutions
+    validations:
+      required: true