diff --git a/.github/workflows/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/1-bug.yml
similarity index 95%
rename from .github/workflows/ISSUE_TEMPLATE/bug_report.yaml
rename to .github/ISSUE_TEMPLATE/1-bug.yml
index 30fbbe443..ea401adbf 100644
--- a/.github/workflows/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/1-bug.yml
@@ -31,8 +31,8 @@ body:
         2. Scenic Version: Scenic 3.0.0b2
         3. Operating System / Platform: Apple M2 Pro macOS Sonoma 14.2.1
         4. Simulator Version: CARLA 0.9.14
-      validations:
-        required: true
+    validations:
+      required: true
 
   - type: textarea
     attributes:
@@ -46,8 +46,8 @@ body:
         ```
         # error full stack trace
         ```
-      validations:
-        required: true
+    validations:
+      required: true
 
   - type: textarea
     attributes:
@@ -62,8 +62,8 @@ body:
         ```
         # sample code to reproduce the bug
         ```
-      validations:
-        required: true
+    validations:
+      required: true
 
   - type: checkboxes
     attributes:
diff --git a/.github/workflows/ISSUE_TEMPLATE/documentation.yaml b/.github/ISSUE_TEMPLATE/2-docs.yml
similarity index 100%
rename from .github/workflows/ISSUE_TEMPLATE/documentation.yaml
rename to .github/ISSUE_TEMPLATE/2-docs.yml
diff --git a/.github/workflows/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/3-feature.yml
similarity index 96%
rename from .github/workflows/ISSUE_TEMPLATE/feature_request.yaml
rename to .github/ISSUE_TEMPLATE/3-feature.yml
index 795229d10..301315521 100644
--- a/.github/workflows/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/3-feature.yml
@@ -15,8 +15,8 @@ body:
       label: Describe the feature and motivation
       description: |
         Please provide a clear and concise proposal of the feature and outline the motivation.
-      validations:
-        required: true
+    validations:
+      required: true
 
   - type: textarea
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yaml b/.github/ISSUE_TEMPLATE/config.yaml
new file mode 100644
index 000000000..10c272d82
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yaml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Questions
+    url: https://forms.gle/uUhQNuPzQrvvBFJX9
+    about: Send your questions via this Google Form
\ No newline at end of file
diff --git a/.github/workflows/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from .github/workflows/PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.github/workflows/ISSUE_TEMPLATE/config.yaml b/.github/workflows/ISSUE_TEMPLATE/config.yaml
deleted file mode 100644
index cc0068897..000000000
--- a/.github/workflows/ISSUE_TEMPLATE/config.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-blank_issues_enabled: true
-contact_links:
-  - name: Questions
-    url: mailto:evin@ucsc.edu
-    about: Send your questions via email
\ No newline at end of file