diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
index a36c126fbad..b84edaa4f03 100644
--- a/.github/ISSUE_TEMPLATE/bug.yaml
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -1,6 +1,8 @@
 # Copyright the Hyperledger Fabric contributors. All rights reserved.
 #
 # SPDX-License-Identifier: Apache-2.0
+#
+# How to modify this file: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
 
 name: Bug Report
 description: Let us know what went wrong
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
new file mode 100644
index 00000000000..92d126db0af
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -0,0 +1,42 @@
+# Copyright the Hyperledger Fabric contributors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# How to modify this file: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
+
+name: Feature Request
+description: Submit your requests and suggestions to improve!
+labels: ["enhancement"]
+body:
+  - type: textarea
+    id: status
+    attributes:
+      label: Current Status
+      description: Describe the current status.
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected
+      description: Describe what you expect.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Solution
+      description: Describe a Solution (or multiple solution paths )
+    validations:
+      required: false
+  - type: dropdown
+    id: help
+    attributes:
+      label: Please let us know if you plan to work on this.
+      multiple: true
+      options:
+        - Yes!
+        - No.
+        - Maybe.
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/workitem.yaml b/.github/ISSUE_TEMPLATE/workitem.yaml
new file mode 100644
index 00000000000..d4c5cd84d7d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/workitem.yaml
@@ -0,0 +1,31 @@
+# Copyright the Hyperledger Fabric contributors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# How to modify this file: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms
+
+name: Work Item
+description: "For Core-Contributors: File a Concrete Work-Item"
+labels: ["workitem"]
+body:
+  - type: textarea
+    id: status
+    attributes:
+      label: Current Status
+      description: Describe the current status.
+    validations:
+      required: true
+  - type: textarea
+    id: goal
+    attributes:
+      label: Goal
+      description: Describe what your goal is.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Solution
+      description: Describe your Solution (or multiple solution paths )
+    validations:
+      required: true