diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b9fe6101ff..f7dc038b84 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1712,11 +1712,11 @@ importers:
         specifier: npm:ember-data@~4.8.0
         version: /ember-data@4.8.8(@babel/core@7.24.7)(ember-source@3.28.12)
       ember-data-5.3:
-        specifier: npm:ember-data@~5.3.0
-        version: /ember-data@5.3.8(@ember/string@3.1.1)(@ember/test-helpers@3.3.0)(@ember/test-waiters@3.1.0)(ember-source@3.28.12)(qunit@2.21.0)
+        specifier: npm:ember-data@5.3.0
+        version: /ember-data@5.3.0(@babel/core@7.24.7)(@ember/string@3.1.1)(ember-source@3.28.12)
       ember-data-latest:
-        specifier: npm:ember-data@latest
-        version: /ember-data@5.3.8(@ember/string@3.1.1)(@ember/test-helpers@3.3.0)(@ember/test-waiters@3.1.0)(ember-source@3.28.12)(qunit@2.21.0)
+        specifier: npm:ember-data@5.3.0
+        version: /ember-data@5.3.0(@babel/core@7.24.7)(@ember/string@3.1.1)(ember-source@3.28.12)
       ember-engines:
         specifier: ^0.8.23
         version: 0.8.23(@ember/legacy-built-in-components@0.4.2)(ember-source@3.28.12)
@@ -4053,26 +4053,23 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/adapter@5.3.8(@ember-data/legacy-compat@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-mlyGQyiNv3C5SN0jRqVboixnSW/h0r1g7wsCus35p51zKYtq7HGyp3EaEQZOt+4dRS0wNfDx4Z95PPbH/rmH0Q==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/adapter@5.3.0(@babel/core@7.24.7)(@ember-data/store@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2):
+    resolution: {integrity: sha512-OKbqtuOn6ZHFvU36P8876TsWtr6BKx1eOAzftnRtS8kD8r9rxdXapCA7M2V3l+Fma4d+MMwm8flLrqMddP5rmA==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember-data/legacy-compat': 5.3.8
-      '@ember-data/request-utils': 5.3.8
-      '@ember-data/store': 5.3.8
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember-data/store': 5.3.0
+      '@ember/string': ^3.1.1
+      ember-inflector: ^4.0.2
     dependencies:
-      '@ember-data/legacy-compat': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/store@5.3.8)(@ember/test-waiters@3.1.0)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember/edition-utils': 1.2.0
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/store': 5.3.0(@babel/core@7.24.7)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12)
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
-      ember-cli-path-utils: 1.0.0
-      ember-cli-string-utils: 1.1.0
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
       ember-cli-test-info: 1.0.0
+      ember-inflector: 4.0.2
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
       - supports-color
     dev: true
@@ -4221,25 +4218,29 @@ packages:
       - webpack-cli
     dev: true
 
-  /@ember-data/debug@5.3.8(@ember-data/model@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-cqats3thXCd5UJbswF/ZGDFJPqBZ7tgHZjDGWa8NuRuDn7YgB3PqAz+I4CjxPkQokOPeYzk/0JvNvTOlp4IjuA==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/debug@5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1):
+    resolution: {integrity: sha512-R5Jo4N7TSlMj4HdP+kGGVM7vtxxmIm1y+RaqKiRFmh3kzf8lL5FYF6vE0Hjkfu+p9KGnGSuTm731kPxYMZnbzQ==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember-data/model': 5.3.8
-      '@ember-data/request-utils': 5.3.8
-      '@ember-data/store': 5.3.8
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember-data/store': 5.3.0
+      '@ember/string': ^3.1.1
     dependencies:
-      '@ember-data/model': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/legacy-compat@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
+      '@babel/core': 7.24.7
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/store': 5.3.0(@babel/core@7.24.7)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12)
       '@ember/edition-utils': 1.2.0
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1)
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
+      webpack: 5.92.1
     transitivePeerDependencies:
       - '@glint/template'
+      - '@swc/core'
+      - esbuild
       - supports-color
+      - uglify-js
+      - webpack-cli
     dev: true
 
   /@ember-data/graph@4.12.8(@ember-data/store@4.12.8):
@@ -4274,18 +4275,19 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/graph@5.3.8(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-JNaR41QlA4R1mXJKbI2S2+Zdy3ysoArAQmfnHouDXWezQD6NpgKgmfLmCqxtdHkAVQ8ttnAMx/S/A2fPTVaeyw==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/graph@5.3.0(@babel/core@7.24.7)(@ember-data/store@5.3.0):
+    resolution: {integrity: sha512-BK1PGJVpW/ioP9IrvPECvbeiMf8cX0o4Ym3PWRlXIgWbfTnN57/XHwqL6qRo46Li2tMyzoranE6q7Jxhu6DCIg==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember-data/store': 5.3.8
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember-data/store': 5.3.0
     dependencies:
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/store': 5.3.0(@babel/core@7.24.7)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12)
+      '@ember/edition-utils': 1.2.0
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
       - supports-color
     dev: true
@@ -4326,22 +4328,25 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/json-api@5.3.8(@ember-data/graph@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-n0Woiu4oEiJmqfLa5xM9fbhY7+nntncdgWrJfYO1IMEcuO0fbmZVLPye1wTjUIog7uwmjD1uP0u63MnKyqOSeA==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/json-api@5.3.0(@babel/core@7.24.7)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2):
+    resolution: {integrity: sha512-irS0uuotz5VJbmaGEoK7Ad8JjlVzCI2C+lxz22UelR64Vbb1btnBHlw2Tr2n9s0kNxaR1iHUB94Fo2LBbr0Prg==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember-data/graph': 5.3.8
-      '@ember-data/request-utils': 5.3.8
-      '@ember-data/store': 5.3.8
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember-data/graph': 5.3.0
+      '@ember-data/request-utils': 5.3.0
+      '@ember-data/store': 5.3.0
+      ember-inflector: ^4.0.2
     dependencies:
-      '@ember-data/graph': 5.3.8(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
+      '@ember-data/graph': 5.3.0(@babel/core@7.24.7)(@ember-data/store@5.3.0)
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/request-utils': 5.3.0(@babel/core@7.24.7)
+      '@ember-data/store': 5.3.0(@babel/core@7.24.7)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12)
+      '@ember/edition-utils': 1.2.0
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
+      ember-inflector: 4.0.2
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
       - supports-color
     dev: true
@@ -4392,33 +4397,27 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/legacy-compat@5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/store@5.3.8)(@ember/test-waiters@3.1.0)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-b043cU5k+gT+E2YT4ujHoea/81gmYrZTu6Yvt5n87YoCP0p5UxJWji11BTYfJAYN0sf1QAl+OkxI1BX7Ed1Q0g==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/legacy-compat@5.3.0(@babel/core@7.24.7)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0):
+    resolution: {integrity: sha512-KST6bMqvr6+DLTY5XRLOyCBgOGIj6QCpZQtyOWOhPwKnfeBXygppF9ys0ZWaNhlAaVZSrQ3uPubUit9Y72ZTYQ==}
+    engines: {node: 16.* || >= 18}
     peerDependencies:
-      '@ember-data/graph': 5.3.8
-      '@ember-data/json-api': 5.3.8
-      '@ember-data/request': 5.3.8
-      '@ember-data/request-utils': 5.3.8
-      '@ember-data/store': 5.3.8
-      '@ember/test-waiters': ^3.1.0
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember-data/graph': 5.3.0
+      '@ember-data/json-api': 5.3.0
+      '@ember-data/request': 5.3.0
     peerDependenciesMeta:
       '@ember-data/graph':
         optional: true
       '@ember-data/json-api':
         optional: true
     dependencies:
-      '@ember-data/graph': 5.3.8(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/json-api': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request': 5.3.8(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember/test-waiters': 3.1.0
+      '@ember-data/graph': 5.3.0(@babel/core@7.24.7)(@ember-data/store@5.3.0)
+      '@ember-data/json-api': 5.3.0(@babel/core@7.24.7)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2)
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/request': 5.3.0(@babel/core@7.24.7)
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
       - supports-color
     dev: true
@@ -4615,38 +4614,46 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/model@5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/legacy-compat@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-vg7hIzQmDXCDapUZc6kawKE2IAD9A4RowQBmBD7gR7TWtzinmoSygHYHjZpVdAEV4JE3EI1gjbyQesRLoAub1A==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/model@5.3.0(@babel/core@7.24.7)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@3.28.12):
+    resolution: {integrity: sha512-9DckZXu3DZk1fYd1js6kS2SCxuuaQBDE1N3NMc+Zz55n8qu1LKHLxr+dGwVqV+Wtl7LGcAU1ocnm7gKNhC1vuw==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember-data/graph': 5.3.8
-      '@ember-data/json-api': 5.3.8
-      '@ember-data/legacy-compat': 5.3.8
-      '@ember-data/request-utils': 5.3.8
-      '@ember-data/store': 5.3.8
-      '@ember-data/tracking': 5.3.8
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember-data/debug': 5.3.0
+      '@ember-data/graph': 5.3.0
+      '@ember-data/json-api': 5.3.0
+      '@ember-data/legacy-compat': 5.3.0
+      '@ember-data/store': 5.3.0
+      '@ember-data/tracking': 5.3.0
+      '@ember/string': ^3.1.1
+      ember-inflector: ^4.0.2
     peerDependenciesMeta:
+      '@ember-data/debug':
+        optional: true
       '@ember-data/graph':
         optional: true
       '@ember-data/json-api':
         optional: true
     dependencies:
-      '@ember-data/graph': 5.3.8(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/json-api': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/legacy-compat': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/store@5.3.8)(@ember/test-waiters@3.1.0)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/tracking': 5.3.8(@warp-drive/core-types@0.0.0-beta.11)(ember-source@3.28.12)
+      '@ember-data/debug': 5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1)
+      '@ember-data/graph': 5.3.0(@babel/core@7.24.7)(@ember-data/store@5.3.0)
+      '@ember-data/json-api': 5.3.0(@babel/core@7.24.7)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2)
+      '@ember-data/legacy-compat': 5.3.0(@babel/core@7.24.7)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0)
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/store': 5.3.0(@babel/core@7.24.7)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12)
+      '@ember-data/tracking': 5.3.0(@babel/core@7.24.7)
       '@ember/edition-utils': 1.2.0
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.7)(ember-source@3.28.12)
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
       ember-cli-string-utils: 1.1.0
       ember-cli-test-info: 1.0.0
-      inflection: 3.0.0
+      ember-inflector: 4.0.2
+      inflection: 2.0.1
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
+      - ember-source
       - supports-color
     dev: true
 
@@ -4824,6 +4831,37 @@ packages:
       - supports-color
     dev: true
 
+  /@ember-data/private-build-infra@5.3.0:
+    resolution: {integrity: sha512-n7VCPgvjS0Yza5USBucdYjTvlk5GC6fIdWiQUGdK9QxHnyekFg2Znu932ulKp/Iokoc8iBEaVX3HoiCwM/Hw1w==}
+    engines: {node: 16.* || >= 18.*}
+    dependencies:
+      '@babel/core': 7.24.7
+      '@babel/plugin-transform-block-scoping': 7.24.7(@babel/core@7.24.7)
+      '@babel/runtime': 7.24.7
+      '@ember/edition-utils': 1.2.0
+      '@embroider/macros': 1.16.5(@glint/template@1.4.0)
+      babel-import-util: 1.4.1
+      babel-plugin-debug-macros: 0.3.4(@babel/core@7.24.7)
+      babel-plugin-filter-imports: 4.0.0
+      babel6-plugin-strip-class-callcheck: 6.0.0
+      broccoli-debug: 0.6.5
+      broccoli-file-creator: 2.1.1
+      broccoli-merge-trees: 4.2.0
+      calculate-cache-key-for-tree: 2.0.0
+      chalk: 4.1.2
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
+      ember-cli-path-utils: 1.0.0
+      ember-cli-string-utils: 1.1.0
+      ember-cli-version-checker: 5.1.2
+      git-repo-info: 2.1.1
+      npm-git-info: 1.0.3
+      semver: 7.6.2
+      silent-error: 1.1.1
+    transitivePeerDependencies:
+      - '@glint/template'
+      - supports-color
+    dev: true
+
   /@ember-data/record-data@3.28.13(@babel/core@7.24.7):
     resolution: {integrity: sha512-0qYOxQr901eZ0JoYVt/IiszZYuNefqO6yiwKw0VH2dmWhVniQSp+Da9YnoKN9U2KgR4NdxKiUs2j9ZLNZ+bH7g==}
     engines: {node: 12.* || >= 14.*}
@@ -4897,25 +4935,13 @@ packages:
       - webpack
     dev: true
 
-  /@ember-data/request-utils@5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-cMcSoxRLv7mhHABeFWLivZhp7k9Lp0UZB+KPNrnbCXZ7T+b4C/BhQvbpTXYJwj7V/m47dlPzM/c0I2cfdmhzNg==}
-    engines: {node: '>= 18.20.3'}
-    peerDependencies:
-      '@ember/string': 3.1.1
-      '@warp-drive/core-types': 0.0.0-beta.11
-      ember-inflector: 4.0.2
-    peerDependenciesMeta:
-      '@ember/string':
-        optional: true
-      ember-inflector:
-        optional: true
+  /@ember-data/request-utils@5.3.0(@babel/core@7.24.7):
+    resolution: {integrity: sha512-f/DGyW7tKbx1NCxz/arDBXTwEiV0+a0m8AStTMOlPkGLvnDhuHAH3jVlhuNweFxI6CmfXaL+UAY7g+uWAwCn0Q==}
+    engines: {node: 16.* || >= 18}
     dependencies:
-      '@ember/string': 3.1.1
-      '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
     transitivePeerDependencies:
-      - '@glint/template'
+      - '@babel/core'
       - supports-color
     dev: true
 
@@ -4945,17 +4971,16 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/request@5.3.8(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-urAzDc+MvpmIzr2olMphG9DhwKrdYJOyywhT+fHnzCvezQoMgoBpkr40uCM2IX4Ge0+a9MklcSViA6kpLq2izQ==}
-    engines: {node: '>= 18.20.3'}
-    peerDependencies:
-      '@warp-drive/core-types': 0.0.0-beta.11
+  /@ember-data/request@5.3.0(@babel/core@7.24.7):
+    resolution: {integrity: sha512-dsgwnhXYMlgO99DPur2AYQpFigU8DSk628GZ9qDhQQ9IRfGkT3yjFGg9M/Bp0G+U3dJbs56Tiy+VhSl36k0Wsw==}
+    engines: {node: 16.* || >= 18}
     dependencies:
+      '@ember-data/private-build-infra': 5.3.0
       '@ember/test-waiters': 3.1.0
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
       - supports-color
     dev: true
@@ -5073,26 +5098,21 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/serializer@5.3.8(@ember-data/legacy-compat@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-EjESckhiZTDtdetihMeup/PXU/pbOTAK8o2SsYGGICwVNpcguH3su9NhoCJQ97/5XL+X5I4KCMm7V8/Lode8vw==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/serializer@5.3.0(@babel/core@7.24.7)(@ember/string@3.1.1)(ember-inflector@4.0.2):
+    resolution: {integrity: sha512-apsfN8qHOVQxIxmPQh6SSxYtzNcb3/jvdjJDrU6L8eklyQXfxcbaBD6r2uUAA2jaI94oNXoSHM/75TZnJjLIZA==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember-data/legacy-compat': 5.3.8
-      '@ember-data/request-utils': 5.3.8
-      '@ember-data/store': 5.3.8
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember/string': ^3.1.1
+      ember-inflector: ^4.0.2
     dependencies:
-      '@ember-data/legacy-compat': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/store@5.3.8)(@ember/test-waiters@3.1.0)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember/edition-utils': 1.2.0
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
-      ember-cli-path-utils: 1.0.0
-      ember-cli-string-utils: 1.1.0
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
       ember-cli-test-info: 1.0.0
+      ember-inflector: 4.0.2
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
       - supports-color
     dev: true
@@ -5264,23 +5284,24 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/store@5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11):
-    resolution: {integrity: sha512-ZxqHgiKZrqXdetlriv4VOPjqrEre2rqaLFWOHkjjKqzsp2AkmGkcrh/DS6i9Y4/5F9hYxb9lxyyJqOW7sr57yQ==}
-    engines: {node: '>= 18.20.3'}
+  /@ember-data/store@5.3.0(@babel/core@7.24.7)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12):
+    resolution: {integrity: sha512-okM7AJmgM8Wz+FNgsDXVUVw32UZVLKko2K/2GfBmOjOcKVnfwLKI08HmQNLnT5IXiOsJW5mA4mRESuVgN8L4lQ==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember-data/request': 5.3.8
-      '@ember-data/request-utils': 5.3.8
-      '@ember-data/tracking': 5.3.8
-      '@warp-drive/core-types': 0.0.0-beta.11
+      '@ember-data/tracking': 5.3.0
+      '@ember/string': ^3.1.1
+      '@glimmer/tracking': ^1.1.2
     dependencies:
-      '@ember-data/request': 5.3.8(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/tracking': 5.3.8(@warp-drive/core-types@0.0.0-beta.11)(ember-source@3.28.12)
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/tracking': 5.3.0(@babel/core@7.24.7)
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
+      ember-cached-decorator-polyfill: 1.0.2(@babel/core@7.24.7)(ember-source@3.28.12)
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
+      - ember-source
       - supports-color
     dev: true
 
@@ -5315,18 +5336,15 @@ packages:
       - supports-color
     dev: true
 
-  /@ember-data/tracking@5.3.8(@warp-drive/core-types@0.0.0-beta.11)(ember-source@3.28.12):
-    resolution: {integrity: sha512-1zbz1yDgx8HDditG3DHnl8xsvBAwguT/WcBRZRj5kEtDVELwCY1N+cCtxMRPVgunKgP2UCVJPfnXkgqYvEsG4Q==}
-    engines: {node: '>= 18.20.3'}
-    peerDependencies:
-      '@warp-drive/core-types': 0.0.0-beta.11
-      ember-source: '>= 3.28.12'
+  /@ember-data/tracking@5.3.0(@babel/core@7.24.7):
+    resolution: {integrity: sha512-CEaV9zbKY40I0c7a7AXIhV4P+veA70plWCGU2fA/AMk69BdT64vKx9r+HPvAVsaz7ER4XCnUqyPAZnCWypa9WA==}
+    engines: {node: 16.* || >= 18}
     dependencies:
+      '@ember-data/private-build-infra': 5.3.0
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
-      ember-source: 3.28.12(@babel/core@7.24.7)
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
     transitivePeerDependencies:
+      - '@babel/core'
       - '@glint/template'
       - supports-color
     dev: true
@@ -8664,31 +8682,6 @@ packages:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: true
 
-  /@warp-drive/build-config@0.0.0-beta.6:
-    resolution: {integrity: sha512-ANSjWRV5kSJyIIO+5rRv7/lqfwYazQ9wDpi4vr1rjGogsmVteRCnflV5qYqt9W9T4JXRjSimjSfKwCgEwl+jUA==}
-    engines: {node: '>= 18.20.3'}
-    dependencies:
-      '@embroider/addon-shim': 1.8.9
-      '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      babel-import-util: 2.1.1
-      broccoli-funnel: 3.0.8
-      semver: 7.6.2
-    transitivePeerDependencies:
-      - '@glint/template'
-      - supports-color
-    dev: true
-
-  /@warp-drive/core-types@0.0.0-beta.11:
-    resolution: {integrity: sha512-GHQE+woaGdRDGj6VG3Qt0uGBNog1zq5XO2Ccce35cYPpM3FOCOdmqB4Wt0miD1bBdbAuWQZmmQOIYAMSMCOdZQ==}
-    engines: {node: '>= 18.20.3'}
-    dependencies:
-      '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-    transitivePeerDependencies:
-      - '@glint/template'
-      - supports-color
-    dev: true
-
   /@webassemblyjs/ast@1.12.1:
     resolution: {integrity: sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==}
     dependencies:
@@ -15116,45 +15109,42 @@ packages:
       - webpack-cli
     dev: true
 
-  /ember-data@5.3.8(@ember/string@3.1.1)(@ember/test-helpers@3.3.0)(@ember/test-waiters@3.1.0)(ember-source@3.28.12)(qunit@2.21.0):
-    resolution: {integrity: sha512-ZFd0dxTCkX5OHe/Xdfpglg+3OELsd0xNFziogoKV0JPLzyXmasn/8vAeHeUta9rAJDYH8lix3/1t6iIeY+DzYQ==}
-    engines: {node: '>= 18.20.3'}
+  /ember-data@5.3.0(@babel/core@7.24.7)(@ember/string@3.1.1)(ember-source@3.28.12):
+    resolution: {integrity: sha512-ca8udUa2SrWyYxPckYc89Fdv/9pCG3X360zHvlGxtB4C87o3dWp6sle98tP9G1TjximKhrU/PMrqpdhJ8rOGtA==}
+    engines: {node: 16.* || >= 18.*}
     peerDependencies:
-      '@ember/test-helpers': ^3.3.0
-      '@ember/test-waiters': ^3.1.0
-      qunit: ^2.18.0
-    peerDependenciesMeta:
-      '@ember/test-helpers':
-        optional: true
-      '@ember/test-waiters':
-        optional: true
-      qunit:
-        optional: true
+      '@ember/string': ^3.1.1
     dependencies:
-      '@ember-data/adapter': 5.3.8(@ember-data/legacy-compat@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/debug': 5.3.8(@ember-data/model@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/graph': 5.3.8(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/json-api': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/legacy-compat': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/store@5.3.8)(@ember/test-waiters@3.1.0)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/model': 5.3.8(@ember-data/graph@5.3.8)(@ember-data/json-api@5.3.8)(@ember-data/legacy-compat@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request': 5.3.8(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/request-utils': 5.3.8(@ember/string@3.1.1)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/serializer': 5.3.8(@ember-data/legacy-compat@5.3.8)(@ember-data/request-utils@5.3.8)(@ember-data/store@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/store': 5.3.8(@ember-data/request-utils@5.3.8)(@ember-data/request@5.3.8)(@ember-data/tracking@5.3.8)(@warp-drive/core-types@0.0.0-beta.11)
-      '@ember-data/tracking': 5.3.8(@warp-drive/core-types@0.0.0-beta.11)(ember-source@3.28.12)
+      '@ember-data/adapter': 5.3.0(@babel/core@7.24.7)(@ember-data/store@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)
+      '@ember-data/debug': 5.3.0(@ember-data/store@5.3.0)(@ember/string@3.1.1)
+      '@ember-data/graph': 5.3.0(@babel/core@7.24.7)(@ember-data/store@5.3.0)
+      '@ember-data/json-api': 5.3.0(@babel/core@7.24.7)(@ember-data/graph@5.3.0)(@ember-data/request-utils@5.3.0)(@ember-data/store@5.3.0)(ember-inflector@4.0.2)
+      '@ember-data/legacy-compat': 5.3.0(@babel/core@7.24.7)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/request@5.3.0)
+      '@ember-data/model': 5.3.0(@babel/core@7.24.7)(@ember-data/debug@5.3.0)(@ember-data/graph@5.3.0)(@ember-data/json-api@5.3.0)(@ember-data/legacy-compat@5.3.0)(@ember-data/store@5.3.0)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-inflector@4.0.2)(ember-source@3.28.12)
+      '@ember-data/private-build-infra': 5.3.0
+      '@ember-data/request': 5.3.0(@babel/core@7.24.7)
+      '@ember-data/request-utils': 5.3.0(@babel/core@7.24.7)
+      '@ember-data/serializer': 5.3.0(@babel/core@7.24.7)(@ember/string@3.1.1)(ember-inflector@4.0.2)
+      '@ember-data/store': 5.3.0(@babel/core@7.24.7)(@ember-data/tracking@5.3.0)(@ember/string@3.1.1)(ember-source@3.28.12)
+      '@ember-data/tracking': 5.3.0(@babel/core@7.24.7)
       '@ember/edition-utils': 1.2.0
-      '@ember/test-helpers': 3.3.0(ember-source@3.28.12)
-      '@ember/test-waiters': 3.1.0
+      '@ember/string': 3.1.1
       '@embroider/macros': 1.16.5(@glint/template@1.4.0)
-      '@warp-drive/build-config': 0.0.0-beta.6
-      '@warp-drive/core-types': 0.0.0-beta.11
-      qunit: 2.21.0
+      broccoli-merge-trees: 4.2.0
+      ember-auto-import: 2.7.4(@glint/template@1.4.0)(webpack@5.92.1)
+      ember-cli-babel: 8.2.0(@babel/core@7.24.7)
+      ember-inflector: 4.0.2
+      webpack: 5.92.1
     transitivePeerDependencies:
-      - '@ember/string'
+      - '@babel/core'
+      - '@glimmer/tracking'
       - '@glint/template'
-      - ember-inflector
+      - '@swc/core'
       - ember-source
+      - esbuild
       - supports-color
+      - uglify-js
+      - webpack-cli
     dev: true
 
   /ember-decorators@6.1.1:
@@ -19002,11 +18992,6 @@ packages:
     engines: {node: '>=14.0.0'}
     dev: true
 
-  /inflection@3.0.0:
-    resolution: {integrity: sha512-1zEJU1l19SgJlmwqsEyFTbScw/tkMHFenUo//Y0i+XEP83gDFdMvPizAD/WGcE+l1ku12PcTVHQhO6g5E0UCMw==}
-    engines: {node: '>=18.0.0'}
-    dev: true
-
   /inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
     deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 31f38448a3..6f037cc7f0 100644
--- a/tests/scenarios/package.json
+++ b/tests/scenarios/package.json
@@ -78,8 +78,8 @@
     "ember-data-4.12": "npm:ember-data@~4.12.0",
     "ember-data-4.4": "npm:ember-data@~4.4.0",
     "ember-data-4.8": "npm:ember-data@~4.8.0",
-    "ember-data-5.3": "npm:ember-data@~5.3.0",
-    "ember-data-latest": "npm:ember-data@latest",
+    "ember-data-5.3": "npm:ember-data@5.3.0",
+    "ember-data-latest": "npm:ember-data@5.3.0",
     "ember-engines": "^0.8.23",
     "ember-inline-svg": "^0.2.1",
     "ember-modifier": "^4.0.0",