diff --git a/.github/ISSUE_TEMPLATE/sweep-bugfix.yml b/.github/ISSUE_TEMPLATE/bugfix.yml
similarity index 90%
rename from .github/ISSUE_TEMPLATE/sweep-bugfix.yml
rename to .github/ISSUE_TEMPLATE/bugfix.yml
index 16dae7ec849ee48880a715365d2f8da9ff33f6ac..bb8c310bae44b3d4fa9b1f4d7e9eecf613b47262 100644
--- a/.github/ISSUE_TEMPLATE/sweep-bugfix.yml
+++ b/.github/ISSUE_TEMPLATE/bugfix.yml
@@ -1,7 +1,6 @@
 name: Bugfix
-title: "Sweep: "
+title: ""
 description: Write something like "We notice ... behavior when ... happens instead of ...""
-labels: sweep
 body:
   - type: textarea
     id: description
diff --git a/.github/ISSUE_TEMPLATE/sweep-feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
similarity index 68%
rename from .github/ISSUE_TEMPLATE/sweep-feature.yml
rename to .github/ISSUE_TEMPLATE/feature.yml
index 2c041b3035a030673a04e2e8cf199852f73f49eb..e40729e93afb3e2c9b07a23da1f2b381fb676f2e 100644
--- a/.github/ISSUE_TEMPLATE/sweep-feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,11 +1,10 @@
 name: Feature Request
-title: "Sweep: "
-description: Write something like "Write an api endpoint that does "..." in the "..." file"
-labels: sweep
+title: ""
+description: Write something like "Write an api endpoint that does "..." in the "..." file". If you would like to use sweep.dev prefix with "Sweep:"
 body:
   - type: textarea
     id: description
     attributes:
       label: Details
-      description: More details for Sweep
+      description: More details
       placeholder: The new endpoint should use the ... class from ... file because it contains ... logic
diff --git a/.github/ISSUE_TEMPLATE/sweep-refactor.yml b/.github/ISSUE_TEMPLATE/refactor.yml
similarity index 63%
rename from .github/ISSUE_TEMPLATE/sweep-refactor.yml
rename to .github/ISSUE_TEMPLATE/refactor.yml
index 2fac8ffd314280321228651e7c830fbc3f0575d2..2eeaadaca9e6037e68d72517b2adb05ecf719533 100644
--- a/.github/ISSUE_TEMPLATE/sweep-refactor.yml
+++ b/.github/ISSUE_TEMPLATE/refactor.yml
@@ -1,11 +1,10 @@
 name: Refactor
-title: "Sweep: "
-description: Write something like "Modify the ... api endpoint to use ... version and ... framework"
-labels: sweep
+title: ""
+description: Write something like "Modify the ... api endpoint to use ... version and ... framework" If you would like to use sweep.dev prefix with "Sweep:"
 body:
   - type: textarea
     id: description
     attributes:
       label: Details
-      description: More details for Sweep
+      description: More details
       placeholder: We are migrating this function to ... version because ...