diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f223480a..567946c8 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -11,6 +11,7 @@
       "dependencies": {
         "@emotion/react": "11.14.0",
         "@emotion/styled": "11.14.0",
+        "@hello-pangea/dnd": "^17.0.0",
         "@mdi/js": "7.4.47",
         "@monaco-editor/react": "4.6.0",
         "@mui/icons-material": "6.3.1",
@@ -34,7 +35,6 @@
         "msgpack5": "6.0.2",
         "pluralize": "8.0.0",
         "react": "^18.3.1",
-        "react-beautiful-dnd": "13.1.1",
         "react-big-calendar": "1.16.3",
         "react-copy-to-clipboard": "5.1.0",
         "react-dom": "^18.3.1",
@@ -2894,6 +2894,31 @@
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
+    "node_modules/@hello-pangea/dnd": {
+      "version": "17.0.0",
+      "resolved": "https://registry.npmjs.org/@hello-pangea/dnd/-/dnd-17.0.0.tgz",
+      "integrity": "sha512-LDDPOix/5N0j5QZxubiW9T0M0+1PR0rTDWeZF5pu1Tz91UQnuVK4qQ/EjY83Qm2QeX0eM8qDXANfDh3VVqtR4Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime": "^7.25.6",
+        "css-box-model": "^1.2.1",
+        "memoize-one": "^6.0.0",
+        "raf-schd": "^4.0.3",
+        "react-redux": "^9.1.2",
+        "redux": "^5.0.1",
+        "use-memo-one": "^1.1.3"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/@hello-pangea/dnd/node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
+      "license": "MIT"
+    },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.14",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -6209,15 +6234,6 @@
         "@types/unist": "*"
       }
     },
-    "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
-      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
-      "dependencies": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
-      }
-    },
     "node_modules/@types/html-minifier-terser": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
@@ -6430,25 +6446,6 @@
         "@types/react": "*"
       }
     },
-    "node_modules/@types/react-redux": {
-      "version": "7.1.33",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz",
-      "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==",
-      "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
-      }
-    },
-    "node_modules/@types/react-redux/node_modules/redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
     "node_modules/@types/react-transition-group": {
       "version": "4.4.12",
       "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
@@ -17936,11 +17933,6 @@
         "url": "https://github.com/sponsors/streamich"
       }
     },
-    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-    },
     "node_modules/merge-descriptors": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
@@ -20472,61 +20464,6 @@
         "react": ">=16.4.1"
       }
     },
-    "node_modules/react-beautiful-dnd": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz",
-      "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2",
-        "css-box-model": "^1.2.0",
-        "memoize-one": "^5.1.1",
-        "raf-schd": "^4.0.2",
-        "react-redux": "^7.2.0",
-        "redux": "^4.0.4",
-        "use-memo-one": "^1.1.1"
-      },
-      "peerDependencies": {
-        "react": "^16.8.5 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.5 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/react-beautiful-dnd/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
-    },
-    "node_modules/react-beautiful-dnd/node_modules/react-redux": {
-      "version": "7.2.9",
-      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz",
-      "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.15.4",
-        "@types/react-redux": "^7.1.20",
-        "hoist-non-react-statics": "^3.3.2",
-        "loose-envify": "^1.4.0",
-        "prop-types": "^15.7.2",
-        "react-is": "^17.0.2"
-      },
-      "peerDependencies": {
-        "react": "^16.8.3 || ^17 || ^18"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/react-beautiful-dnd/node_modules/redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
     "node_modules/react-big-calendar": {
       "version": "1.16.3",
       "resolved": "https://registry.npmjs.org/react-big-calendar/-/react-big-calendar-1.16.3.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 7cad2e66..96e0cc99 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -5,6 +5,7 @@
   "dependencies": {
     "@emotion/react": "11.14.0",
     "@emotion/styled": "11.14.0",
+    "@hello-pangea/dnd": "^17.0.0",
     "@mdi/js": "7.4.47",
     "@monaco-editor/react": "4.6.0",
     "@mui/icons-material": "6.3.1",
@@ -28,7 +29,6 @@
     "msgpack5": "6.0.2",
     "pluralize": "8.0.0",
     "react": "^18.3.1",
-    "react-beautiful-dnd": "13.1.1",
     "react-big-calendar": "1.16.3",
     "react-copy-to-clipboard": "5.1.0",
     "react-dom": "^18.3.1",
diff --git a/frontend/src/js/components/devices/dialogs/CustomColumnsDialogContent.tsx b/frontend/src/js/components/devices/dialogs/CustomColumnsDialogContent.tsx
index b615e772..eba838d8 100644
--- a/frontend/src/js/components/devices/dialogs/CustomColumnsDialogContent.tsx
+++ b/frontend/src/js/components/devices/dialogs/CustomColumnsDialogContent.tsx
@@ -12,12 +12,12 @@
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { DragDropContext, Draggable, Droppable } from 'react-beautiful-dnd';
 
 // material ui
 import { Clear as ClearIcon, DragHandle as DragHandleIcon } from '@mui/icons-material';
 import { DialogContent, FormControl, IconButton, ListItem } from '@mui/material';
 
+import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd';
 import { ATTRIBUTE_SCOPES } from '@northern.tech/store/constants';
 
 import AttributeAutoComplete, { getOptionLabel } from '../widgets/AttributeAutocomplete';
@@ -117,16 +117,14 @@ const Content = ({ attributes, columnHeaders, idAttribute, selectedAttributes, s
       <p>You can select columns of inventory data to display in the device list table. Drag to change the order.</p>
       <DragDropContext onDragEnd={onDragEnd}>
         <Droppable droppableId="droppable-list" direction="vertical">
-          {provided => {
-            return (
-              <div ref={provided.innerRef} {...provided.droppableProps} {...props}>
-                {selectedAttributes.map((item, index) => (
-                  <DraggableListItem item={item} index={index} key={item.key} onRemove={onRemove} />
-                ))}
-                {provided.placeholder}
-              </div>
-            );
-          }}
+          {provided => (
+            <div ref={provided.innerRef} {...provided.droppableProps} {...props}>
+              {selectedAttributes.map((item, index) => (
+                <DraggableListItem item={item} index={index} key={item.key} onRemove={onRemove} />
+              ))}
+              {provided.placeholder}
+            </div>
+          )}
         </Droppable>
       </DragDropContext>
       <FormControl>
diff --git a/frontend/src/js/components/devices/dialogs/__snapshots__/CustomColumnsDialogContent.test.tsx.snap b/frontend/src/js/components/devices/dialogs/__snapshots__/CustomColumnsDialogContent.test.tsx.snap
index a6ec9d0f..9ac3e94a 100644
--- a/frontend/src/js/components/devices/dialogs/__snapshots__/CustomColumnsDialogContent.test.tsx.snap
+++ b/frontend/src/js/components/devices/dialogs/__snapshots__/CustomColumnsDialogContent.test.tsx.snap
@@ -704,13 +704,13 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-14:focus::-ms-input-
     You can select columns of inventory data to display in the device list table. Drag to change the order.
   </p>
   <div
-    data-rbd-droppable-context-id="0"
-    data-rbd-droppable-id="droppable-list"
+    data-rfd-droppable-context-id=":r0:"
+    data-rfd-droppable-id="droppable-list"
   >
     <li
       class="MuiListItem-root MuiListItem-gutters MuiListItem-padding flexbox space-between margin-right-large emotion-1"
-      data-rbd-draggable-context-id="0"
-      data-rbd-draggable-id="name"
+      data-rfd-draggable-context-id=":r0:"
+      data-rfd-draggable-id="name"
     >
       <div>
         Name
@@ -720,10 +720,10 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-14:focus::-ms-input-
         style="width: 80px;"
       >
         <div
-          aria-describedby="rbd-hidden-text-0-hidden-text-0"
+          aria-describedby="rfd-hidden-text-:r0:-hidden-text-:r1:"
           class="flexbox centered"
-          data-rbd-drag-handle-context-id="0"
-          data-rbd-drag-handle-draggable-id="name"
+          data-rfd-drag-handle-context-id=":r0:"
+          data-rfd-drag-handle-draggable-id="name"
           draggable="false"
           role="button"
           tabindex="0"
@@ -761,8 +761,8 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-14:focus::-ms-input-
     </li>
     <li
       class="MuiListItem-root MuiListItem-gutters MuiListItem-padding flexbox space-between margin-right-large emotion-1"
-      data-rbd-draggable-context-id="0"
-      data-rbd-draggable-id="id"
+      data-rfd-draggable-context-id=":r0:"
+      data-rfd-draggable-id="id"
     >
       <div>
         Device ID
@@ -772,10 +772,10 @@ label[data-shrink=false]+.MuiInputBase-formControl .emotion-14:focus::-ms-input-
         style="width: 80px;"
       >
         <div
-          aria-describedby="rbd-hidden-text-0-hidden-text-0"
+          aria-describedby="rfd-hidden-text-:r0:-hidden-text-:r1:"
           class="flexbox centered"
-          data-rbd-drag-handle-context-id="0"
-          data-rbd-drag-handle-draggable-id="id"
+          data-rfd-drag-handle-context-id=":r0:"
+          data-rfd-drag-handle-draggable-id="id"
           draggable="false"
           role="button"
           tabindex="0"
diff --git a/frontend/tests/licenses/directDependencies.csv b/frontend/tests/licenses/directDependencies.csv
index efa00c46..30cd7192 100644
--- a/frontend/tests/licenses/directDependencies.csv
+++ b/frontend/tests/licenses/directDependencies.csv
@@ -6,6 +6,7 @@
 "@emotion/jest","MIT","https://github.com/emotion-js/emotion.git#main"
 "@emotion/react","MIT","https://github.com/emotion-js/emotion.git#main"
 "@emotion/styled","MIT","https://github.com/emotion-js/emotion.git#main"
+"@hello-pangea/dnd","Apache-2.0","https://github.com/hello-pangea/dnd"
 "@mdi/js","Apache-2.0","https://github.com/Templarian/MaterialDesign-JS"
 "@monaco-editor/react","MIT","https://github.com/suren-atoyan/monaco-react"
 "@mui/icons-material","MIT","https://github.com/mui/material-ui"
@@ -73,7 +74,6 @@
 "postcss","MIT","https://github.com/postcss/postcss"
 "prettier","MIT","https://github.com/prettier/prettier"
 "process","MIT","https://github.com/shtylman/node-process"
-"react-beautiful-dnd","Apache-2.0","https://github.com/atlassian/react-beautiful-dnd"
 "react-big-calendar","MIT","https://github.com/jquense/react-big-calendar"
 "react-copy-to-clipboard","MIT","https://github.com/nkbt/react-copy-to-clipboard"
 "react-dom","MIT","https://github.com/facebook/react"