diff --git a/.github/DISCUSSION_TEMPLATE/survey.md b/.github/DISCUSSION_TEMPLATE/survey.md
deleted file mode 100644
index 9d317f44c..000000000
--- a/.github/DISCUSSION_TEMPLATE/survey.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Survey
-about: Participate in this survey to offer feedback for improvements we can make to the product.
-title: "[Survey Response]"
----
-
-<!--
-Participate in this survey to offer feedback for improvements we can make to the product. Please note that your response to the survey will be visible to the public community.
--->
-
-### Survey
-###### What stack do you primarily use?
-[] Python
-[] Node
-[] PowerShell
-[] .NET
-[] Java
-[] Go
-###### What is your current role in which you use Azure Functions?
-
-###### What are the use cases and scenarios in which you use Azure Functions today?
-
-###### What are the pain points you have experienced using Azure Functions?
-
-###### Please share any suggestions for product improvements.
-
-###### What developer tools do you use? (For example, Visual Studio Code, Command Line, etc.)
-
-###### Any other comments or feedback?
-
-###### Would you be interested in meeting with the Azure Functions team to further discuss your answers?
-[] Yes [] No
-
-
-<!-- 
-Thank you for your feedback! For any specific questions or bugs, please create an issue here: https://github.com/Azure/azure-functions-python-worker/issues
--->
diff --git a/.github/DISCUSSION_TEMPLATE/survey.yml b/.github/DISCUSSION_TEMPLATE/survey.yml
new file mode 100644
index 000000000..6d7d4d237
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/survey.yml
@@ -0,0 +1,58 @@
+- type: checkboxes
+  attributes:
+    label: Stack
+    description: What stack do you primarily use?
+    options:
+      - label: Python
+      - label: Node
+      - label: PowerShell
+      - label: .NET
+      - label: Java
+      - label: Go
+      - label: Other
+        required: true
+- type: textarea
+  attributes:
+    label: Role
+    description: What is your current role in which you use Azure Functions?
+    value: role
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: scenarios
+    description: What are the use cases and scenarios in which you use Azure Functions today?
+    value: scenarios
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: improvements
+    description: What are the pain points you have experienced using Azure Functions?
+    value: improvements
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: suggestions
+    description: Please share any suggestions for product improvements.
+    value: suggestions
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: tools
+    description: What developer tools do you use? (For example, Visual Studio Code, Command Line, etc.)
+    value: tools
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: contact
+    description: Please provide any other comments or feedback here, as well as your email if you indicated 'Yes' to being contacted from the Azure Functions team.
+    value: contact
+  validations:
+    required: true
+- type: markdown
+  attributes:
+    value: "Thank you for your feedback! For any specific questions or bugs, please create an issue here: https://github.com/Azure/azure-functions-python-worker/issues"
\ No newline at end of file