diff --git a/package.json b/package.json
index 3bf7b0c9..8c3485c9 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
     "cy:run-ct": "cypress run --component"
   },
   "dependencies": {
+    "@noction/vue-draggable-grid": "1.9.8",
     "@popperjs/core": "^2.11.8",
     "@vuepic/vue-datepicker": "^7.2.0",
     "@vueuse/core": "^10.5.0",
@@ -37,8 +38,7 @@
     "vue-demi": "^0.14.6",
     "vue-echarts": "^6.6.1",
     "vue-router": "^4.2.5",
-    "vue-select": "^4.0.0-beta.6",
-    "vue3-drr-grid-layout": "^1.9.7"
+    "vue-select": "^4.0.0-beta.6"
   },
   "devDependencies": {
     "@cypress/vite-dev-server": "^5.0.6",
diff --git a/src/main.ts b/src/main.ts
index 313e1a09..4c250e5e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,7 +4,7 @@ import { createApp } from 'vue';
 import App from './App.vue';
 // Eensure Bootstrap css still loads
 import './plugins/bootstrap-vue';
-import { GridLayout } from './plugins/vue-grid-layout';
+import { VueDraggableGrid } from './plugins/vue-grid-layout';
 import router from './router';
 
 const myApp = createApp(App);
@@ -15,7 +15,7 @@ pinia.use(piniaPluginPersistedstate);
 myApp.use(pinia);
 
 myApp.use(router);
-myApp.use(GridLayout);
+myApp.use(VueDraggableGrid);
 
 // Vue.config.productionTip = false;
 myApp.mount('#app');
diff --git a/src/plugins/vue-grid-layout.ts b/src/plugins/vue-grid-layout.ts
index 1670ed84..e0035f2f 100644
--- a/src/plugins/vue-grid-layout.ts
+++ b/src/plugins/vue-grid-layout.ts
@@ -1,4 +1,4 @@
-import GridLayout from 'vue3-drr-grid-layout';
-import 'vue3-drr-grid-layout/dist/style.css';
+import VueDraggableGrid from '@noction/vue-draggable-grid';
+import '@noction/vue-draggable-grid/dist/style.css';
 
-export { GridLayout };
+export { VueDraggableGrid };
diff --git a/yarn.lock b/yarn.lock
index d1f24832..0e989285 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -419,6 +419,21 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
   integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
 
+"@noction/vue-draggable-grid@1.9.8":
+  version "1.9.8"
+  resolved "https://registry.yarnpkg.com/@noction/vue-draggable-grid/-/vue-draggable-grid-1.9.8.tgz#d8f3667d988f64b0c0803b0ca91accb1b035faf0"
+  integrity sha512-w4GiTgxx6Vt4VEf1cCNxeB3S/jQ5H5qTT8EiajAs6fE/kqmnVRHGMh9MUFszkln8V6ejXHngbW75UPjZSD/HQQ==
+  dependencies:
+    "@interactjs/actions" "^1.10.17"
+    "@interactjs/auto-start" "^1.10.17"
+    "@interactjs/dev-tools" "^1.10.17"
+    "@interactjs/interactjs" "^1.10.17"
+    "@interactjs/modifiers" "^1.10.17"
+    "@types/element-resize-detector" "^1.1.3"
+    element-resize-detector "^1.2.4"
+    mitt "^3.0.0"
+    vue "^3.2.0"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -3672,21 +3687,6 @@ vue-tsc@^1.8.22:
     "@vue/language-core" "1.8.22"
     semver "^7.5.4"
 
-vue3-drr-grid-layout@^1.9.7:
-  version "1.9.7"
-  resolved "https://registry.yarnpkg.com/vue3-drr-grid-layout/-/vue3-drr-grid-layout-1.9.7.tgz#6df8a8bd0e4f836446a01faaf3604b4a8a117e00"
-  integrity sha512-+eq1FijnYl6Nj/HIWRGb42HUfnsdktaaobtPgUwbopbV52QffwAz/saYNM1Ap8KKmFJM74mw6U494msNfLsgcQ==
-  dependencies:
-    "@interactjs/actions" "^1.10.17"
-    "@interactjs/auto-start" "^1.10.17"
-    "@interactjs/dev-tools" "^1.10.17"
-    "@interactjs/interactjs" "^1.10.17"
-    "@interactjs/modifiers" "^1.10.17"
-    "@types/element-resize-detector" "^1.1.3"
-    element-resize-detector "^1.2.4"
-    mitt "^3.0.0"
-    vue "^3.2.0"
-
 vue@^3.2.0, vue@^3.3.2:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"