diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
index 5b3f7c8d..c5b24f7e 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -34,6 +34,14 @@ body:
         Include full errors, stack traces, and/or relevant logs.
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Acceptance Criteria
+      description: |
+        Provide the criteria that must be met in order for this issue to be considered fixed.
+        Be specific, and consider potential edge cases.
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Possible reason(s)
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yaml b/.github/ISSUE_TEMPLATE/feature-request.yaml
index 2e1ae644..43eb54c9 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@@ -15,6 +15,14 @@ body:
         Why do you need this feature? For example: "I'm always frustrated when..."
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Acceptance Criteria
+      description: |
+        Provide the criteria that must be met in order for this issue to be considered fixed.
+        Be specific, and consider potential edge cases.
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Proposed solution