diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 000000000..8a7bbe1f7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,32 @@
+name: 🚀 Feature request
+description: File a feature request for the Power Apps Test Engine
+title: "[Feature]: FEATURE TITLE"
+labels: ["enhancement"]
+body:
+- type: textarea
+  attributes:
+    label: Is your feature request related to a problem? Please describe.
+    description: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like
+    description: A clear and concise description of what you want to happen. Please provide as much related information as possible including screenshots, documents, links etc.
+  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 or screenshots about the feature request here.
+      
+      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/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 000000000..4f247188e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,37 @@
+name: ❓Question
+description: Ask a question about the Power Apps Test Engine
+title: "[QUESTION] Your question title"
+labels: ["question"]
+body:
+- type: checkboxes
+  attributes:
+    label: Does this question already exist in our backlog?
+    description: Have you validated that your question is not already in the [backlog](https://github.com/microsoft/PowerApps-TestEngine/issues) or has already been answered in our [wiki](https://github.com/microsoft/coe-starter-kit/wiki/Issue-triage-(CoE-Starter-Kit))?
+    options:
+      - label: I have checked and confirm this is a new question.
+        required: true
+- type: textarea
+  attributes:
+    label: What is your question?
+    description: A concise description of what you need to know. Please provide as much related information as possible including screenshots, documents, links etc.
+  validations:
+    required: true
+- type: dropdown
+  id: component
+  attributes:
+    label: What component are you experiencing the issue with?
+    options:
+      - Authentication
+      - Providers
+      - Playwright
+      - PowerFX
+      - Other
+  validations:
+    required: false
+- type: input
+  id: version
+  attributes:
+    label: What pac version are you using?
+    placeholder: "pac version number"
+  validations:
+    required: false
\ No newline at end of file