diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index 3d1bd8324..000000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Let us know if something is broken on PyDM.
-
----
-
-**Describe the bug**
-<!-- A clear and concise description the bug -->
-
-**Expected behavior**
-<!-- A clear and concise description of what you expected to happen -->
-
-**Steps to Reproduce**
-<!-- Steps to reproduce the bug -->
-
-**Possible Solution**
-<!--
-    Not obligatory, but suggest a fix/reason for the bug, or ideas how to 
-    implement the addition or change.
---> 
-
-**My Platform**
-<!--
-    Any details about your specific platform:
-    * OS Version
-    * Python Version
-    * Packages Version (One good start point is the File > About screen at PyDM.
--->
-
-**Additional context**
-<!-- Add any other context, links, etc. about the bug here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 000000000..66461f0c9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,84 @@
+name: Bug Report
+description: Let us know if something is broken on PyDM.
+labels: [bug]
+body:
+
+  - type: markdown
+    attributes:
+      value: |
+        Before reporting, please make a quick search through the existing [open issues](https://github.com/slaclab/pydm/issues?q=is%3Aissue+is%3Aopen),
+        and also [closed issues](https://github.com/slaclab/pydm/issues?q=is%3Aissue+is%3Aclosed), to check if it's been previously addressed.
+
+  - type: textarea
+    attributes:
+      label: "Describe the bug"
+      description: "A clear and concise description the bug. May include logs, images, or videos."
+      placeholder: "A clear and concise description the bug. May include logs, images, or videos."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Steps to reproduce"
+      description: "Steps to reproduce the bug."
+      placeholder: "Steps to reproduce the bug."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Expected behavior"
+      description: "A clear and concise description of what you expected to happen."
+      placeholder: "A clear and concise description of what you expected to happen."
+    validations:
+      required: true
+
+  - type: dropdown
+    id: os-version
+    attributes:
+      label: "Operating System."
+      description: "Select your OS"
+      options:
+        - Linux
+        - Windows
+        - macOS
+    validations:
+      required: true
+      
+  - type: input
+    id: os-specific-version
+    attributes:
+      label: "OS Version Details."
+      description: "Specify your OS version (e.g., Ubuntu 22.04, Windows 10, macOS 13.3)."
+      placeholder: "Specify your OS version (e.g., Ubuntu 22.04, Windows 10, macOS 13.3)."
+    validations:
+      required: false
+  
+  - type: dropdown
+    id: python-version
+    attributes:
+      label: "Python Version"
+      description: "Select your Python version (check this with 'python -V')"
+      options:
+        - "3.9"
+        - "3.10"
+        - "3.11"
+        - "3.12"
+        - "3.13"
+    validations:
+      required: true
+
+  - type: textarea
+    id: package-versions
+    attributes:
+      label: "Packages Version"
+      description: "Provide package versions (Check `File > About` in PyDM). Can upload a screenshot if you wish."
+      placeholder: "Example: PyDM v1.25.2, NumPy v2.2.2, PyQt v5.12.3, Qt v5.12.9, PyQtGraph v.0.12.4"
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: "Additional context."
+      description: "Add any other context, links, etc. about the feature here."
+      placeholder: "Add any other context, links, etc. about the feature here."
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
deleted file mode 100644
index 2c6476c29..000000000
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Suggest a new feature for PyDM
-
----
-
-**What's the problem this feature will solve?**
-<!-- A clear and concise description of what the problem is. -->
-
-**Describe the solution you'd like**
-<!-- A clear and concise description of what you want to happen. -->
-
-**Additional context**
-<!-- Add any other context, links, etc. about the feature here. -->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 000000000..514464533
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,35 @@
+name: Feature request
+description: Suggest a new feature for PyDM
+labels: [enhancement]
+body:
+
+  - type: markdown
+    attributes:
+      value: |
+        Before requesting please make a quick search through the existing [feature request issues](https://github.com/slaclab/pydm/issues?q=is%3Aissue+is%3Aopen).
+
+  - type: textarea
+    attributes:
+      label: "What's the problem this feature will solve?"
+      description: "A clear and concise description of what the problem is."
+      placeholder: "A clear and concise description of what the problem is."
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: "Describe the solution you'd like."
+      description: "A clear and concise description of what you want to happen."
+      placeholder: "A clear and concise description of what you want to happen."
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: "Additional context."
+      description: "Add any other context, links, etc. about the feature here."
+      placeholder: "Add any other context, links, etc. about the feature here."
+    validations:
+      required: false
+
+