diff --git a/.github/ISSUE_TEMPLATE/ACCESSIBILITY.yaml b/.github/ISSUE_TEMPLATE/ACCESSIBILITY.yaml
index 3f9cd98928..f9c47528f0 100644
--- a/.github/ISSUE_TEMPLATE/ACCESSIBILITY.yaml
+++ b/.github/ISSUE_TEMPLATE/ACCESSIBILITY.yaml
@@ -10,16 +10,8 @@ body:
   - type: input
     id: name
     attributes:
-      label: Name
-      description: What's your name?
-    validations:
-      required: true
-  - type: checkboxes
-    id: ibm
-    attributes:
-      label: Are you an IBM employee?
-      options:
-        - label: 'Yes'
+      label: Application/Team
+      description: If you are from IBM, which application/team are you from?
     validations:
       required: true
   - type: dropdown
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
index 28c7b59368..34b56ac77b 100644
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yaml
@@ -10,16 +10,8 @@ body:
   - type: input
     id: name
     attributes:
-      label: Name
-      description: What's your name?
-    validations:
-      required: true
-  - type: checkboxes
-    id: ibm
-    attributes:
-      label: Are you an IBM employee?
-      options:
-        - label: 'Yes'
+      label: Application/Team
+      description: If you are from IBM, which application/team are you from?
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yaml b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yaml
index 504634a758..7dbb03affa 100644
--- a/.github/ISSUE_TEMPLATE/ENHANCEMENT.yaml
+++ b/.github/ISSUE_TEMPLATE/ENHANCEMENT.yaml
@@ -10,16 +10,8 @@ body:
   - type: input
     id: name
     attributes:
-      label: Name
-      description: What's your name?
-    validations:
-      required: true
-  - type: checkboxes
-    id: ibm
-    attributes:
-      label: Are you an IBM employee?
-      options:
-        - label: 'Yes'
+      label: Application/Team
+      description: If you are from IBM, which application/team are you from?
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/QUESTION.yaml b/.github/ISSUE_TEMPLATE/QUESTION.yaml
index e05c60953c..c5f1a98697 100644
--- a/.github/ISSUE_TEMPLATE/QUESTION.yaml
+++ b/.github/ISSUE_TEMPLATE/QUESTION.yaml
@@ -19,16 +19,8 @@ body:
   - type: input
     id: name
     attributes:
-      label: Name
-      description: What's your name?
-    validations:
-      required: true
-  - type: checkboxes
-    id: ibm
-    attributes:
-      label: Are you an IBM employee?
-      options:
-        - label: 'Yes'
+      label: Application/Team
+      description: If you are from IBM, which application/team are you from?
     validations:
       required: true
   - type: textarea