diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 3550c51..b904ccc 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -2,9 +2,10 @@ name: 🪲 Bug Report
 description: Report a bug
 title: "bug:"
 labels: ["bug"]
+assignees: ["KeidsID"]
 body:
-  - type: dropdown
-    id: Severity
+  - id: severity
+    type: dropdown
     attributes:
       label: "Severity Level"
       options:
@@ -13,15 +14,43 @@ body:
         - "severity-3 (Trivial)"
     validations:
       required: true
-  - type: textarea
-    id: description
+  - id: used-os
+    type: dropdown
+    attributes:
+      label: Used OS (Operating System)
+      description: Which operating systems you used when the issue occurred?
+      multiple: true
+      options:
+        - Windows
+        - MacOS
+        - Android
+        - Other (mention in the description)
+    validations:
+      required: true
+  - id: used-browser
+    type: dropdown
+    attributes:
+      label: Used Browser (For Web)
+      description: If the issue occurred on a web page, which browser did you use?
+      multiple: true
+      options:
+        - "Chrome"
+        - "Safari"
+        - "Edge"
+        - "Firefox"
+        - "Opera"
+        - "Other (mention in the description)"
+    validations:
+      required: false
+  - id: description
+    type: textarea
     attributes:
       label: Description
       description: What is the issue?
     validations:
       required: true
-  - type: textarea
-    id: steps
+  - id: reproduce-steps
+    type: textarea
     attributes:
       label: Steps To Reproduce
       description: How can we reproduce the issue?
@@ -31,50 +60,22 @@ body:
         3. Look there
     validations:
       required: true
-  - type: textarea
-    id: expected
+  - id: expected-results
+    type: textarea
     attributes:
       label: Expected Results
       description: What do you expect to happen?
     validations:
       required: true
-  - type: textarea
-    id: actual
+  - id: actual-results
+    type: textarea
     attributes:
       label: Actual Results
       description: What is actually happening?
     validations:
       required: true
-  - type: textarea
-    id: screenshots
+  - id: additional-media
+    type: textarea
     attributes:
-      label: Additional Screenshots/Videos
-      description: Optional screenshots or videos that may help showcase the issue
-  - type: dropdown
-    id: OS
-    attributes:
-      label: Used OS (Operating System)
-      description: Which operating systems you used when the issue occurred?
-      multiple: true
-      options:
-        - Windows
-        - MacOS
-        - Android
-        - Other (mention in the description)
-    validations:
-      required: true
-  - type: dropdown
-    id: browser
-    attributes:
-      label: Used Browser (For Web)
-      description: If the issue occurred on a web page, which browser did you use?
-      multiple: true
-      options:
-        - "Chrome"
-        - "Safari"
-        - "Edge"
-        - "Firefox"
-        - "Opera"
-        - "Other (mention in the description)"
-    validations:
-      required: false
+      label: Additional Images/Videos
+      description: Provide screenshots or videos that may help showcase the issue
diff --git a/.github/ISSUE_TEMPLATE/feat-request.yml b/.github/ISSUE_TEMPLATE/feat-request.yml
index ee27043..3b821b5 100644
--- a/.github/ISSUE_TEMPLATE/feat-request.yml
+++ b/.github/ISSUE_TEMPLATE/feat-request.yml
@@ -1,17 +1,18 @@
 name: 💡 Feature Request
-description: Suggest a feature request
+description: Request a new feature
 title: "feat: "
 labels: ["feat"]
+assignees: ["KeidsID"]
 body:
-  - type: textarea
-    id: what-feature
+  - id: description
+    type: textarea
     attributes:
       label: What feature?
-      placeholder: Add descriptions
+      placeholder: What feature do you want to add?
     validations:
       required: true
-  - type: textarea
-    id: screenshots
+  - id: additional-media
+    type: textarea
     attributes:
-      label: Add screenshots
-      placeholder: Add screenshots, mockups, etc.
+      label: Additional Images/Videos
+      placeholder: Provide screenshots or videos that may help showcase the feature
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 53e0f67..6d3e6a1 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -204,5 +204,6 @@ jobs:
           tag_name: "${{ env.RELEASE_TAG }}+${{ env.BUILD_NUMBER }}--apk-build"
           generate_release_notes: true
           files: |
-            "build/app/outputs/flutter-apk/app-release.apk"
-            "CHANGELOG.md"
+            build/app/outputs/flutter-apk/app-release.apk
+            CHANGELOG.md
+            LICENSE