diff --git a/app/portainer/components/datatables/tags-datatable/tagsDatatable.html b/app/portainer/components/datatables/tags-datatable/tagsDatatable.html
deleted file mode 100644
index cc53d049c..000000000
--- a/app/portainer/components/datatables/tags-datatable/tagsDatatable.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<div class="datatable">
-  <rd-widget>
-    <rd-widget-body classes="no-padding">
-      <div class="toolBar">
-        <div class="toolBarTitle vertical-center">
-          <div class="widget-icon space-right">
-            <pr-icon icon="$ctrl.titleIcon"></pr-icon>
-          </div>
-          {{ $ctrl.titleText }}
-        </div>
-        <div class="searchBar vertical-center">
-          <pr-icon icon="'search'"></pr-icon>
-          <input
-            type="text"
-            class="searchInput"
-            ng-model="$ctrl.state.textFilter"
-            ng-change="$ctrl.onTextFilterChange()"
-            placeholder="Search for a tag..."
-            ng-model-options="{ debounce: 300 }"
-          />
-        </div>
-        <div class="actionBar !gap-3">
-          <button type="button" class="btn btn-sm btn-dangerlight h-fit" ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)">
-            <pr-icon icon="'trash-2'"></pr-icon>Remove
-          </button>
-        </div>
-      </div>
-      <div class="table-responsive">
-        <table class="table-hover nowrap-cells table">
-          <thead>
-            <tr>
-              <th>
-                <div class="vertical-center">
-                  <span class="md-checkbox">
-                    <input id="select_all" type="checkbox" ng-model="$ctrl.state.selectAll" ng-change="$ctrl.selectAll()" />
-                    <label for="select_all"></label>
-                  </span>
-                  <table-column-header
-                    col-title="'Name'"
-                    can-sort="true"
-                    is-sorted="$ctrl.state.orderBy === 'Name'"
-                    is-sorted-desc="$ctrl.state.orderBy === 'Name' && $ctrl.state.reverseOrder"
-                    ng-click="$ctrl.changeOrderBy('Name')"
-                  ></table-column-header>
-                </div>
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit))"
-              ng-class="{ active: item.Checked }"
-            >
-              <td>
-                <span class="md-checkbox">
-                  <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event)" />
-                  <label for="select_{{ $index }}"></label>
-                </span>
-                {{ item.Name }}
-              </td>
-            </tr>
-            <tr ng-if="!$ctrl.dataset">
-              <td colspan="1" class="text-muted text-center">Loading...</td>
-            </tr>
-            <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="1" class="text-muted text-center">No tag available.</td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div class="footer" ng-if="$ctrl.dataset">
-        <div class="infoBar" ng-if="$ctrl.state.selectedItemCount !== 0"> {{ $ctrl.state.selectedItemCount }} item(s) selected </div>
-        <div class="paginationControls">
-          <form class="form-inline vertical-center">
-            <span class="limitSelector">
-              <span class="space-right"> Items per page </span>
-              <select class="form-control" ng-model="$ctrl.state.paginatedItemLimit" ng-change="$ctrl.changePaginationLimit()" data-cy="component-paginationSelect">
-                <option value="0">All</option>
-                <option value="10">10</option>
-                <option value="25">25</option>
-                <option value="50">50</option>
-                <option value="100">100</option>
-              </select>
-            </span>
-            <dir-pagination-controls max-size="5"></dir-pagination-controls>
-          </form>
-        </div>
-      </div>
-    </rd-widget-body>
-  </rd-widget>
-</div>
diff --git a/app/portainer/components/datatables/tags-datatable/tagsDatatable.js b/app/portainer/components/datatables/tags-datatable/tagsDatatable.js
deleted file mode 100644
index b34f7d015..000000000
--- a/app/portainer/components/datatables/tags-datatable/tagsDatatable.js
+++ /dev/null
@@ -1,13 +0,0 @@
-angular.module('portainer.app').component('tagsDatatable', {
-  templateUrl: './tagsDatatable.html',
-  controller: 'GenericDatatableController',
-  bindings: {
-    titleText: '@',
-    titleIcon: '@',
-    dataset: '<',
-    tableKey: '@',
-    orderBy: '@',
-    reverseOrder: '<',
-    removeAction: '<',
-  },
-});
diff --git a/app/portainer/react/components/environments.ts b/app/portainer/react/components/environments.ts
index 057f4ce42..4c5a95c7b 100644
--- a/app/portainer/react/components/environments.ts
+++ b/app/portainer/react/components/environments.ts
@@ -3,11 +3,10 @@ import angular from 'angular';
 import { r2a } from '@/react-tools/react2angular';
 import { EdgeKeyDisplay } from '@/react/portainer/environments/ItemView/EdgeKeyDisplay';
 import { KVMControl } from '@/react/portainer/environments/KvmView/KVMControl';
+import { TagsDatatable } from '@/react/portainer/environments/TagsView/TagsDatatable';
 
 export const environmentsModule = angular
   .module('portainer.app.react.components.environments', [])
   .component('edgeKeyDisplay', r2a(EdgeKeyDisplay, ['edgeKey']))
-  .component(
-    'kvmControl',
-    r2a(KVMControl, ['deviceId', 'server', 'token'])
-  ).name;
+  .component('kvmControl', r2a(KVMControl, ['deviceId', 'server', 'token']))
+  .component('tagsDatatable', r2a(TagsDatatable, ['dataset', 'onRemove'])).name;
diff --git a/app/portainer/views/tags/tags.html b/app/portainer/views/tags/tags.html
index 7b1e3df37..f8deb85f2 100644
--- a/app/portainer/views/tags/tags.html
+++ b/app/portainer/views/tags/tags.html
@@ -60,8 +60,4 @@
   </div>
 </div>
 
-<div class="row">
-  <div class="col-sm-12">
-    <tags-datatable title-text="Tags" title-icon="tag" dataset="tags" table-key="tags" order-by="Name" remove-action="removeAction"></tags-datatable>
-  </div>
-</div>
+<tags-datatable dataset="tags" on-remove="(removeAction)"></tags-datatable>
diff --git a/app/portainer/views/tags/tagsController.js b/app/portainer/views/tags/tagsController.js
index 51e1aedeb..ae86039a9 100644
--- a/app/portainer/views/tags/tagsController.js
+++ b/app/portainer/views/tags/tagsController.js
@@ -1,7 +1,5 @@
 import angular from 'angular';
 import _ from 'lodash-es';
-import { confirmDestructive } from '@@/modals/confirm';
-import { buildConfirmButton } from '@@/modals/utils';
 
 angular.module('portainer.app').controller('TagsController', TagsController);
 
@@ -32,16 +30,6 @@ function TagsController($scope, $state, $async, TagService, Notifications) {
   }
 
   async function removeActionAsync(tags) {
-    const confirmed = await confirmDestructive({
-      title: 'Are you sure?',
-      message: 'Are you sure you want to remove the selected tag(s)?',
-      confirmButton: buildConfirmButton('Remove', 'danger'),
-    });
-
-    if (!confirmed) {
-      return;
-    }
-
     for (let tag of tags) {
       try {
         await TagService.deleteTag(tag.Id);
diff --git a/app/react/portainer/environments/TagsView/.keep b/app/react/portainer/environments/TagsView/.keep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/react/portainer/environments/TagsView/TagsDatatable.tsx b/app/react/portainer/environments/TagsView/TagsDatatable.tsx
new file mode 100644
index 000000000..42201e3d1
--- /dev/null
+++ b/app/react/portainer/environments/TagsView/TagsDatatable.tsx
@@ -0,0 +1,50 @@
+import { TagIcon } from 'lucide-react';
+import { createColumnHelper } from '@tanstack/react-table';
+
+import { Tag } from '@/portainer/tags/types';
+
+import { Datatable } from '@@/datatables';
+import { createPersistedStore } from '@@/datatables/types';
+import { useTableState } from '@@/datatables/useTableState';
+import { DeleteButton } from '@@/buttons/DeleteButton';
+
+const columnHelper = createColumnHelper<Tag>();
+
+const columns = [
+  columnHelper.accessor('Name', {
+    header: 'Name',
+  }),
+];
+
+const tableKey = 'tags-table';
+
+const store = createPersistedStore(tableKey);
+
+export function TagsDatatable({
+  dataset,
+  onRemove,
+}: {
+  dataset: Array<Tag> | undefined;
+  onRemove: (selectedItems: Array<Tag>) => void;
+}) {
+  const tableState = useTableState(store, tableKey);
+
+  return (
+    <Datatable
+      title="Tags"
+      titleIcon={TagIcon}
+      dataset={dataset || []}
+      columns={columns}
+      isLoading={!dataset}
+      emptyContentLabel="No tag available."
+      settingsManager={tableState}
+      renderTableActions={(selectedItems) => (
+        <DeleteButton
+          disabled={selectedItems.length === 0}
+          confirmMessage="Are you sure you want to remove the selected tag(s)?"
+          onConfirmed={() => onRemove(selectedItems)}
+        />
+      )}
+    />
+  );
+}