diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
deleted file mode 100644
index db5eee7c0..000000000
--- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html
+++ /dev/null
@@ -1,170 +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'" class-name="'searchIcon'"></pr-icon>
-          <input
-            type="text"
-            class="searchInput"
-            ng-model="$ctrl.state.textFilter"
-            ng-change="$ctrl.onTextFilterChange()"
-            placeholder="Search for a secret..."
-            auto-focus
-            ng-model-options="{ debounce: 300 }"
-            data-cy="secret-searchInput"
-          />
-        </div>
-        <div class="actionBar !gap-3" authorization="DockerSecretDelete, DockerSecretCreate">
-          <button
-            type="button"
-            class="btn btn-sm btn-dangerlight vertical-center !ml-0 h-fit"
-            authorization="DockerSecretDelete"
-            ng-disabled="$ctrl.state.selectedItemCount === 0"
-            ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"
-            data-cy="secret-removeSecretButton"
-          >
-            <pr-icon icon="'trash-2'"></pr-icon>Remove
-          </button>
-          <button
-            type="button"
-            class="btn btn-sm btn-primary vertical-center !ml-0 h-fit"
-            ui-sref="docker.secrets.new"
-            authorization="DockerSecretCreate"
-            data-cy="secret-addSecretButton"
-          >
-            <pr-icon icon="'plus'"></pr-icon>Add secret
-          </button>
-        </div>
-        <div class="settings">
-          <span class="setting" ng-class="{ 'setting-active': $ctrl.settings.open }" uib-dropdown dropdown-append-to-body auto-close="disabled" is-open="$ctrl.settings.open">
-            <span uib-dropdown-toggle aria-label="Settings">
-              <pr-icon icon="'more-vertical'"></pr-icon>
-            </span>
-            <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu>
-              <div class="tableMenu">
-                <div class="menuHeader"> Table settings </div>
-                <div class="menuContent">
-                  <div>
-                    <div class="md-checkbox">
-                      <input id="setting_auto_refresh" type="checkbox" ng-model="$ctrl.settings.repeater.autoRefresh" ng-change="$ctrl.onSettingsRepeaterChange()" />
-                      <label for="setting_auto_refresh">Auto refresh</label>
-                    </div>
-                    <div ng-if="$ctrl.settings.repeater.autoRefresh">
-                      <label for="settings_refresh_rate"> Refresh rate </label>
-                      <select id="settings_refresh_rate" ng-model="$ctrl.settings.repeater.refreshRate" ng-change="$ctrl.onSettingsRepeaterChange()" class="small-select">
-                        <option value="10">10s</option>
-                        <option value="30">30s</option>
-                        <option value="60">1min</option>
-                        <option value="120">2min</option>
-                        <option value="300">5min</option>
-                      </select>
-                      <span>
-                        <pr-icon id="refreshRateChange" icon="'check'" mode="'success'" style="display: none"></pr-icon>
-                      </span>
-                    </div>
-                  </div>
-                </div>
-                <div>
-                  <a type="button" class="btn btn-default btn-sm" ng-click="$ctrl.settings.open = false;">Close</a>
-                </div>
-              </div>
-            </div>
-          </span>
-        </div>
-      </div>
-      <div class="table-responsive">
-        <table class="table-hover nowrap-cells table">
-          <thead>
-            <tr>
-              <th>
-                <div class="flex flex-nowrap items-center">
-                  <span class="md-checkbox vertical-center" authorization="DockerSecretDelete, DockerSecretCreate">
-                    <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>
-              <th>
-                <table-column-header
-                  col-title="'Creation Date'"
-                  can-sort="true"
-                  is-sorted="$ctrl.state.orderBy === 'CreatedAt'"
-                  is-sorted-desc="$ctrl.state.orderBy === 'CreatedAt' && $ctrl.state.reverseOrder"
-                  ng-click="$ctrl.changeOrderBy('CreatedAt')"
-                ></table-column-header>
-              </th>
-              <th>
-                <table-column-header
-                  col-title="'Ownership'"
-                  can-sort="true"
-                  is-sorted="$ctrl.state.orderBy === 'ResourceControl.Ownership'"
-                  is-sorted-desc="$ctrl.state.orderBy === 'ResourceControl.Ownership' && $ctrl.state.reverseOrder"
-                  ng-click="$ctrl.changeOrderBy('ResourceControl.Ownership')"
-                ></table-column-header>
-              </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" authorization="DockerSecretDelete, DockerSecretCreate">
-                  <input id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" ng-click="$ctrl.selectItem(item, $event)" />
-                  <label for="select_{{ $index }}"></label>
-                </span>
-                <a ui-sref="docker.secrets.secret({id: item.Id})">{{ item.Name }}</a>
-              </td>
-              <td>{{ item.CreatedAt | getisodate }}</td>
-              <td>
-                <span>
-                  <i ng-class="item.ResourceControl.Ownership | ownershipicon" aria-hidden="true"></i>
-                  {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = $ctrl.RCO.ADMINISTRATORS }}
-                </span>
-              </td>
-            </tr>
-            <tr ng-if="!$ctrl.dataset">
-              <td colspan="3" class="text-muted text-center">Loading...</td>
-            </tr>
-            <tr ng-if="$ctrl.state.filteredDataSet.length === 0">
-              <td colspan="3" class="text-muted text-center">No secret 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 style="margin-right: 5px"> 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/docker/components/datatables/secrets-datatable/secretsDatatable.js b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js
deleted file mode 100644
index 840a98fc2..000000000
--- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js
+++ /dev/null
@@ -1,14 +0,0 @@
-angular.module('portainer.docker').component('secretsDatatable', {
-  templateUrl: './secretsDatatable.html',
-  controller: 'GenericDatatableController',
-  bindings: {
-    titleText: '@',
-    titleIcon: '@',
-    dataset: '<',
-    tableKey: '@',
-    orderBy: '@',
-    reverseOrder: '<',
-    removeAction: '<',
-    refreshCallback: '<',
-  },
-});
diff --git a/app/docker/models/secret.js b/app/docker/models/secret.js
deleted file mode 100644
index aea1d7c56..000000000
--- a/app/docker/models/secret.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
-
-export function SecretViewModel(data) {
-  this.Id = data.ID;
-  this.CreatedAt = data.CreatedAt;
-  this.UpdatedAt = data.UpdatedAt;
-  this.Version = data.Version.Index;
-  this.Name = data.Spec.Name;
-  this.Labels = data.Spec.Labels;
-
-  if (data.Portainer) {
-    if (data.Portainer.ResourceControl) {
-      this.ResourceControl = new ResourceControlViewModel(data.Portainer.ResourceControl);
-    }
-  }
-}
diff --git a/app/docker/models/secret.ts b/app/docker/models/secret.ts
new file mode 100644
index 000000000..8473d8df5
--- /dev/null
+++ b/app/docker/models/secret.ts
@@ -0,0 +1,36 @@
+import { Secret } from 'docker-types/generated/1.41';
+
+import { ResourceControlViewModel } from '@/react/portainer/access-control/models/ResourceControlViewModel';
+import { PortainerMetadata } from '@/react/docker/types';
+import { IResource } from '@/react/docker/components/datatable-helpers/createOwnershipColumn';
+
+export class SecretViewModel implements IResource {
+  Id: string;
+
+  CreatedAt: string;
+
+  UpdatedAt: string;
+
+  Version: number;
+
+  Name: string;
+
+  Labels: Record<string, string>;
+
+  ResourceControl?: ResourceControlViewModel;
+
+  constructor(data: Secret & { Portainer?: PortainerMetadata }) {
+    this.Id = data.ID || '';
+    this.CreatedAt = data.CreatedAt || '';
+    this.UpdatedAt = data.UpdatedAt || '';
+    this.Version = data.Version?.Index || 0;
+    this.Name = data.Spec?.Name || '';
+    this.Labels = data.Spec?.Labels || {};
+
+    if (data.Portainer?.ResourceControl) {
+      this.ResourceControl = new ResourceControlViewModel(
+        data.Portainer.ResourceControl
+      );
+    }
+  }
+}
diff --git a/app/docker/react/components/index.ts b/app/docker/react/components/index.ts
index d35300f99..f7c6ecbb5 100644
--- a/app/docker/react/components/index.ts
+++ b/app/docker/react/components/index.ts
@@ -22,6 +22,7 @@ import { AgentHostBrowser } from '@/react/docker/host/BrowseView/AgentHostBrowse
 import { AgentVolumeBrowser } from '@/react/docker/volumes/BrowseView/AgentVolumeBrowser';
 import { ProcessesDatatable } from '@/react/docker/containers/StatsView/ProcessesDatatable';
 import { ScaleServiceButton } from '@/react/docker/services/ListView/ServicesDatatable/columns/schedulingMode/ScaleServiceButton';
+import { SecretsDatatable } from '@/react/docker/secrets/ListView/SecretsDatatable';
 
 import { containersModule } from './containers';
 
@@ -132,6 +133,10 @@ const ngModule = angular
     'dockerServicesDatatableScaleServiceButton',
     r2a(withUIRouter(withCurrentUser(ScaleServiceButton)), ['service'])
   )
-  .component('dockerEventsDatatable', r2a(EventsDatatable, ['dataset']));
+  .component('dockerEventsDatatable', r2a(EventsDatatable, ['dataset']))
+  .component(
+    'dockerSecretsDatatable',
+    r2a(withUIRouter(SecretsDatatable), ['dataset', 'onRefresh', 'onRemove'])
+  );
 
 export const componentsModule = ngModule.name;
diff --git a/app/docker/views/secrets/secrets.html b/app/docker/views/secrets/secrets.html
index 23e0e9175..d286ee28d 100644
--- a/app/docker/views/secrets/secrets.html
+++ b/app/docker/views/secrets/secrets.html
@@ -1,5 +1,7 @@
 <page-header title="'Secrets list'" breadcrumbs="['Secrets']" reload="true"> </page-header>
 
+<docker-secrets-datatable dataset="secrets" on-remove="(removeAction)" on-refresh="(getSecrets)"> </docker-secrets-datatable>
+
 <div class="row">
   <div class="col-sm-12">
     <secrets-datatable
diff --git a/app/react/docker/secrets/ListView/SecretsDatatable.tsx b/app/react/docker/secrets/ListView/SecretsDatatable.tsx
new file mode 100644
index 000000000..7b05d0c45
--- /dev/null
+++ b/app/react/docker/secrets/ListView/SecretsDatatable.tsx
@@ -0,0 +1,111 @@
+import { createColumnHelper } from '@tanstack/react-table';
+import { Lock, Plus, Trash2 } from 'lucide-react';
+
+import { SecretViewModel } from '@/docker/models/secret';
+import { isoDate } from '@/portainer/filters/filters';
+
+import { buildNameColumn } from '@@/datatables/buildNameColumn';
+import { Datatable, TableSettingsMenu } from '@@/datatables';
+import {
+  BasicTableSettings,
+  RefreshableTableSettings,
+  createPersistedStore,
+  refreshableSettings,
+} from '@@/datatables/types';
+import { useTableState } from '@@/datatables/useTableState';
+import { TableSettingsMenuAutoRefresh } from '@@/datatables/TableSettingsMenuAutoRefresh';
+import { Button } from '@@/buttons';
+import { Link } from '@@/Link';
+import { useRepeater } from '@@/datatables/useRepeater';
+
+import { createOwnershipColumn } from '../../components/datatable-helpers/createOwnershipColumn';
+
+const columnHelper = createColumnHelper<SecretViewModel>();
+
+const columns = [
+  buildNameColumn<SecretViewModel>('Name', 'Id', '.secret'),
+  columnHelper.accessor((item) => isoDate(item.CreatedAt), {
+    header: 'Creation Date',
+  }),
+  createOwnershipColumn<SecretViewModel>(),
+];
+
+interface TableSettings extends BasicTableSettings, RefreshableTableSettings {}
+
+const storageKey = 'docker-secrets';
+const store = createPersistedStore<TableSettings>(
+  storageKey,
+  undefined,
+  (set) => ({
+    ...refreshableSettings(set),
+  })
+);
+
+export function SecretsDatatable({
+  dataset,
+  onRemove,
+  onRefresh,
+}: {
+  dataset?: Array<SecretViewModel>;
+  onRemove(items: Array<SecretViewModel>): void;
+  onRefresh(): Promise<void>;
+}) {
+  const tableState = useTableState(store, storageKey);
+  useRepeater(tableState.autoRefreshRate, onRefresh);
+
+  return (
+    <Datatable
+      title="Secrets"
+      titleIcon={Lock}
+      columns={columns}
+      dataset={dataset || []}
+      isLoading={!dataset}
+      settingsManager={tableState}
+      emptyContentLabel="No secret available."
+      renderTableActions={(selectedItems) => (
+        <TableActions selectedItems={selectedItems} onRemove={onRemove} />
+      )}
+      renderTableSettings={() => (
+        <TableSettingsMenu>
+          <TableSettingsMenuAutoRefresh
+            value={tableState.autoRefreshRate}
+            onChange={(value) => tableState.setAutoRefreshRate(value)}
+          />
+        </TableSettingsMenu>
+      )}
+    />
+  );
+}
+
+function TableActions({
+  selectedItems,
+  onRemove,
+}: {
+  selectedItems: Array<SecretViewModel>;
+  onRemove(items: Array<SecretViewModel>): void;
+}) {
+  return (
+    <div className="flex items-center gap-2">
+      <Button
+        color="dangerlight"
+        disabled={selectedItems.length === 0}
+        onClick={() => onRemove(selectedItems)}
+        icon={Trash2}
+        className="!m-0"
+        data-cy="secret-removeSecretButton"
+      >
+        Remove
+      </Button>
+
+      <Button
+        as={Link}
+        props={{ to: '.new' }}
+        icon={Plus}
+        className="!m-0"
+        data-cy="secret-addSecretButton"
+      >
+        Add secret
+      </Button>
+    </div>
+  );
+}