diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue
index c8abf8ee4aae44bfafad04d3d0f5daf106690532..d264cb3907d5e1b01ab82ef8a4aa92085479aa8e 100644
--- a/app/assets/javascripts/boards/components/board_form.vue
+++ b/app/assets/javascripts/boards/components/board_form.vue
@@ -21,6 +21,7 @@ const boardDefaults = {
   iteration: {},
   assignee: {},
   weight: null,
+  workItemTypes: [],
   hideBacklogList: false,
   hideClosedList: false,
 };
@@ -273,12 +274,12 @@ export default {
           } else {
             this.$emit('addBoard', board);
           }
+          this.isDisabled = true;
           this.close();
         } catch (error) {
           setError({ error, message: this.$options.i18n.saveErrorMessage });
         } finally {
           this.isLoading = false;
-          this.isDisabled = true;
         }
       }
     },
@@ -325,6 +326,9 @@ export default {
         weight,
       };
     },
+    setWorkItemTypes(types) {
+      this.board.workItemTypes = types.map((type) => type.id);
+    },
   },
   formType,
 };
@@ -396,6 +400,7 @@ export default {
         @set-assignee="setAssignee"
         @set-milestone="setMilestone"
         @set-weight="setWeight"
+        @set-work-item-types="setWorkItemTypes"
       />
     </gl-form>
     <template v-if="canDelete" #modal-footer>
diff --git a/app/graphql/types/boards/board_issue_input_base_type.rb b/app/graphql/types/boards/board_issue_input_base_type.rb
index 3f0e38ade41586f3c97d047960f1ea3dba83e92a..6c42d61f6398a9e7c0aa6e980540bfe07b0e2a4c 100644
--- a/app/graphql/types/boards/board_issue_input_base_type.rb
+++ b/app/graphql/types/boards/board_issue_input_base_type.rb
@@ -25,6 +25,10 @@ class BoardIssueInputBaseType < BoardIssuableInputBaseType
         description: 'Filter by the given issue types.',
         required: false
 
+      argument :work_item_types, [GraphQL::Types::String],
+        required: false,
+        description: 'Filter by work item types.'
+
       argument :milestone_wildcard_id, ::Types::MilestoneWildcardIdEnum,
         required: false,
         description: 'Filter by milestone ID wildcard.'
diff --git a/db/migrate/20251212041921_add_work_item_types_to_boards.rb b/db/migrate/20251212041921_add_work_item_types_to_boards.rb
new file mode 100644
index 0000000000000000000000000000000000000000..cf183bd77a98c85e8873f7831cfc5441b091c12c
--- /dev/null
+++ b/db/migrate/20251212041921_add_work_item_types_to_boards.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddWorkItemTypesToBoards < Gitlab::Database::Migration[2.3]
+  milestone '18.8'
+
+  def change
+    add_column :boards, :work_item_types, :text, array: true, default: [], null: false
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 2188d6e075cd59ee6dc3c7eb25bedadf5050a377..ec4c123e0437c064ce68c75f0c707d483bb3c5b4 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -13734,6 +13734,7 @@ CREATE TABLE boards (
     hide_closed_list boolean DEFAULT false NOT NULL,
     iteration_id bigint,
     iteration_cadence_id bigint,
+    work_item_types text[] DEFAULT '{}'::text[] NOT NULL,
     CONSTRAINT check_a60857cc50 CHECK ((num_nonnulls(group_id, project_id) = 1))
 );
 
diff --git a/doc/api/graphql/reference/_index.md b/doc/api/graphql/reference/_index.md
index 26ed284ec1e8a16e75b77f6923e94d81a63ab451..2d3e4a0e20f62ed0967bf8b5502e47a097661efa 100644
--- a/doc/api/graphql/reference/_index.md
+++ b/doc/api/graphql/reference/_index.md
@@ -5030,6 +5030,7 @@ Input type: `CreateBoardInput`
 | <a id="mutationcreateboardname"></a>`name` | [`String`](#string) | Board name. |
 | <a id="mutationcreateboardprojectpath"></a>`projectPath` | [`ID`](#id) | Full path of the project with which the resource is associated. |
 | <a id="mutationcreateboardweight"></a>`weight` | [`Int`](#int) | Weight value to be assigned to the board. |
+| <a id="mutationcreateboardworkitemtypes"></a>`workItemTypes` | [`[String!]`](#string) | Work item types to filter by on the board. |
 
 #### Fields
 
@@ -6968,6 +6969,7 @@ Input type: `EpicBoardCreateInput`
 | <a id="mutationepicboardcreatelabelids"></a>`labelIds` | [`[LabelID!]`](#labelid) | IDs of labels to be added to the board. |
 | <a id="mutationepicboardcreatelabels"></a>`labels` | [`[String!]`](#string) | Labels of the issue. |
 | <a id="mutationepicboardcreatename"></a>`name` | [`String`](#string) | Board name. |
+| <a id="mutationepicboardcreateworkitemtypes"></a>`workItemTypes` | [`[String!]`](#string) | Work item types to filter by on the board. |
 
 #### Fields
 
@@ -7050,6 +7052,7 @@ Input type: `EpicBoardUpdateInput`
 | <a id="mutationepicboardupdatelabelids"></a>`labelIds` | [`[LabelID!]`](#labelid) | IDs of labels to be added to the board. |
 | <a id="mutationepicboardupdatelabels"></a>`labels` | [`[String!]`](#string) | Labels of the issue. |
 | <a id="mutationepicboardupdatename"></a>`name` | [`String`](#string) | Board name. |
+| <a id="mutationepicboardupdateworkitemtypes"></a>`workItemTypes` | [`[String!]`](#string) | Work item types to filter by on the board. |
 
 #### Fields
 
@@ -13321,6 +13324,7 @@ Input type: `UpdateBoardInput`
 | <a id="mutationupdateboardmilestoneid"></a>`milestoneId` | [`MilestoneID`](#milestoneid) | ID of milestone to be assigned to the board. |
 | <a id="mutationupdateboardname"></a>`name` | [`String`](#string) | Board name. |
 | <a id="mutationupdateboardweight"></a>`weight` | [`Int`](#int) | Weight value to be assigned to the board. |
+| <a id="mutationupdateboardworkitemtypes"></a>`workItemTypes` | [`[String!]`](#string) | Work item types to filter by on the board. |
 
 #### Fields
 
@@ -27024,6 +27028,7 @@ Represents a project or group issue board.
 | <a id="boardwebpath"></a>`webPath` | [`String!`](#string) | Web path of the board. |
 | <a id="boardweburl"></a>`webUrl` | [`String!`](#string) | Web URL of the board. |
 | <a id="boardweight"></a>`weight` | [`Int`](#int) | Weight of the board. |
+| <a id="boardworkitemtypes"></a>`workItemTypes` | [`[String!]`](#string) | Work item types to filter by on the board. |
 
 #### Fields with arguments
 
@@ -58523,6 +58528,7 @@ Input type for filtering projects by security attributes.
 | <a id="boardissueinputtypes"></a>`types` | [`[IssueType!]`](#issuetype) | Filter by the given issue types. |
 | <a id="boardissueinputweight"></a>`weight` | [`String`](#string) | Filter by weight. |
 | <a id="boardissueinputweightwildcardid"></a>`weightWildcardId` | [`WeightWildcardId`](#weightwildcardid) | Filter by weight ID wildcard. Incompatible with weight. |
+| <a id="boardissueinputworkitemtypes"></a>`workItemTypes` | [`[String!]`](#string) | Filter by work item types. |
 
 ### `BranchProtectionInput`
 
@@ -58975,6 +58981,7 @@ Defines which user roles, users, or groups can merge into a protected branch.
 | <a id="negatedboardissueinputreleasetag"></a>`releaseTag` | [`String`](#string) | Filter by release tag. |
 | <a id="negatedboardissueinputtypes"></a>`types` | [`[IssueType!]`](#issuetype) | Filter by the given issue types. |
 | <a id="negatedboardissueinputweight"></a>`weight` | [`String`](#string) | Filter by weight. |
+| <a id="negatedboardissueinputworkitemtypes"></a>`workItemTypes` | [`[String!]`](#string) | Filter by work item types. |
 
 ### `NegatedComplianceFrameworkFilters`
 
diff --git a/ee/app/assets/javascripts/boards/boards_util.js b/ee/app/assets/javascripts/boards/boards_util.js
index ea4de8f4038a9059a949d1c5683e41dc7774a817..d749c0e14a3a464f981071ac15d2a6c02a34cd77 100644
--- a/ee/app/assets/javascripts/boards/boards_util.js
+++ b/ee/app/assets/javascripts/boards/boards_util.js
@@ -213,6 +213,15 @@ export function transformBoardConfig(boardConfig) {
   let updatedFilterPath = objectToQuery(updatedBoardConfig);
   const filterPath = updatedFilterPath ? updatedFilterPath.split('&') : [];
 
+  boardConfig.workItemTypes?.forEach((type) => {
+    // eslint-disable-next-line @gitlab/require-i18n-strings
+    const param = `types=${type}`;
+
+    if (!passedFilterParams.types?.includes(type)) {
+      filterPath.push(param);
+    }
+  });
+
   boardConfig.labels?.forEach((label) => {
     const labelTitle = encodeURIComponent(label.title);
     const param = `label_name[]=${labelTitle}`;
@@ -276,6 +285,10 @@ export const FiltersInfo = {
     transform: (v) =>
       v === HealthStatusFilterType.any || v === HealthStatusFilterType.none ? v.toUpperCase() : v,
   },
+  types: {
+    negatedSupport: false,
+    transform: (val) => val.toUpperCase(),
+  },
 };
 
 export function getBoardQuery(boardType, isEpicBoard) {
diff --git a/ee/app/assets/javascripts/boards/components/board_filtered_search.vue b/ee/app/assets/javascripts/boards/components/board_filtered_search.vue
index 1946e3535060ae7b138350ecbfb2b4746670827f..555d95cc3afc6cd641312d64d5b1b29b6eb4f7a0 100644
--- a/ee/app/assets/javascripts/boards/components/board_filtered_search.vue
+++ b/ee/app/assets/javascripts/boards/components/board_filtered_search.vue
@@ -38,6 +38,7 @@ export default {
         labels: board.labels || [],
         labelIds: board.labels?.map((label) => label.id) || [],
         weight: board.weight,
+        workItemTypes: board.workItemTypes || [],
       };
     },
   },
diff --git a/ee/app/assets/javascripts/boards/components/board_form.vue b/ee/app/assets/javascripts/boards/components/board_form.vue
index 1a5fcbdd872d7fa5d3bae1241959eb715c1f0717..e02aff0930a7c7286950ea4bbd627f108a510d71 100644
--- a/ee/app/assets/javascripts/boards/components/board_form.vue
+++ b/ee/app/assets/javascripts/boards/components/board_form.vue
@@ -32,6 +32,7 @@ export default {
     boardScopeMutationVariables() {
       return {
         labelIds: this.board.labels.map(fullLabelId),
+        workItemTypes: this.board.workItemTypes || [],
         ...(this.isIssueBoard && this.issueBoardScopeMutationVariables),
       };
     },
diff --git a/ee/app/assets/javascripts/boards/components/board_scope.vue b/ee/app/assets/javascripts/boards/components/board_scope.vue
index bc240e1bab4c8abd052f322f81d72da4a4687ce7..d8966c12a732e4eefe44228e82dcfac24c980483 100644
--- a/ee/app/assets/javascripts/boards/components/board_scope.vue
+++ b/ee/app/assets/javascripts/boards/components/board_scope.vue
@@ -6,6 +6,7 @@ import BoardLabelsSelect from './labels_select.vue';
 import BoardIterationSelect from './iteration_select.vue';
 import BoardMilestoneSelect from './milestone_select.vue';
 import BoardWeightSelect from './weight_select.vue';
+import WorkItemTypeSelect from './work_item_type_select.vue';
 
 export default {
   components: {
@@ -15,6 +16,7 @@ export default {
     BoardIterationSelect,
     BoardMilestoneSelect,
     BoardWeightSelect,
+    WorkItemTypeSelect,
   },
   inject: ['isIssueBoard'],
   props: {
@@ -79,6 +81,13 @@ export default {
       {{ scopeText }}
     </p>
     <div v-if="!collapseScope || expanded">
+      <work-item-type-select
+        v-if="isIssueBoard"
+        :board="board"
+        :can-edit="canAdminBoard"
+        @set-work-item-types="$emit('set-work-item-types', $event)"
+      />
+
       <board-milestone-select
         v-if="isIssueBoard"
         :board="board"
diff --git a/ee/app/assets/javascripts/boards/components/work_item_type_select.vue b/ee/app/assets/javascripts/boards/components/work_item_type_select.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ab90d77335a9cbb1d3632a56efd025e0fd93fca2
--- /dev/null
+++ b/ee/app/assets/javascripts/boards/components/work_item_type_select.vue
@@ -0,0 +1,153 @@
+<script>
+import { GlButton } from '@gitlab/ui';
+import { s__ } from '~/locale';
+import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import DropdownWidget from '~/vue_shared/components/dropdown/dropdown_widget/dropdown_widget.vue';
+
+const BASE_WORK_ITEM_TYPES = [
+  { id: 'ISSUE', name: s__('WorkItem|Issue'), title: s__('WorkItem|Issue') },
+  { id: 'INCIDENT', name: s__('WorkItem|Incident'), title: s__('WorkItem|Incident') },
+];
+
+export default {
+  name: 'WorkItemTypeSelect',
+  components: {
+    DropdownWidget,
+    GlButton,
+  },
+  mixins: [glFeatureFlagMixin()],
+  props: {
+    board: {
+      type: Object,
+      required: true,
+    },
+    canEdit: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  emits: ['set-work-item-types'],
+  data() {
+    return {
+      selected: [],
+      isEditing: false,
+      isDropdownShowing: false,
+    };
+  },
+  computed: {
+    workItemTypes() {
+      const types = [...BASE_WORK_ITEM_TYPES];
+
+      if (this.glFeatures.workItemTasksOnBoards) {
+        types.push({ id: 'TASK', name: s__('WorkItem|Task'), title: s__('WorkItem|Task') });
+      }
+
+      return types;
+    },
+    selectedTypeNames() {
+      return this.selected.map((type) => type.name).join(', ');
+    },
+    selectText() {
+      if (!this.selected.length) {
+        return this.$options.i18n.selectType;
+      }
+      if (this.selected.length > 1) {
+        return `${this.selected[0].name} +${this.selected.length - 1}`;
+      }
+      return this.selected[0].name;
+    },
+  },
+  created() {
+    this.selected = this.normalizeWorkItemTypes(this.board.workItemTypes || []);
+  },
+  methods: {
+    normalizeWorkItemTypes(types) {
+      if (!types || !Array.isArray(types)) {
+        return [];
+      }
+      return types.map((type) => {
+        if (typeof type === 'string') {
+          const typeObj = this.workItemTypes.find((t) => t.id === type);
+          return typeObj || { id: type, name: type, title: type };
+        }
+        return type;
+      });
+    },
+    isTypeSelected(option) {
+      return this.selected.some((type) => type.id === option.id);
+    },
+    selectType(type) {
+      let types = [];
+      if (this.isTypeSelected(type)) {
+        types = this.selected.filter(({ id }) => id !== type.id);
+      } else {
+        types = [...this.selected, type];
+      }
+      this.selected = types;
+      this.$emit('set-work-item-types', types);
+    },
+    toggleEdit() {
+      if (!this.isEditing && !this.isDropdownShowing) {
+        this.isEditing = true;
+        this.showDropdown();
+      } else {
+        this.isEditing = false;
+        this.isDropdownShowing = false;
+      }
+    },
+    showDropdown() {
+      this.$refs.editDropdown.showDropdown();
+      this.isDropdownShowing = true;
+    },
+    hideDropdown() {
+      this.isEditing = false;
+    },
+  },
+  i18n: {
+    label: s__('BoardScope|Type'),
+    anyType: s__('BoardScope|Any type'),
+    selectType: s__('BoardScope|Choose types'),
+    edit: s__('BoardScope|Edit'),
+  },
+};
+</script>
+
+<template>
+  <div class="block work-item-types">
+    <div class="title gl-mb-3">
+      {{ $options.i18n.label }}
+      <gl-button
+        v-if="canEdit"
+        category="tertiary"
+        size="small"
+        class="edit-link gl-float-right"
+        data-testid="work-item-types-edit-button"
+        @click="toggleEdit"
+      >
+        {{ $options.i18n.edit }}
+      </gl-button>
+    </div>
+    <div v-if="!isEditing" class="gl-mb-2 gl-text-subtle" data-testid="selected-work-item-types">
+      <div v-if="!selected.length">{{ $options.i18n.anyType }}</div>
+      <div v-else>{{ selectedTypeNames }}</div>
+    </div>
+
+    <dropdown-widget
+      v-show="isEditing"
+      ref="editDropdown"
+      :select-text="selectText"
+      :options="workItemTypes"
+      :selected="selected"
+      :allow-multiselect="true"
+      :custom-is-selected-option="isTypeSelected"
+      data-testid="work-item-types-select-contents-list"
+      @hide="hideDropdown"
+      @set-option="selectType"
+    >
+      <template #item="{ item }">
+        {{ item.name }}
+      </template>
+    </dropdown-widget>
+  </div>
+</template>
diff --git a/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql b/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql
index 1bbe56426fb01603bd270fce348bc273aab87077..f55cbe170095adb817fcfcf5ddb42753454ca53a 100644
--- a/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql
+++ b/ee/app/assets/javascripts/boards/graphql/board_scope.fragment.graphql
@@ -28,4 +28,5 @@ fragment BoardScopeFragment on Board {
     durationInWeeks
   }
   weight
+  workItemTypes
 }
diff --git a/ee/app/graphql/ee/resolvers/board_item_filterable.rb b/ee/app/graphql/ee/resolvers/board_item_filterable.rb
index af1701e5b2e431a50d33ec34efddd366264cdc43..f64d8c7fb8720abdcda3238a9e9d53be95e5b73d 100644
--- a/ee/app/graphql/ee/resolvers/board_item_filterable.rb
+++ b/ee/app/graphql/ee/resolvers/board_item_filterable.rb
@@ -12,6 +12,7 @@ def set_filter_values(filters)
         filter_by_iteration(filters)
         filter_by_iteration_cadence(filters)
         filter_by_weight(filters)
+        filter_by_work_item_types(filters)
 
         super
       end
@@ -71,6 +72,12 @@ def filter_by_weight(filters)
 
         filters[:weight] = weight_wildcard if weight_wildcard
       end
+
+      def filter_by_work_item_types(filters)
+        return if filters[:work_item_types].blank?
+
+        filters[:work_item_types] = filters[:work_item_types].map(&:upcase)
+      end
     end
   end
 end
diff --git a/ee/app/graphql/ee/types/board_type.rb b/ee/app/graphql/ee/types/board_type.rb
index 795865143b8dc513349ab94ebe6172ab6a48d408..dbd6130c7e43d88aee6f88cf25cc4380c99456f2 100644
--- a/ee/app/graphql/ee/types/board_type.rb
+++ b/ee/app/graphql/ee/types/board_type.rb
@@ -27,6 +27,9 @@ module BoardType
           description: 'Board iteration cadence.'
 
         field :weight, type: GraphQL::Types::Int, null: true, description: 'Weight of the board.'
+
+        field :work_item_types, [GraphQL::Types::String], null: true,
+          description: 'Work item types to filter by on the board.'
       end
     end
   end
diff --git a/ee/app/graphql/mutations/boards/scoped_board_mutation.rb b/ee/app/graphql/mutations/boards/scoped_board_mutation.rb
index 11c00ec87e59f9f6c9e6c34d06a7119648628ab0..3ac260014612c0c185a625ec35a410c33fc3708b 100644
--- a/ee/app/graphql/mutations/boards/scoped_board_mutation.rb
+++ b/ee/app/graphql/mutations/boards/scoped_board_mutation.rb
@@ -14,6 +14,10 @@ module ScopedBoardMutation
           required: false,
           description: 'IDs of labels to be added to the board.'
 
+        argument :work_item_types, [GraphQL::Types::String],
+          required: false,
+          description: 'Work item types to filter by on the board.'
+
         validates mutually_exclusive: [:labels, :label_ids]
       end
 
diff --git a/ee/app/models/ee/board.rb b/ee/app/models/ee/board.rb
index 38ff71ec5f1cad4e1c76f1c0898bb2de9a425835..3f6a5fa618a2c42310159ad179cef1a80580b45b 100644
--- a/ee/app/models/ee/board.rb
+++ b/ee/app/models/ee/board.rb
@@ -37,7 +37,8 @@ def scoped?
       EMPTY_SCOPE_STATE.exclude?(milestone_id) ||
         EMPTY_SCOPE_STATE.exclude?(weight) ||
         labels.any? ||
-        assignee.present?
+        assignee.present? ||
+        work_item_types.any?
     end
 
     def milestone
diff --git a/ee/app/services/ee/boards/update_service.rb b/ee/app/services/ee/boards/update_service.rb
index 8b5aaaac4b40580e2c380b47eefdaedc3db2ba85..c92a0d94c0111c5db24b24553ae6a18544fef485 100644
--- a/ee/app/services/ee/boards/update_service.rb
+++ b/ee/app/services/ee/boards/update_service.rb
@@ -20,7 +20,8 @@ def permitted_params
         permitted = super
 
         if parent.feature_available?(:scoped_issue_board)
-          permitted += %i[milestone_id iteration_id iteration_cadence_id assignee_id weight labels label_ids]
+          permitted += %i[milestone_id iteration_id iteration_cadence_id assignee_id weight labels label_ids
+            work_item_types]
         end
 
         permitted
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index de441c898f70f4d2dea18466e902e0b56baaf41f..580a6bae6d8dc25592b2cc1de6cdd8d1c2b28394 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -11701,12 +11701,18 @@ msgstr ""
 msgid "BoardScope|Any label"
 msgstr ""
 
+msgid "BoardScope|Any type"
+msgstr ""
+
 msgid "BoardScope|Assignee"
 msgstr ""
 
 msgid "BoardScope|Choose labels"
 msgstr ""
 
+msgid "BoardScope|Choose types"
+msgstr ""
+
 msgid "BoardScope|Current iteration"
 msgstr ""
 
@@ -11752,6 +11758,9 @@ msgstr ""
 msgid "BoardScope|Started"
 msgstr ""
 
+msgid "BoardScope|Type"
+msgstr ""
+
 msgid "BoardScope|Upcoming"
 msgstr ""