diff --git a/.github/ISSUE_TEMPLATE/20_feature_request.md b/.github/ISSUE_TEMPLATE/20_feature_request.md
new file mode 100644
index 00000000..e8997219
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/20_feature_request.md
@@ -0,0 +1,6 @@
+---
+name: Feature request
+about: Request a new feature
+labels: feature request
+---
+
diff --git a/.github/ISSUE_TEMPLATE/20_feature_request.yml b/.github/ISSUE_TEMPLATE/20_feature_request.yml
deleted file mode 100644
index dce88261..00000000
--- a/.github/ISSUE_TEMPLATE/20_feature_request.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: Feature request
-labels: ['feature request']
-description: Request a new feature.
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: What new feature would you like to see?
-      description: Tell us about the problem you're trying to solve.
-    validations:
-      required: false
diff --git a/.github/ISSUE_TEMPLATE/30_model_request.md b/.github/ISSUE_TEMPLATE/30_model_request.md
new file mode 100644
index 00000000..c705a5f3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/30_model_request.md
@@ -0,0 +1,5 @@
+---
+name: Model request
+about: Request support for a new model to be added to Ollama
+labels: model request
+---
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/30_model_request.yml b/.github/ISSUE_TEMPLATE/30_model_request.yml
deleted file mode 100644
index 6b6835f1..00000000
--- a/.github/ISSUE_TEMPLATE/30_model_request.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: Model request
-labels: ['model request']
-description: Request a new model.
-body:
-  - type: textarea
-    id: problem
-    attributes:
-      label: What model would you like?
-      description: Please provide a link to the model.