diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 1ac6e91..0000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug Report
-about: Provide a report for what the issue is
-title: ''
-labels: bug
-assignees: hilary-luo
-
----
-
-**Please provide the following information:**
- - OS: (e.g. Ubuntu 20.04)
- - ROS Distro: (e.g. Galactic)
- - Built from source or installed:
- - Package version: (if from repository, give version from `sudo dpkg -s ros-$ROS_VERSION-turtlebot4-PACKAGE_WITH_ISSUE`, if from source, give commit hash)
-
- **Expected behaviour**
- A clear and concise description of what you expected to happen.
-
- **Actual behaviour**
- A clear and concise description of what you encountered.
-
-**To Reproduce**
-Provide the steps to reproduce:
-1. run something
-2. launch something else
-3. see the error
-
-
-**Other notes**
-Add anything else you thing is important.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000..8a3a429
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,109 @@
+name: Bug Report
+description: Provide a report for what the issue is
+labels: ["bug"]
+assignees:
+  - smatar22
+  - RustyCPR
+body:
+  - type: markdown
+    attributes:
+      value: "# System Information"
+  - type: dropdown
+    id: model
+    attributes:
+      label: Robot Model
+      description: Standard has a screen, Lite does not. For simulation select the one that you are simulating.
+      options:
+        - Select One
+        - Turltebot4 Standard
+        - Turtlebot4 Lite
+    validations:
+      required: true
+  - type: dropdown
+    id: ros-distro
+    attributes:
+      label: ROS distro
+      description: What ROS distribution are you using (must match on all devices in the system)?
+      options:
+        - Select One
+        - Galactic
+        - Humble
+    validations:
+      required: true
+  - type: dropdown
+    id: networking
+    attributes:
+      label: Networking Configuration
+      options:
+        - Select One
+        - Simple Discovery
+        - Discovery Server
+        - I do not know
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: OS
+      description: What OS are you running on your companion PC (used to interact with the Turtlebot4)?
+      options:
+        - Select One
+        - Ubuntu 20.04
+        - Ubuntu 22.04
+        - Other Linux
+        - Windows / MAC
+    validations:
+      required: true
+  - type: dropdown
+    id: build-type
+    attributes:
+      label: Built from source or installed?
+      description: Did you build from source (build the packages yourself) or did you install the packages (e.g. `sudo apt install ...`)?
+      options:
+        - Select One
+        - Built from Source
+        - Installed
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: Package version
+      description: What version of the package are you running? (if installed run `dpkg -s ros-$ROS_DISTRO-turtlebot4-PACKAGE_WITH_ISSUE`, if from source, give commit hash)
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: "# Problem Description"
+  - type: textarea
+    attributes:
+      label: Expected behaviour
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual behaviour
+      description: A clear and concise description of what you encountered.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Error messages
+      description: Error messages copied from terminal and/or relevant logs. Copy these directly from the terminal in full.
+      render: bash
+  - type: textarea
+    attributes:
+      label: To Reproduce
+      description: Provide the steps to reproduce.
+      placeholder: |
+        1. run something
+        2. launch something else
+        3. see the error
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Other notes
+      description: Add anything else you thing is important.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
deleted file mode 100644
index 2e3a5ba..0000000
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Provide context for the feature you are requesting
-title: ''
-labels: enhancement
-assignees: hilary-luo
-
----
-
-**Describe the the feature you would like**
-A clear and concise description of what you want to happen.
-
-**Other notes**
-Add anything else you thing is important.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000..95d748f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,17 @@
+name: Feature request
+description: Provide context for the feature you are requesting
+labels: ["enhancement"]
+assignees:
+  - smatar22
+  - RustyCPR
+body:
+  - type: textarea
+    attributes:
+      label: Describe the the feature you would like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Other notes
+      description: Add anything else you thing is important.
\ No newline at end of file