diff --git a/.github/ISSUE_TEMPLATE/BUG-FORM.yml b/.github/ISSUE_TEMPLATE/BUG-FORM.yml
new file mode 100644
index 000000000..097f8a051
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG-FORM.yml
@@ -0,0 +1,37 @@
+name: Bug report
+description: File a bug report
+labels: ['bug report']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please ensure that the bug has not already been filed in the issue tracker.
+
+        Thanks for taking the time to report this bug!
+  - type: dropdown
+    attributes:
+      label: Browser
+      description: What browser and version are you using?
+      options:
+        - Chrome
+        - Opera
+        - Safari
+        - Firefox
+        - Brave
+        - Arc
+        - Other (please describe)
+  - type: dropdown
+    attributes:
+      label: Operating System
+      description: What operating system are you on?
+      options:
+        - Windows
+        - macOS (Intel)
+        - macOS (Apple Silicon)
+        - Linux
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      description: Please include relevant screenshots if relevant.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/FEATURE-FORM.yml b/.github/ISSUE_TEMPLATE/FEATURE-FORM.yml
new file mode 100644
index 000000000..ca33ac814
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE-FORM.yml
@@ -0,0 +1,20 @@
+name: Feature request
+description: Suggest a feature
+labels: ['feature request']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please ensure that the feature has not already been requested in the issue tracker.
+
+        Thanks for helping us improve the faucet!
+  - type: textarea
+    attributes:
+      label: Describe the feature you would like
+      description: Please also describe what the feature is aiming to solve, if relevant.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: Add any other context to the feature (like screenshots, code snippets, resources)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..b8baeed1b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Github Discussions
+    url: https://github.com/celo-org/faucet/discussions
+    about: Please ask and answer questions here.