diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index c71e5fc6e..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,54 +0,0 @@
-If you have a PrimeVue PRO Support subscription please post your issue at;
-
-https://pro.primefaces.org 
-
-where our team will respond within 1 business hour.
-
-If you do not have a PrimeVue PRO Support subscription, fill-in the report below. Please note that
-your issue will be added to the waiting list of community issues and will be reviewed on a first-come first-serve basis, as a result, the support team is unable to guarantee a specific schedule on when it will be reviewed. Thank you for your understanding.
-
-Current Queue Time for Review
-Without PRO Support: ~1-4 weeks.
-With PRO Support: 1 hour
-
-**I'm submitting a ...**  (check one with "x")
-```
-[ ] bug report => Search github for a similar issue or PR before submitting
-[ ] feature request => Please check if request is not on the roadmap already https://github.com/primefaces/primevue/wiki/Roadmap
-[ ] support request => Please do not submit support request here, instead see http://forum.primefaces.org/viewforum.php?f=110
-```
-
-**CodeSandbox Case (Bug Reports)**
-Please demonstrate your case at CodeSandbox by using the issue template below. Issues without a test case have much less possibility to be reviewed in detail and assisted.
-
-https://codesandbox.io/s/primevue-3-issue-template-ip3vm
-https://codesandbox.io/s/primevue-3-typescript-issue-template-z1f6e2
-https://codesandbox.io/s/primevue-2-issue-template-dw7jd7
-
-**Current behavior**
-<!-- Describe how the bug manifests. -->
-
-**Expected behavior**
-<!-- Describe what the behavior would be without the bug. -->
-
-**Minimal reproduction of the problem with instructions**
-<!--
-If the current behavior is a bug or you can illustrate your feature request better with an example, 
-please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
-codesandbox or similar (you can use this template as a starting point: https://codesandbox.io/s/primevue-issue-template-forked-vgbzf).
--->
-
-**What is the motivation / use case for changing the behavior?**
-<!-- Describe the motivation or the concrete use case -->
-
-**Please tell us about your environment:**
-<!-- Operating system, IDE, package manager, HTTP server, ... -->
-
-* **Vue version:** 3.X
-<!-- Check whether this is still an issue in the most recent Vue version -->
-
-* **PrimeVue version:** 3.12.X
-<!-- Check whether this is still an issue in the most recent PrimeVue version -->
-
-* **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
-<!-- All browsers where this could be reproduced -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..923dffeb5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,98 @@
+name: Bug report
+description: Create a report to help us improve
+title: "Component: Title"
+labels: "bug"
+body:
+  - type: markdown
+    attributes:
+      # yamllint disable rule:line-length
+      value: >
+        ### There is no guarantee in receiving an immediate response in GitHub Issue Tracker, If you'd like to secure our response, you may consider *PrimeVue PRO Support* where support is provided within 4 business hours
+      # yamllint enable rule:line-length
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: input
+    id: reproducer
+    attributes:
+      label: Reproducer
+      placeholder: https://codesandbox.io/s/primevue-3-issue-template-ip3vm
+      description: |
+        Please fork one of the issue template 
+        [PrimeVue 3 Issue Template](https://codesandbox.io/s/primevue-3-issue-template-ip3vm)
+        [PrimeVue TypeScript Issue Template](https://codesandbox.io/s/primevue-3-typescript-issue-template-z1f6e2)
+        [PrimeVue 2 Issue Template](https://codesandbox.io/s/primevue-2-issue-template-dw7jd7)
+        and create a case demonstrating your bug report. Issues **without** a CodeSandbox have much less possibility to be reviewed.
+    validations:
+      required: false
+  - type: input
+    id: pr-version
+    attributes:
+      label: PrimeVue version
+      placeholder: x.x.x
+    validations:
+      required: true
+  - type: dropdown
+    id: vue-version
+    attributes:
+      label: Vue version
+      multiple: false
+      options:
+        - 3.x
+        - 2.x
+    validations:
+      required: true
+  - type: dropdown
+    id: language
+    attributes:
+      label: Language
+      multiple: false
+      options:
+        - TypeScript
+        - ES5
+        - ES6
+        - ALL
+    validations:
+      required: true
+  - type: dropdown
+    id: engine
+    attributes:
+      label: Build / Runtime
+      multiple: false
+      options:
+        - Vue CLI App
+        - TypeScript
+        - Nuxt
+        - Vite
+    validations:
+      required: true
+  - type: input
+    id: browsers
+    attributes:
+      label: Browser(s)
+      description: List specific browser(s) the problem occurs on or leave blank if ALL browsers
+      placeholder: >
+        e.g. Safari 15, iOS 15.4, Chrome 90
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: Steps to reproduce the behavior
+      description: A clear and concise description of how to make the issue happen.
+      placeholder: >
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: false
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..3f03ba9e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,39 @@
+name: Feature request
+description: Suggest an idea for this project
+title: "Component: Title"
+labels: ["enhancement"]
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the feature you would like to see added
+    validations:
+      required: true
+  - type: textarea
+    id: problem-related
+    attributes:
+      label: Is your feature request related to a problem?
+      description: A clear and concise description of what the problem is. Ex. I'm always frustrated when?
+    validations:
+      required: false
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen.
+    validations:
+      required: false
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you have considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false