diff --git a/packages/-ember-caluma/package.json b/packages/-ember-caluma/package.json
index 39eb63d0a..f2839317d 100644
--- a/packages/-ember-caluma/package.json
+++ b/packages/-ember-caluma/package.json
@@ -65,7 +65,7 @@
     "ember-modifier": "4.2.0",
     "ember-power-select": "8.3.1",
     "ember-resolver": "12.0.1",
-    "ember-sortable": "5.1.2",
+    "ember-sortable": "5.2.2",
     "ember-source": "5.11.0",
     "ember-truth-helpers": "4.0.3",
     "ember-uikit": "9.1.2",
diff --git a/packages/analytics/package.json b/packages/analytics/package.json
index e9c301a7b..d05c81fe3 100644
--- a/packages/analytics/package.json
+++ b/packages/analytics/package.json
@@ -33,7 +33,7 @@
     "ember-fetch": "^8.1.2",
     "ember-intl": "^7.0.5",
     "ember-power-select": "^8.3.1",
-    "ember-sortable": "^5.1.2",
+    "ember-sortable": "^5.2.2",
     "ember-uikit": "^9.1.2",
     "ember-validated-form": "^7.0.1",
     "graphql": "^15.9.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6141ab0de..2d91f76c7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -273,8 +273,8 @@ importers:
         specifier: 12.0.1
         version: 12.0.1(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))
       ember-sortable:
-        specifier: 5.1.2
-        version: 5.1.2(@ember/test-helpers@3.3.1(@babel/core@7.25.7)(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@ember/test-waiters@3.1.0)(ember-modifier@4.2.0(@babel/core@7.25.7)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))
+        specifier: 5.2.2
+        version: 5.2.2(@ember/test-helpers@3.3.1(@babel/core@7.25.7)(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@ember/test-waiters@3.1.0)(@glint/template@1.4.0)(ember-modifier@4.2.0(@babel/core@7.25.7)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))
       ember-source:
         specifier: 5.11.0
         version: 5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)
@@ -372,8 +372,8 @@ importers:
         specifier: ^8.3.1
         version: 8.3.1(gz5l6ewnwwnffjs6kqgyllwre4)
       ember-sortable:
-        specifier: ^5.1.2
-        version: 5.1.2(@ember/test-helpers@3.3.1(@babel/core@7.25.7)(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@ember/test-waiters@3.1.0)(ember-modifier@4.2.0(@babel/core@7.25.7)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))
+        specifier: ^5.2.2
+        version: 5.2.2(@ember/test-helpers@3.3.1(@babel/core@7.25.7)(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@ember/test-waiters@3.1.0)(@glint/template@1.4.0)(ember-modifier@4.2.0(@babel/core@7.25.7)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))
       ember-uikit:
         specifier: ^9.1.2
         version: 9.1.2(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0)
@@ -6057,8 +6057,8 @@ packages:
       qunit: ^2.0.0
       sinon: '>=15.0.3'
 
-  ember-sortable@5.1.2:
-    resolution: {integrity: sha512-4EUP9d4FcggZNyRsYiza7LX4cSaFWkE51xla7eHSKG6OKuaVry1owK1kPlEbRaWjhg6ZYmsRxqyDLWU9qcVTHg==}
+  ember-sortable@5.2.2:
+    resolution: {integrity: sha512-E0ksD6tSsP7tEKImf4mrGNepCDCc4b5BtI94LmioisHQCWP9nzqyw5IKT9eej4UBAZH2N2r0RgEMPaFsIUd0TA==}
     engines: {node: 14.* || >= 16}
     peerDependencies:
       '@ember/test-helpers': ^2.6.0 || >= 3.0.0
@@ -6417,6 +6417,7 @@ packages:
   eslint@8.57.1:
     resolution: {integrity: sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    deprecated: This version is no longer supported. Please see https://eslint.org/version-support for other options.
     hasBin: true
 
   esm@3.2.25:
@@ -18215,14 +18216,18 @@ snapshots:
       - '@babel/core'
       - supports-color
 
-  ember-sortable@5.1.2(@ember/test-helpers@3.3.1(@babel/core@7.25.7)(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@ember/test-waiters@3.1.0)(ember-modifier@4.2.0(@babel/core@7.25.7)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)):
+  ember-sortable@5.2.2(@ember/test-helpers@3.3.1(@babel/core@7.25.7)(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0))(@ember/test-waiters@3.1.0)(@glint/template@1.4.0)(ember-modifier@4.2.0(@babel/core@7.25.7)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)))(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)):
     dependencies:
       '@ember/test-helpers': 3.3.1(@babel/core@7.25.7)(@glint/template@1.4.0)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))(webpack@5.95.0)
       '@ember/test-waiters': 3.1.0
       '@embroider/addon-shim': 1.8.9
+      '@embroider/macros': 1.16.6(@glint/template@1.4.0)
+      '@glimmer/env': 0.1.7
       ember-modifier: 4.2.0(@babel/core@7.25.7)(ember-source@5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0))
       ember-source: 5.11.0(@glimmer/component@1.1.2(@babel/core@7.25.7))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.95.0)
+      rsvp: 4.8.5
     transitivePeerDependencies:
+      - '@glint/template'
       - supports-color
 
   ember-source-channel-url@3.0.0: