diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 50de765b..00000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-name: Report a bug in Ibex
-title: Report a bug in Ibex
-about: Have you found a bug in Ibex or associated tooling?
-labels: Type:Bug
----
-
-<!--
-Thank you for your interest in Ibex. We are continuously improving Ibex, and your bug report will help us with that. To help us understand and reproduce your problem as quickly as possible we have prepared a little template below.
-
-No text in blocks starting with < !-- will be shown in the final bug report.
-
-You can also copy/paste images into the bug report, and you can attach files to it by simply dragging them into the issue window.
--->
-
-## Observed Behavior
-<!--
-Please describe the problem you saw. Include waveforms (in VCD or Verilator/GtkWave FST format only please) and log files if possible.
--->
-
-## Expected Behavior
-<!-- Please describe the behavior you expected to see instead. -->
-
-## Steps to reproduce the issue
-<!--
-Please help us to reproduce the issue you're seeing by including a detailed description of what you did to get to the problem.
-
-For example:
-* What command did you run? (Also include the output of the command.)
-* What parameters/defines did you set?
-* Did you make modifications to the source code?
--->
-
-## My Environment
-
-<!--
-Let us know how you're using Ibex. This helps us to better understand your problem and find a solution more quickly.
--->
-
-**EDA tool and version:**
-<!--
-If you are using an EDA tool to work with Ibex let us know which tool and which version you're using.
-For example, "Xilinx Vivado 2020.1" or "Synopsys VCS 2020.03-SP1"
--->
-
-**Operating system:**
-<!--
-Please let us know the operating system/Linux distribution you're using.
-For example "Ubuntu Linux 18.04" or "CentOS 7.3".
--->
-
-**Version of the Ibex source code:**
-<!--
-Which version of the Ibex source code are you using?
-You can call `git rev-parse HEAD` in your Ibex source directory to get this information.
-Please also let us know if you have made changes to the code.
--->
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 00000000..47b3ddb0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,18 @@
+name: CVE2 bug
+description: Create a CVE2 bug
+title: "[BUG] <title>"
+labels: ["Type:Bug"]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing CVE2 bug for this?
+    description: Please search to see if an issue already exist for the bug you need to create
+    options:
+    - label: I have searched the existing bug issues
+      required: true
+- type: textarea
+  attributes:
+    label: Bug Description
+    description: A concise description of the bug
+  validations:
+    required: true
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 116a4731..00000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: Ask a question related to Ibex
-title: Ask a question related to Ibex
-about: Do you have a question about (the use of) Ibex?
-labels: Type:Question
----
-
-<!--
-Thank you for your interest in Ibex. To help us understand your question as quickly as possible we have prepared a little template below.
-
-No text in blocks starting with < !-- will be shown in the final bug report.
-
-You can also copy/paste images into the question, and you can attach files to it by simply dragging them into the issue window.
--->
-
-<!--
-Please ask your question after this block of text, adding as much detail as possible.
-If your question is related to a specification (e.g. the RISC-V Specification), a part of our source code, or our documentation we appreciate a link or a quote from the relevant text.
--->
-
-
-## My Environment
-
-<!--
-Let us know how you're using Ibex. This helps us to better understand your problem and find a solution more quickly.
--->
-
-**EDA tool and version:**
-<!--
-If you are using an EDA tool to work with Ibex let us know which tool and which version you're using.
-For example, "Xilinx Vivado 2020.1" or "Synopsys VCS 2020.03-SP1"
--->
-
-**Operating system:**
-<!--
-Please let us know the operating system/Linux distribution you're using.
-For example "Ubuntu Linux 18.04" or "CentOS 7.3".
--->
-
-**Version of the Ibex source code:**
-<!--
-Which version of the Ibex source code are you using?
-You can call `git rev-parse HEAD` in your Ibex source directory to get this information.
-Please also let us know if you have made changes to the code.
--->
diff --git a/.github/ISSUE_TEMPLATE/task.yaml b/.github/ISSUE_TEMPLATE/task.yaml
new file mode 100644
index 00000000..0af0786f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/task.yaml
@@ -0,0 +1,32 @@
+name: CVE2 Task
+description: Create a CVE2 Project Task
+title: "[TASK] <title>"
+labels: ["task"]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing CVE2 task for this?
+    description: Please search to see if a task issue already exists for the task you need to create
+    options:
+    - label: I have searched the existing task issues
+      required: true
+- type: textarea
+  attributes:
+    label: Task Description
+    description: A concise description of what needs to be done
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Description of Done
+    description: What are the criteria for completion of this task?
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Associated PRs
+    description: Use this area to provide a link to PRs used to complete this task.
+- type: markdown
+  attributes:
+    value: |
+      **Keep task progress up to date by adding comments to the task as it progresses.**