diff --git a/.github/ISSUE_TEMPLATE/bug-template.yaml b/.github/ISSUE_TEMPLATE/bug-template.yaml
index 7a3ebc92022..ef0aefaa6ec 100644
--- a/.github/ISSUE_TEMPLATE/bug-template.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-template.yaml
@@ -40,13 +40,13 @@ body:
     validations:
       required: true
   - type: dropdown
-    id: version
+    id: branch
     attributes:
-      label: Version
-      description: What version of Texera are you running?
+      label: Branch
+      description: Which branch did you hit this on?
       options:
-        - 1.1.0-incubating (Pre-release/Master)
-        - 1.0.0
+        - main
+        - 1.1.0-incubating
       default: 0
     validations:
       required: true
diff --git a/.github/ISSUE_TEMPLATE/feature-template.yaml b/.github/ISSUE_TEMPLATE/feature-template.yaml
index f88d85b0f67..9551b9fa89e 100644
--- a/.github/ISSUE_TEMPLATE/feature-template.yaml
+++ b/.github/ISSUE_TEMPLATE/feature-template.yaml
@@ -42,20 +42,6 @@ body:
     validations:
       required: true
 
-  - type: dropdown
-    id: impact
-    attributes:
-      label: Impact / Priority
-      description: How important is this feature?
-      options:
-        - (P0)Critical – blocks existing use cases
-        - (P1)High – significantly improves user experience
-        - (P2)Medium – useful enhancement
-        - (P3)Low – nice to have
-      default: 2
-    validations:
-      required: true
-
   - type: dropdown
     id: affected-area
     attributes:
diff --git a/.github/ISSUE_TEMPLATE/task-template.yaml b/.github/ISSUE_TEMPLATE/task-template.yaml
index 1e299fef7c6..ef3977c03cb 100644
--- a/.github/ISSUE_TEMPLATE/task-template.yaml
+++ b/.github/ISSUE_TEMPLATE/task-template.yaml
@@ -33,29 +33,18 @@ body:
     validations:
       required: true
 
-  - type: dropdown
-    id: priority
-    attributes:
-      label: Priority
-      description: How urgent or important is this task?
-      options:
-        - P0 – Critical
-        - P1 – High
-        - P2 – Medium
-        - P3 – Low
-      default: 2
-
   - type: checkboxes
     id: checklist
     attributes:
       label: Task Type
       description: Select the type of work involved.
       options:
-        - label: Code Implementation
-        - label: Documentation
         - label: Refactor / Cleanup
+        - label: DevOps / Deployment / CI
         - label: Testing / QA
-        - label: DevOps / Deployment
+        - label: Documentation
+        - label: Performance
+        - label: Other
 
   - type: markdown
     attributes: