diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 0000000000..d2053744c7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,72 @@
+name: Bug Report
+description: Create a report to help us to improve the Nuclei.
+title: "[BUG] ..."
+labels: ["Type: Bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+        For support requests, FAQs or "How to" questions, please use the [GitHub Discussions](https://github.com/projectdiscovery/nuclei/discussions) section instead or join our [Discord server](https://discord.gg/projectdiscovery) to discuss the idea on the **#nuclei** channel.
+
+        :warning: **Issues missing important information may be closed without further investigation.**
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+      - label: I have searched the existing issues.
+        required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: A concise description of what you're experiencing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: A concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: |
+        Steps to reproduce the behavior, for example, commands to run Nuclei.
+
+        :warning: **Please redact any literal target hosts/URLs or other sensitive information.**
+      placeholder: |
+        1. Run `nuclei -t ...`
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        Examples:
+          - **OS**: Ubuntu 20.04
+          - **Nuclei** (`nuclei -version`): v3.3.1
+          - **Go** (`go version`): go1.22.0 _(only if you've installed it via the `go install` command)_
+      value: |
+          - OS: 
+          - Nuclei: 
+          - Go: 
+      render: markdown
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Templates? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 0000000000..ccc1b86298
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,37 @@
+name: Feature Request
+description: Request feature to implement in the Nuclei.
+title: "[FEATURE] ..."
+labels: ["Type: Enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request!
+
+        Please make sure to provide a detailed description with all the relevant information that might be required to start working on this feature. In case you are not sure about your request or whether the particular feature is already supported or not, please [start a discussion](https://github.com/projectdiscovery/nuclei/discussions/categories/ideas) instead.
+
+        Join our [Discord server](https://discord.gg/projectdiscovery) to discuss the idea on the **#nuclei** channel.
+  - type: textarea
+    attributes:
+      label: Describe your feature request
+      description: A clear and concise description of feature to implement.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the use case of the feature
+      description: A clear and concise description of the feature request's motivation and the use-cases in which it could be useful.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context about the feature request 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 8b41d50c2a..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: Feature request
-about: Request feature to implement in this project
-title: ""
-labels: 'Type: Enhancement'
-assignees: ''
-
----
-
-<!--
-1. Please make sure to provide a detailed description with all the relevant information that might be required to start working on this feature.
-2. In case you are not sure about your request or whether the particular feature is already supported or not, please start a discussion instead.
-3. GitHub Discussion: https://github.com/projectdiscovery/nuclei/discussions/categories/ideas
-4. Join our discord server at https://discord.gg/projectdiscovery to discuss the idea on the #nuclei channel.
--->
-
-### Please describe your feature request:
-<!-- A clear and concise description of feature to implement -->
-
-### Describe the use case of this feature:
-<!-- A clear and concise description of the feature request's motivation and the use-cases in which it could be useful. -->
diff --git a/.github/ISSUE_TEMPLATE/issue-report.md b/.github/ISSUE_TEMPLATE/issue-report.md
deleted file mode 100644
index 3aa563b195..0000000000
--- a/.github/ISSUE_TEMPLATE/issue-report.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-name: Issue report
-about: Create a report to help us to improve the project
-labels: 'Type: Bug'
-
----
-
-<!-- 
-1. Please search to see if an issue already exists for the bug you encountered.
-2. For support requests, FAQs or "How to" questions, please use the GitHub Discussions section instead - https://github.com/projectdiscovery/nuclei/discussions or
-3. Join our discord server at https://discord.gg/projectdiscovery and post the question on the #nuclei channel.
--->
-
-<!-- ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION. -->
-
-### Nuclei version:
-<!-- You can find current version of nuclei with "nuclei -version" -->
-<!-- We only accept issues that are reproducible on the latest version of nuclei. -->
-<!-- You can find the latest version of project at https://github.com/projectdiscovery/nuclei/releases/ -->
-
-## Nuclei command:
-
-<!-- Provide the exact command you used to run Nuclei. -->
-<!-- Please redact any literal target hosts/URLs or other sensitive information. -->
-
-### Current Behavior:
-<!-- A concise description of what you're experiencing. -->
-
-### Expected Behavior:
-<!-- A concise description of what you expected to happen. -->
-
-### Steps To Reproduce:
-<!--
-Example: steps to reproduce the behavior:
-1. Run 'nuclei -t ... -u ..'
-2. See error...
--->
-
-
-### Anything else:
-<!-- Links? References? Screenshots? Anything that will give us more context about the issue that you are encountering! -->