diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index aaa2b395e2..1f2b5bbac4 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -33,8 +33,8 @@ body:
       label: Component(s)
       multiple: true
       options:
-        - Release
-        - Continuous Integration
+        - Core
+        - Build
         - Arrow
         - Avro
         - Pig
@@ -43,6 +43,5 @@ body:
         - Thrift
         - CLI
         - Benchmarking
-        - Other
     validations:
-      required: true
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
index 6a83ecaabe..6c0388af19 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -36,8 +36,8 @@ body:
       label: Component(s)
       multiple: true
       options:
-        - Release
-        - Continuous Integration
+        - Core
+        - Build
         - Arrow
         - Avro
         - Pig
@@ -46,6 +46,5 @@ body:
         - Thrift
         - CLI
         - Benchmarking
-        - Other
     validations:
-      required: true
\ No newline at end of file
+      required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/usage_question.yaml b/.github/ISSUE_TEMPLATE/usage_question.yaml
index ba8638ebd5..b7ddbf1451 100644
--- a/.github/ISSUE_TEMPLATE/usage_question.yaml
+++ b/.github/ISSUE_TEMPLATE/usage_question.yaml
@@ -56,8 +56,8 @@ body:
       label: Component(s)
       multiple: true
       options:
-        - Release
-        - Continuous Integration
+        - Core
+        - Build
         - Arrow
         - Avro
         - Pig
@@ -66,6 +66,5 @@ body:
         - Thrift
         - CLI
         - Benchmarking
-        - Other
     validations:
-      required: true
\ No newline at end of file
+      required: false
\ No newline at end of file