diff --git a/issue_template/feature.yaml b/issue_template/feature.yaml
index 7ebed1b06f..455125ea7c 100644
--- a/issue_template/feature.yaml
+++ b/issue_template/feature.yaml
@@ -40,26 +40,6 @@ body:
       placeholder: stop.voring.me
     validations:
       required: false
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: What browser are you using?
-      multiple: false
-      options:
-        - Firefox
-        - Chrome
-        - Brave
-        - Librewolf
-        - Chromium
-        - Safari
-        - Microsoft Edge
-        - Other (Please Specify)
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant log output
-      description: Please copy and paste any relevant log output. You can find your log by inspecting the page, and going to the "console" tab. This will be automatically formatted into code, so no need for backticks.
-      render: shell
   - type: checkboxes
     id: terms
     attributes:
diff --git a/pull_request_template.yml b/pull_request_template.yml
index 41d04f59fe..85160164e0 100644
--- a/pull_request_template.yml
+++ b/pull_request_template.yml
@@ -26,3 +26,5 @@ body:
           required: true
         - label: I have made sure to run `pnpm run format` before submitting this pull request
           required: true
+        - label: I used [conventional commits](https://marketplace.visualstudio.com/items?itemName=vivaxy.vscode-conventional-commits) when making commits
+          required: false