diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
new file mode 100644
index 0000000..a1fa555
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,51 @@
+name: Bug or incompatibility
+description: Report issues with plugin incompatibility or other behavior related issues.
+labels: [ "waiting" ]
+body:
+  - type: textarea
+    attributes:
+      label: intended behavior
+      description: what you expected to happen.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: what the behavior you actually saw
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: either a video, or way you want to present it.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Velocity or Bungeecord Versions
+      description: |
+        Please provide Proxy version for either Bungeecord or Velocity
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: RedisBungee Version & Redis Version
+      description: |
+        RedisBungee version is Different from Redis Version!
+        good example:
+
+        Redis Version: 7.2
+        RedisBungee Version: 0.12.0
+        
+        in-case you used development branch you can use git commit hash Instead of the version
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Other
+      description: |
+        extra information that we might need to know?
+    validations:
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 9b58896..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Bug report
-about: if you find a bug please report it here...
-title: ''
-labels: waiting
-assignees: ham1255
-
----
-
-**Describe the bug**
-
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Redis version? it should be at least 6 and above.**
-
-**Bungeecord version or (the bungee fork name eg: waterfall) and your plugins**
- 
-
-**console logs?**
-please provide any errors if there any.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index ec11765..0000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Question
-about: ask your questions here
-title: ''
-labels: question
-assignees: GovindasOM, ham1255
-
----
-
-## What is your question?
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 0000000..0c880bf
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,9 @@
+name: Ask Question
+description: Ask any questions to the developers
+labels: [ "question"]
+body:
+  - type: textarea
+    attributes:
+      label: Your question?
+    validations:
+      required: true
\ No newline at end of file