diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js
index 84c1de723..833d9ce34 100644
--- a/ui/admin/ember-cli-build.js
+++ b/ui/admin/ember-cli-build.js
@@ -31,16 +31,9 @@ module.exports = async function (defaults) {
     svg: {
       paths: ['../../addons/core/public'],
     },
-    '@embroider/macros': {
-      setConfig: {
-        '@ember-data/store': {
-          polyfillUUID: true,
-        },
-      },
-    },
   });
 
-  // TODO: This config can be removed in ember-data 6.0.
+  // TODO: The deprecations object can be removed in ember-data 6.0.
   // This silences ember-data deprecate warnings by setting to false to
   // strip the deprecated code (thereby opting into the new behavior).
   setConfig(app, __dirname, {
@@ -48,6 +41,7 @@ module.exports = async function (defaults) {
       DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
       DEPRECATE_RELATIONSHIP_REMOTE_UPDATE_CLEARING_LOCAL_STATE: false,
     },
+    polyfillUUID: true,
   });
 
   // Use `app.import` to add additional libraries to the generated
diff --git a/ui/admin/package.json b/ui/admin/package.json
index 649334800..6c032571a 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -48,7 +48,6 @@
     "@ember/render-modifiers": "^2.0.4",
     "@ember/string": "^4.0.0",
     "@ember/test-helpers": "^3.3.1",
-    "@embroider/macros": "^1.16.9",
     "@faker-js/faker": "^8.0.2",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js
index 38e048d53..804556740 100644
--- a/ui/desktop/ember-cli-build.js
+++ b/ui/desktop/ember-cli-build.js
@@ -31,16 +31,9 @@ module.exports = async function (defaults) {
     svg: {
       paths: ['../../addons/core/public'],
     },
-    '@embroider/macros': {
-      setConfig: {
-        '@ember-data/store': {
-          polyfillUUID: true,
-        },
-      },
-    },
   });
 
-  // TODO: This config can be removed in ember-data 6.0.
+  // TODO: The deprecations object removed in ember-data 6.0.
   // This silences ember-data deprecate warnings by setting to false to
   // strip the deprecated code (thereby opting into the new behavior).
   setConfig(app, __dirname, {
@@ -48,6 +41,7 @@ module.exports = async function (defaults) {
       DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
       DEPRECATE_RELATIONSHIP_REMOTE_UPDATE_CLEARING_LOCAL_STATE: false,
     },
+    polyfillUUID: true,
   });
 
   // Use `app.import` to add additional libraries to the generated
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index e77f66302..4a622282f 100644
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -54,7 +54,6 @@
     "@ember/render-modifiers": "^2.0.4",
     "@ember/string": "^4.0.0",
     "@ember/test-helpers": "^3.3.1",
-    "@embroider/macros": "^1.16.9",
     "@faker-js/faker": "^8.0.2",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
diff --git a/yarn.lock b/yarn.lock
index 482ef4514..9fa5fb029 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8472,7 +8472,6 @@ __metadata:
     "@ember/render-modifiers": "npm:^2.0.4"
     "@ember/string": "npm:^4.0.0"
     "@ember/test-helpers": "npm:^3.3.1"
-    "@embroider/macros": "npm:^1.16.9"
     "@faker-js/faker": "npm:^8.0.2"
     "@glimmer/component": "npm:^1.1.2"
     "@glimmer/tracking": "npm:^1.1.2"
@@ -12046,7 +12045,6 @@ __metadata:
     "@ember/render-modifiers": "npm:^2.0.4"
     "@ember/string": "npm:^4.0.0"
     "@ember/test-helpers": "npm:^3.3.1"
-    "@embroider/macros": "npm:^1.16.9"
     "@faker-js/faker": "npm:^8.0.2"
     "@glimmer/component": "npm:^1.1.2"
     "@glimmer/tracking": "npm:^1.1.2"