diff --git a/packages/-ember-data/ember-cli-build.js b/packages/-ember-data/ember-cli-build.js
index b30e6c5f319..e61ea3e5e16 100644
--- a/packages/-ember-data/ember-cli-build.js
+++ b/packages/-ember-data/ember-cli-build.js
@@ -12,14 +12,14 @@ module.exports = function (defaults) {
 
     terser: {
       compress: {
-        ecma: 2016, // probably can be higher
+        ecma: 2021,
         passes: 6, // slow, but worth it
         negate_iife: false,
         sequences: 30,
         defaults: true,
-        arguments: true,
+        arguments: false,
         keep_fargs: false,
-        toplevel: process.env.IS_ASSET_SIZE_CHECK ? false : true,
+        toplevel: false,
         unsafe: true,
         unsafe_comps: true,
         unsafe_math: true,
@@ -27,9 +27,9 @@ module.exports = function (defaults) {
         unsafe_proto: true,
         unsafe_undefined: true,
       },
-      toplevel: process.env.IS_ASSET_SIZE_CHECK ? false : true,
+      toplevel: false,
       sourceMap: false,
-      ecma: 2016,
+      ecma: 2021,
     },
   };
 
diff --git a/packages/private-build-infra/src/addon-build-config-for-data-package.js b/packages/private-build-infra/src/addon-build-config-for-data-package.js
index a68e7fe74cc..2475c817185 100644
--- a/packages/private-build-infra/src/addon-build-config-for-data-package.js
+++ b/packages/private-build-infra/src/addon-build-config-for-data-package.js
@@ -143,6 +143,14 @@ function addonBuildConfigForDataPackage(PackageName) {
     included() {
       this._super.included.apply(this, arguments);
 
+      const host = this._findHost();
+      const name = this.name;
+      const options = host.options['@embroider/macros']?.setConfig?.[name];
+
+      if (options) {
+        Object.assign(this.options['@embroider/macros'].setOwnConfig, options);
+      }
+
       this._setupBabelOptions();
     },