diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
index 041dcc81fb..495adb3056 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -3,7 +3,6 @@ name: 🐛 Bug Report
 about: If something isn't working as expected 🤔
 title: 'bug: '
 type: Bug
-projects: menloresearch/30
 ---
 
 **Version:** e.g. 0.5.x-xxx
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md
new file mode 100644
index 0000000000..3a6c97232d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.md
@@ -0,0 +1,11 @@
+---
+name: 🚀 Feature Request
+about: Suggest an idea for this project 😻!
+title: 'idea: '
+---
+
+## Problem Statement
+<!-- Describe the problem you're facing -->
+
+## Feature Idea
+<!-- Describe what you want instead. Examples are welcome! -->
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.yml b/.github/ISSUE_TEMPLATE/2-feature-request.yml
deleted file mode 100644
index 4c1f1decd2..0000000000
--- a/.github/ISSUE_TEMPLATE/2-feature-request.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: "\U0001F680 Feature Request"
-title: 'idea: '
-description: "Suggest an idea for this project \U0001F63B!"
-projects: ["menloresearch/30"]
-body:
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: "Problem Statement"
-      description: "Describe the problem you're facing"
-      placeholder: |
-        I'm always frustrated when ...
-
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: "Feature Idea"
-      description: "Describe what you want instead. Examples are welcome!"
diff --git a/.github/ISSUE_TEMPLATE/3-epic.md b/.github/ISSUE_TEMPLATE/3-epic.md
new file mode 100644
index 0000000000..afffc6b5cb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-epic.md
@@ -0,0 +1,12 @@
+---
+name: 🌟 Epic
+about: Major building block that advances Jan's goals
+title: 'epic: '
+type: Epic
+---
+
+## Goal
+
+## Tasklist
+
+## Out of scope
diff --git a/.github/ISSUE_TEMPLATE/3-epic.yml b/.github/ISSUE_TEMPLATE/3-epic.yml
deleted file mode 100644
index 9993db4f8a..0000000000
--- a/.github/ISSUE_TEMPLATE/3-epic.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: "\U0001F31F Epic"
-description: "Major building block that advances Jan's goals"
-title: 'epic: '
-type: "Epic"
-projects: ["menloresearch/30"]
-body:
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: "Goal"
-      description: "Describe the epic's objective and expected impact"
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: "Tasklist"
-      description: "List the key tasks required to complete this epic"
-  - type: textarea
-    attributes:
-      label: "Out of scope"
-      description: "List items that are explicitly excluded from this epic"
diff --git a/.github/ISSUE_TEMPLATE/4-goal.md b/.github/ISSUE_TEMPLATE/4-goal.md
new file mode 100644
index 0000000000..28b32382aa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4-goal.md
@@ -0,0 +1,13 @@
+---
+name: 🎯 Goal
+about: External communication of Jan's roadmap and objectives
+title: 'goal: '
+type: Goal
+---
+
+## Goal
+
+## Tasklist
+
+## Out of scope
+
diff --git a/.github/ISSUE_TEMPLATE/4-goal.yml b/.github/ISSUE_TEMPLATE/4-goal.yml
deleted file mode 100644
index 3ed2acf532..0000000000
--- a/.github/ISSUE_TEMPLATE/4-goal.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: "\U0001F3AF Goal"
-description: "External communication of Jan's roadmap and objectives"
-title: 'goal: '
-type: "Goal"
-projects: ["menloresearch/30"]
-assignees: freelerobot
-body:
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: "Goal"
-      description: "Describe the objective and desired outcome"
-  - type: textarea
-    validations:
-      required: true
-    attributes:
-      label: "Tasklist"
-      description: "List the specific tasks needed to achieve this goal"
-  - type: textarea
-    attributes:
-      label: "Out of scope"
-      description: "List items that are explicitly excluded from this goal"