diff --git a/ember-cli-build.js b/ember-cli-build.js
index 36cf3ca2c13..a975ca7309e 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -18,14 +18,6 @@ module.exports = function (defaults) {
   }
 
   let app = new EmberApp(defaults, {
-    '@embroider/macros': {
-      setConfig: {
-        '@ember-data/store': {
-          polyfillUUID: true,
-        },
-      },
-    },
-
     autoImport: {
       webpack: {
         devtool: isProd ? 'source-map' : 'eval-source-map',
@@ -47,6 +39,8 @@ module.exports = function (defaults) {
     },
 
     emberData: {
+      polyfillUUID: true,
+
       deprecations: {
         DEPRECATE_STORE_EXTENDS_EMBER_OBJECT: false,
       },