diff --git a/.github/ISSUE_TEMPLATE/bug-issue-template.md b/.github/ISSUE_TEMPLATE/bug-issue-template.md
deleted file mode 100644
index 8cbaa28d..00000000
--- a/.github/ISSUE_TEMPLATE/bug-issue-template.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Bug issue template
-about: Vanced Manager Bug template
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Please only open the issue if the following is true**
-- This is an issue in the Vanced Manager and ONLY Vanced Manager (NOT Youtube Vanced/Music/microG)
-
-**Phone Specifications:**
-- Brand:
-- Operating System:
-- Android Version:
-- Vanced Manager Version:
-
-**Please describe the problem you are having in as much detail as possible:**
-
-
-**Steps to reproduce:**
-
-
-**Further details:**
diff --git a/.github/ISSUE_TEMPLATE/bug-issue-template.yml b/.github/ISSUE_TEMPLATE/bug-issue-template.yml
new file mode 100644
index 00000000..945363be
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-issue-template.yml
@@ -0,0 +1,39 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+assignees:
+  - X1nto
+body:
+  - type: textarea
+    id: device-info
+    attributes:
+      label: Device
+      description: What device are you using?
+      value: |
+        Device:
+        Operating System:
+        Android Version:
+    validations:
+      required: true
+  - type: textarea
+    id: manager-version
+    attributes:
+      label: Version
+      description: What version of Vanced Manager are you using?
+    validations:
+      required: true
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug Description
+      description: Describe the bug and how to reproduce it in as much detail as possible.
+    validations:
+      required: true
+  - type: checkboxes
+    id: is-manager-bug
+    attributes:
+      label: Additional checks
+      options:
+      - label: This is a bug in Vanced Manager and NOT YouTube Vanced/YouTube Vanced Music/Vanced microG.
+        required: true
diff --git a/.github/ISSUE_TEMPLATE/feature-issue-template.yml b/.github/ISSUE_TEMPLATE/feature-issue-template.yml
new file mode 100644
index 00000000..d65bf537
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-issue-template.yml
@@ -0,0 +1,27 @@
+name: Feature Request
+description: Request a feature
+title: "[Feature]: "
+labels: ["enhancement"]
+assignees:
+  - X1nto
+body:
+  - type: textarea
+    id: suggestion
+    attributes:
+      label: Suggestion
+    validations:
+      required: true
+  - type: textarea
+    id: suggestion-relevancy
+    attributes:
+      label: Additional Information
+      description: Why is this suggestion relevant?
+    validations:
+      required: true
+  - type: checkboxes
+    id: is-manager-suggestion
+    attributes:
+      label: Additional checks
+      options:
+      - label: This is a suggestion for Vanced Manager and NOT YouTube Vanced/YouTube Vanced Music/Vanced microG.
+        required: true
diff --git a/.github/ISSUE_TEMPLATE/feature-request-template.md b/.github/ISSUE_TEMPLATE/feature-request-template.md
deleted file mode 100644
index b10370e4..00000000
--- a/.github/ISSUE_TEMPLATE/feature-request-template.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Feature Request Template
-about: Vanced Manager Feature Request Template
-title: ''
-labels: 'enhancement'
-assignees: ''
-
----
-
-**Please only open the issue if the following is true**
-- This is an issue in the Vanced Manager and ONLY Vanced Manager (NOT Youtube Vanced/Music/microG)
-
-**Suggestion:**
-
-**Why is this suggestion relevant?**
-
-**Further details:**
diff --git a/.gitignore b/.gitignore
index de34bcab..1bb604e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,5 @@ app/src/main/java/com/vanced/manager/core/base/DummyJava.java
 app/build/
 app/release
 local.properties
-/.github/
 *.iml
 .vscode/