diff --git a/.github/ISSUE_TEMPLATE/Bug_Report.md b/.github/ISSUE_TEMPLATE/Bug_Report.md
deleted file mode 100644
index 6315e21e..00000000
--- a/.github/ISSUE_TEMPLATE/Bug_Report.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
-name: 🐛 Bug Report
-about: If something isn't working as expected 🤔.
-labels: bug
----
-
-<!--- Please keep this note for the community --->
-
-### Community Note
-
-* Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request
-* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request
-* If you are interested in working on this issue or have submitted a pull request, please leave a comment
-
-<!--- Thank you for keeping this note for the community --->
-
-### Description
-<!--- Please specify additional labels in the labels section if applicable to the issue.
-Possible additional labels: documentation/question --->
-
-<!--- Please leave a helpful description of the feature request here. --->
-
-* xxxx
-
-### Affected Module Name(s):
-
-<!--- Please list the affected module name(s). --->
-
-* nd_XXXXX
-
-### ND version and ND Platform
-
-* V x.x.x and Physical/OVA/Cloud-AWS/Cloud-Azure/SaaS/all.
-
-
-### APIC version and APIC Platform for Site related issues
-
-* V x.x.x and on-prem/cloud-aws/cloud-azure/all.
-
-
-### Collection versions
-
-* cisco.nd x.x.x
-
-### Output/ Error message
-
-<!---
-Please provide the generated error message.
---->
-*
-
-### Expected Behavior
-
-<!--- What should have happened? --->
-*
-
-### Actual Behavior
-
-<!--- What actually happened? --->
-*
-
-### Playbook tasks to Reproduce
-
-<!--- Please list the playbook tasks required to reproduce the issue. --->
-
-*
-
-### Important Factoids
-
-<!--- Are there anything atypical about your setup that we should know? For example: Same task runs on different version of ND? --->
-
-### References
-
-<!---
-Information about referencing Github Issues: https://help.github.com/articles/basic-writing-and-formatting-syntax/#referencing-issues-and-pull-requests
-
-Are there any other GitHub issues (open or closed) or pull requests that should be linked here? Vendor documentation? For example:
---->
-
-* #0000
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/Feature_Request.md b/.github/ISSUE_TEMPLATE/Feature_Request.md
deleted file mode 100644
index 199a2943..00000000
--- a/.github/ISSUE_TEMPLATE/Feature_Request.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-name: 🚀 Feature Request
-about: I have a suggestion (might want to implement it myself 🙂)!
-labels: enhancement
----
-
-<!--- Please keep this note for the community --->
-
-### Community Note
-
-* Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request
-* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request
-* If you are interested in working on this issue or have submitted a pull request, please leave a comment
-
-<!--- Thank you for keeping this note for the community --->
-
-### Description
-<!--- Please specify additional labels in the labels section if applicable to the issue.
-Possible additional labels: new_module/new_plugin/documentation/feature --->
-
-
-<!--- Please leave a helpful description of the feature request here. --->
-
-* xxxx
-
-### New or Affected Module(s):
-
-<!--- Please list the new or affected module(s). --->
-
-* nd_XXXXX
-
-### ND version and ND Platform
-
-* V x.x.x and Physical/OVA/Cloud-AWS/Cloud-Azure/SaaS/all.
-
-
-### APIC version and APIC Platform for Site related features
-
-* V x.x.x and on-prem/cloud-aws/cloud-azure/all.
-
-### Collection versions
-
-* cisco.nd x.x.x
-
-### References
-
-<!---
-Information about referencing Github Issues: https://help.github.com/articles/basic-writing-and-formatting-syntax/#referencing-issues-and-pull-requests
-
-Are there any other GitHub issues (open or closed) or pull requests that should be linked here? Vendor blog posts or documentation? For example:
-
---->
-
-* #0000
\ 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 00000000..ee45edfc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,127 @@
+name: Bug Report
+description: Report a bug impacting the Ansible ND Collection
+title: Bug Report Title
+labels:
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for creating a bug issue to help us improve the Ansible ND Collection.
+        Please fill out the sections below to help us understand and reproduce the issue you are facing.
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Community Note
+        Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
+        to help the community and maintainers prioritize this request. Please do not leave "+1" or other comments that do not add relevant new information
+        or questions, they generate extra noise for issue followers and do not help prioritize the request. If you are interested in working on this issue
+        or have submitted a pull request, please leave a comment.
+
+  - type: textarea
+    id: ansible-version
+    attributes:
+      label: Ansible Version
+      description: Please provide your Ansible version used when encountering this issue using ```ansible --version```
+      placeholder: ansible --version
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: ansible-collection-versions
+    attributes:
+      label: Ansible Collection Versions
+      description: Please provide your Ansible Collection versions used when encountering this issue using ```ansible-galaxy collection list```
+      placeholder: ansible-galaxy collection list
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: ansible-collection-module
+    attributes:
+      label: Ansible Collection Module
+      description: Please provide the Ansible Collection module encountering this issue
+      placeholder: cisco.nd.nd_<placeholder>
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: nd-version
+    attributes:
+      label: Cisco Nexus Dashboard Version
+      description: Please provide your Cisco Nexus Dashboard version used when encountering this issue
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: nxos-version
+    attributes:
+      label: Cisco NX-OS Version
+      description: Please provide your Cisco NX-OS version used when encountering this issue
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: aci-version
+    attributes:
+      label: Cisco ACI Version
+      description: Please provide your Cisco ACI version used when encountering this issue
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: Please provide the expected behavior
+      placeholder: Expected behavior
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual Behavior
+      description: Please provide the actual behavior
+      placeholder: Actual behavior
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: ansible-playbook
+    attributes:
+      label: Ansible Playbook
+      description: Please provide your Ansible playbook that is encountering the issue
+      placeholder: Ansible Playbook
+      render: yaml
+    validations:
+      required: true
+
+  - type: textarea
+    id: step-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: Please provide the steps to reproduce the issue
+      placeholder: List of steps to reproduce the issue
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: debug-output
+    attributes:
+      label: Relevant Debug Output
+      description: Please copy and paste any relevant log or debug output. This will be automatically formatted into code
+      placeholder: Relevant log or debug output
+      render: shell
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/documentation_report.yml b/.github/ISSUE_TEMPLATE/documentation_report.yml
new file mode 100644
index 00000000..d7dd561f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation_report.yml
@@ -0,0 +1,90 @@
+---
+
+name: Documentation Report
+description: Report a documentation issue for the Ansible ND Collection
+title: Documentation Report Title
+labels:
+  - doc
+  - documentation
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for creating a documentation issue to help us improve the Ansible ND Collection.
+        Please fill out the sections below to help us understand and reproduce the issue you are facing.
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Community Note
+        Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
+        to help the community and maintainers prioritize this request. Please do not leave "+1" or other comments that do not add relevant new information
+        or questions, they generate extra noise for issue followers and do not help prioritize the request. If you are interested in working on this issue
+        or have submitted a pull request, please leave a comment.
+
+  - type: textarea
+    id: new-or-affected-documentation
+    attributes:
+      label: New or Affected Documentation
+      description: Please list the new or affected documentation sections
+      placeholder: Documentation section or new documentation that needs attention
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: documentation-description
+    attributes:
+      label: Documentation Description
+      description: Please leave a helpful description of the documentation report here
+      placeholder: Documentation section or new documentation that needs attention
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: ansible-version
+    attributes:
+      label: Ansible Version
+      description: Please provide your Ansible version used when encountering this issue using ```ansible --version```
+      placeholder: ansible --version
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: ansible-collection-versions
+    attributes:
+      label: Ansible Collection Versions
+      description: Please provide your Ansible Collection versions used when encountering this issue using ```ansible-galaxy collection list```
+      placeholder: ansible-galaxy collection list
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: nd-version
+    attributes:
+      label: Cisco Nexus Dashboard Version
+      description: Please provide your Cisco Nexus Dashboard version used when encountering this issue
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: nxos-version
+    attributes:
+      label: Cisco NX-OS Version
+      description: Please provide your Cisco NX-OS version used when encountering this issue
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: aci-version
+    attributes:
+      label: Cisco ACI Version
+      description: Please provide your Cisco ACI version used when encountering this issue
+      render: shell
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 00000000..e2f1c8bb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,115 @@
+---
+
+name: Feature Request
+description: Request a feature for the Ansible ND Collection
+title: Feature Request Title
+labels:
+  - enhancement
+  - feature
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for creating a feature request issue to help us improve the Ansible ND Collection.
+        Please fill out the sections below to help us understand and reproduce the issue you are facing.
+
+  - type: markdown
+    attributes:
+      value: |
+        ### Community Note
+        Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
+        to help the community and maintainers prioritize this request. Please do not leave "+1" or other comments that do not add relevant new information
+        or questions, they generate extra noise for issue followers and do not help prioritize the request. If you are interested in working on this issue
+        or have submitted a pull request, please leave a comment.
+
+  - type: textarea
+    id: new-module-feature
+    attributes:
+      label: "New module/feature description:"
+      description: Please provide input on the new module or feature required
+      placeholder: New module/feature description
+      render: shell
+    validations:
+      required: true
+
+  - type: dropdown
+    id: role
+    attributes:
+      label: Which resource area of Cisco Nexus Dashboard does this new feature belong to?
+      multiple: false
+      options:
+        - analyze
+        - infra
+        - manage
+        - onemanage
+        - other
+    validations:
+      required: true
+
+  - type: textarea
+    id: new-or-affected-documentation
+    attributes:
+      label: New or Affected Documentation for New Feature
+      description: Please list the new or affected documentation sections for the new feature
+      placeholder: Documentation section or new documentation that needs attention for the new feature
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: ansible-playbook
+    attributes:
+      label: Potential Ansible Task Config
+      description: Please provide a potential Ansible task configuration for the new feature
+      placeholder: Ansible Playbook
+      render: yaml
+    validations:
+      required: true
+
+  - type: textarea
+    id: ansible-version
+    attributes:
+      label: Ansible Version
+      description: Please provide your Ansible version used if this requires some new feature from Ansible using ```ansible --version```
+      placeholder: ansible --version
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: ansible-collection-versions
+    attributes:
+      label: Ansible Collection Versions
+      description: |
+        Please provide your Ansible Collection versions if this requires some new collection or updated version from ```ansible-galaxy collection list```
+      placeholder: ansible-galaxy collection list
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: nd-version
+    attributes:
+      label: Cisco Nexus Dashboard Version
+      description: Please provide your Cisco Nexus Dashboard version being used
+      render: shell
+    validations:
+      required: true
+
+  - type: textarea
+    id: nxos-version
+    attributes:
+      label: Cisco NX-OS Version
+      description: Please provide your Cisco NX-OS version being used
+      render: shell
+    validations:
+      required: false
+
+  - type: textarea
+    id: aci-version
+    attributes:
+      label: Cisco ACI Version
+      description: Please provide your Cisco ACI version being used
+      render: shell
+    validations:
+      required: false