diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
deleted file mode 100644
index d72df5e9..00000000
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Bug Report
-about: Report a bug encountered with the Serverless Workflow Specification
-labels: kind/bug
-
----
-
-<!-- 
-Sometimes can be hard to describe a "bug" in a specification. So, before opening
-a Bug Report, please consider opening a discussion using the "Discussions" tab.
-The community will be more than happy to clarify a concern you might have.
-
-If you see a typo, spelling error, or formatting issue in our docs, please open
-a PR.
--->
-
-**What seems off**:
-
-**What you expected to be**:
-
-**Anything else we need to know?**:
-
-**Environment**:
-
-- Specification version used:
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 00000000..c337ce96
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,76 @@
+name: Bug Report
+description: Create a bug report
+labels: ["type: bug"]
+body:
+
+- type: markdown
+  attributes:
+    value: |
+       :pray: Thanks for taking the time to fill out this bug report!
+
+- type: markdown
+  attributes:
+    value: |
+       ## Bug Report
+
+- type: textarea
+  id: i-tried-this
+  attributes:
+    label: "I tried this:"
+    placeholder: "What did you try to do? A code snippet or example helps."
+  validations:
+    required: true
+
+- type: textarea
+  id: instead-what-happened
+  attributes:
+    label: "This happened:"
+    placeholder: "What happened instead of what you've expected?"
+  validations:
+    required: true
+
+- type: textarea
+  id: what-did-you-expect
+  attributes:
+    label: "I expected this:"
+    placeholder: "What did you expect to happen? Describe the output or behavior you expected to see (unless it's obvious)."
+
+- type: textarea
+  id: workaround
+  attributes:
+    label: "Is there a workaround?"
+    placeholder: "What's the workaround to avoid this issue?"
+
+- type: textarea
+  attributes:
+    label: Anything else?
+    placeholder: |
+      Links? References? Logs? Anything that will give us more context about the issue you are encountering.
+      Tip: You can attach images or log files by dragging files in.
+
+- type: markdown
+  attributes:
+    value: |
+       ## Environment
+
+- type: dropdown
+  id: areas
+  attributes:
+    label: "Area(s)"
+    multiple: true
+    options:
+      - Documentation
+      - Schema
+      - CTK
+      - Examples
+      - Use Cases
+      - Community
+      - Other
+
+- type: textarea
+  attributes:
+    label: Community Notes
+    value: |
+      <!-- Please keep this note for the community -->
+      * Please vote by adding a 👍 reaction to the issue to help us prioritize.
+      * If you are interested to work on this issue, please leave a comment.name: Bug Report 🐞
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..8e9f9162
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,2 @@
+blank_issues_enabled: false
+contact_links: []
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
deleted file mode 100644
index 068e9ca2..00000000
--- a/.github/ISSUE_TEMPLATE/enhancement.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Enhancement Request
-about: Suggest an enhancement to the Serverless Workflow Specification
-labels: kind/feature
-
----
-
-<!-- 
-Enhancements in a specification are not always easy to describe at first glance,
-requiring some discussions with other groups before reaching a conclusion.
-
-Because of this, we kindly ask you to consider opening a discussion using the
-"Discussions" tab. The community will be more than happy to discuss your
-enhancement proposal there.
-
-If you see a typo, spelling error, or formatting issue in our docs, please open
-a PR.
--->
-
-**What would you like to be added**:
-
-**Why is this needed**:
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 00000000..9809b25b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,48 @@
+name: Feature Request
+description: Create a feature request
+labels: ["type: feature"]
+body:
+
+- type: markdown
+  attributes:
+    value: |
+       :pray: Thanks for taking the time to fill out this feature request!
+
+- type: markdown
+  attributes:
+    value: |
+       ## Feature Request
+
+- type: textarea
+  id: what-would-you-like-to-be-added
+  attributes:
+    label: "What would you like to be added?"
+    placeholder: "Description of the feature you'd like to see."
+  validations:
+    required: true
+
+- type: textarea
+  id: proposals
+  attributes:
+    label: "Proposal(s):"
+    placeholder: "Describe your proposal(s) and any relevant details here."
+
+- type: textarea
+  id: alternatives
+  attributes:
+    label: "Alternative(s):"
+    placeholder: "Describe any alternative approaches, options, or suggestions you’d like to consider."
+
+- type: textarea
+  id: additional-info
+  attributes:
+    label: "Additional info:"
+    placeholder: "Provide any supplementary details, context, or supporting information here."
+
+- type: textarea
+  attributes:
+    label: Community Notes
+    value: |
+      <!-- Please keep this note for the community -->
+      * Please vote by adding a 👍 reaction to the feature to help us prioritize.
+      * If you are interested to work on this feature, please leave a comment.
diff --git a/.github/ISSUE_TEMPLATE/new-extension.md b/.github/ISSUE_TEMPLATE/new-extension.md
deleted file mode 100644
index 4bea770e..00000000
--- a/.github/ISSUE_TEMPLATE/new-extension.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: New Extension Request
-about: Suggest a new extension to the Serverless Workflow Specification
-labels: kind/feature
-
----
-
-<!--
-We are more than thrilled to accept a new extension! 
-
-But before that, have you considered starting a discussion with other
-contributors using the "Discussions" tab?
--->
-
-**Describe the extension you would like to be added**:
-
-**What is the main purpose of the extension**: