diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a291bb..ceba0dd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,6 +73,8 @@ jobs:
           - ember-canary
           - ember-default-with-jquery
           - ember-classic
+          - embroider-safe
+          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v2
diff --git a/addon/index.js b/addon/index.js
index e69de29..fab3cee 100644
--- a/addon/index.js
+++ b/addon/index.js
@@ -0,0 +1,3 @@
+import { getOwnConfig } from '@embroider/macros';
+
+export default getOwnConfig().config;
diff --git a/index.js b/index.js
index 183b06d..920fc3c 100644
--- a/index.js
+++ b/index.js
@@ -1,7 +1,5 @@
 'use strict';
 
-var FileCreator = require('broccoli-file-creator');
-
 function findRoot(current) {
   var app;
 
@@ -19,17 +17,18 @@ function findRoot(current) {
 }
 
 module.exports = {
-  name: require('./package').name,
+  options: {
+    '@embroider/macros': {
+      setOwnConfig: {},
+    },
+  },
 
-  treeForAddon: function () {
-    var modulePrefix = findRoot(this).project.config(process.env.EMBER_ENV)[
-      'modulePrefix'
-    ];
-    var indexTree = new FileCreator(
-      'index.js',
-      "export { default } from '" + modulePrefix + "/config/environment';"
-    );
+  name: require('./package').name,
 
-    return this._super.treeForAddon.call(this, indexTree);
+  included() {
+    this._super.included.apply(this, arguments);
+    this.options['@embroider/macros'].setOwnConfig.config = findRoot(
+      this
+    ).project.config(process.env.EMBER_ENV);
   },
 };
diff --git a/package-lock.json b/package-lock.json
index 0ac2b6b..230a9ae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,14 +9,14 @@
       "version": "0.5.0",
       "license": "MIT",
       "dependencies": {
-        "broccoli-file-creator": "^1.1.1",
+        "@embroider/macros": "^0.50.0",
         "ember-cli-babel": "^7.26.6",
         "ember-cli-htmlbars": "^5.7.1"
       },
       "devDependencies": {
         "@ember/optional-features": "^2.0.0",
         "@ember/test-helpers": "^2.4.2",
-        "@embroider/test-setup": "^0.43.5",
+        "@embroider/test-setup": "^0.50.0",
         "@glimmer/component": "^1.0.4",
         "@glimmer/tracking": "^1.0.4",
         "auto-changelog": "https://git@github.com/mansona/auto-changelog.git#epic",
@@ -2001,6 +2001,26 @@
         "node": "10.* || 12.* || >= 14"
       }
     },
+    "node_modules/@embroider/core/node_modules/@embroider/macros": {
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-0.33.0.tgz",
+      "integrity": "sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/traverse": "^7.12.1",
+        "@babel/types": "^7.12.1",
+        "@embroider/core": "0.33.0",
+        "assert-never": "^1.1.0",
+        "ember-cli-babel": "^7.23.0",
+        "lodash": "^4.17.10",
+        "resolve": "^1.8.1",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": "10.* || 12.* || >= 14"
+      }
+    },
     "node_modules/@embroider/core/node_modules/async-disk-cache": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz",
@@ -2236,30 +2256,144 @@
       }
     },
     "node_modules/@embroider/macros": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-0.33.0.tgz",
-      "integrity": "sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==",
-      "dev": true,
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-0.50.0.tgz",
+      "integrity": "sha512-9yek4uRrWPd/pvQg1amAr8GJSTv1tcGhsbvLXjUnAaJfHZQ4OlycfpXUsSGujqPI3DkOOL6TvPl0jQaEooE6cQ==",
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/traverse": "^7.12.1",
-        "@babel/types": "^7.12.1",
-        "@embroider/core": "0.33.0",
-        "assert-never": "^1.1.0",
-        "ember-cli-babel": "^7.23.0",
-        "lodash": "^4.17.10",
-        "resolve": "^1.8.1",
+        "@embroider/shared-internals": "0.50.0",
+        "assert-never": "^1.2.1",
+        "ember-cli-babel": "^7.26.6",
+        "find-up": "^5.0.0",
+        "lodash": "^4.17.21",
+        "resolve": "^1.20.0",
         "semver": "^7.3.2"
       },
       "engines": {
-        "node": "10.* || 12.* || >= 14"
+        "node": "12.* || 14.* || >= 16"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/@embroider/shared-internals": {
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-0.50.0.tgz",
+      "integrity": "sha512-pu4YQGyoTsz+KWGTKwMyCMzhoJkUI9PuWiivRilKsywiFt8Ke4ns+nFNnHtPqPKChR72xY2qFjWOP5yAqZq3kw==",
+      "dependencies": {
+        "babel-import-util": "^1.1.0",
+        "ember-rfc176-data": "^0.3.17",
+        "fs-extra": "^9.1.0",
+        "lodash": "^4.17.21",
+        "resolve-package-path": "^4.0.1",
+        "semver": "^7.3.5",
+        "typescript-memoize": "^1.0.1"
+      },
+      "engines": {
+        "node": "12.* || 14.* || >= 16"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+      "dependencies": {
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@embroider/macros/node_modules/resolve-package-path": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-4.0.3.tgz",
+      "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==",
+      "dependencies": {
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">= 12"
       }
     },
     "node_modules/@embroider/macros/node_modules/semver": {
       "version": "7.3.5",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
       "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-      "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -2270,6 +2404,14 @@
         "node": ">=10"
       }
     },
+    "node_modules/@embroider/macros/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/@embroider/shared-internals": {
       "version": "0.40.0",
       "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-0.40.0.tgz",
@@ -2377,9 +2519,9 @@
       }
     },
     "node_modules/@embroider/test-setup": {
-      "version": "0.43.5",
-      "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-0.43.5.tgz",
-      "integrity": "sha512-ke+5B0VR2343ZrOqV9Ok2LyA4m2q2ApM1Oy1RC8+3+OI5lDVg8UgZG9n/G2e77KPMFxnK3eVpXcPdLcdOxW6+w==",
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-0.50.0.tgz",
+      "integrity": "sha512-skZQpUQWvDP/AlC3SZGZf8YAJv4zLM2Q9KzaZbIoZf5Veozx/G8rrU/l+wI0uatZPQ1VjxxSNzh3u8IhEu231A==",
       "dev": true,
       "dependencies": {
         "lodash": "^4.17.21",
@@ -3677,8 +3819,7 @@
     "node_modules/assert-never": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz",
-      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==",
-      "dev": true
+      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="
     },
     "node_modules/assert/node_modules/inherits": {
       "version": "2.0.1",
@@ -3796,7 +3937,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
       "engines": {
         "node": ">= 4.0.0"
       }
@@ -4163,6 +4303,14 @@
         "babel-template": "^6.24.1"
       }
     },
+    "node_modules/babel-import-util": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-1.1.0.tgz",
+      "integrity": "sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA==",
+      "engines": {
+        "node": ">= 12.*"
+      }
+    },
     "node_modules/babel-loader": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
@@ -5620,15 +5768,6 @@
         "tree-sync": "^1.2.2"
       }
     },
-    "node_modules/broccoli-file-creator": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz",
-      "integrity": "sha512-l9zthHg6bAtnOfRr/ieZ1srRQEsufMZID7xGYRW3aBDv3u/3Eux+Iawl10tAGYE5pL9YB4n5X4vxkp6iNOoZ9g==",
-      "dependencies": {
-        "broccoli-plugin": "^1.1.0",
-        "mkdirp": "^0.5.1"
-      }
-    },
     "node_modules/broccoli-filter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/broccoli-filter/-/broccoli-filter-1.3.0.tgz",
@@ -22522,8 +22661,7 @@
     "node_modules/typescript-memoize": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/typescript-memoize/-/typescript-memoize-1.0.1.tgz",
-      "integrity": "sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==",
-      "dev": true
+      "integrity": "sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w=="
     },
     "node_modules/uc.micro": {
       "version": "1.0.6",
@@ -23697,7 +23835,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
       "engines": {
         "node": ">=10"
       },
@@ -25069,6 +25206,23 @@
         "wrap-legacy-hbs-plugin-if-needed": "^1.0.1"
       },
       "dependencies": {
+        "@embroider/macros": {
+          "version": "0.33.0",
+          "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-0.33.0.tgz",
+          "integrity": "sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==",
+          "dev": true,
+          "requires": {
+            "@babel/core": "^7.12.3",
+            "@babel/traverse": "^7.12.1",
+            "@babel/types": "^7.12.1",
+            "@embroider/core": "0.33.0",
+            "assert-never": "^1.1.0",
+            "ember-cli-babel": "^7.23.0",
+            "lodash": "^4.17.10",
+            "resolve": "^1.8.1",
+            "semver": "^7.3.2"
+          }
+        },
         "async-disk-cache": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/async-disk-cache/-/async-disk-cache-2.1.0.tgz",
@@ -25256,30 +25410,111 @@
       }
     },
     "@embroider/macros": {
-      "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-0.33.0.tgz",
-      "integrity": "sha512-nl/1zRn+Wd3MO8Bb+YPqHmFl/2vwQLTsEB6Zt+K9bWXsM/kA+dPCeeCReLN6PbkMP16xxqtNSIrQ8Y49hnWjpg==",
-      "dev": true,
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@embroider/macros/-/macros-0.50.0.tgz",
+      "integrity": "sha512-9yek4uRrWPd/pvQg1amAr8GJSTv1tcGhsbvLXjUnAaJfHZQ4OlycfpXUsSGujqPI3DkOOL6TvPl0jQaEooE6cQ==",
       "requires": {
-        "@babel/core": "^7.12.3",
-        "@babel/traverse": "^7.12.1",
-        "@babel/types": "^7.12.1",
-        "@embroider/core": "0.33.0",
-        "assert-never": "^1.1.0",
-        "ember-cli-babel": "^7.23.0",
-        "lodash": "^4.17.10",
-        "resolve": "^1.8.1",
+        "@embroider/shared-internals": "0.50.0",
+        "assert-never": "^1.2.1",
+        "ember-cli-babel": "^7.26.6",
+        "find-up": "^5.0.0",
+        "lodash": "^4.17.21",
+        "resolve": "^1.20.0",
         "semver": "^7.3.2"
       },
       "dependencies": {
+        "@embroider/shared-internals": {
+          "version": "0.50.0",
+          "resolved": "https://registry.npmjs.org/@embroider/shared-internals/-/shared-internals-0.50.0.tgz",
+          "integrity": "sha512-pu4YQGyoTsz+KWGTKwMyCMzhoJkUI9PuWiivRilKsywiFt8Ke4ns+nFNnHtPqPKChR72xY2qFjWOP5yAqZq3kw==",
+          "requires": {
+            "babel-import-util": "^1.1.0",
+            "ember-rfc176-data": "^0.3.17",
+            "fs-extra": "^9.1.0",
+            "lodash": "^4.17.21",
+            "resolve-package-path": "^4.0.1",
+            "semver": "^7.3.5",
+            "typescript-memoize": "^1.0.1"
+          }
+        },
+        "find-up": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+          "requires": {
+            "locate-path": "^6.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+          "requires": {
+            "p-locate": "^5.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
+        "p-locate": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+          "requires": {
+            "p-limit": "^3.0.2"
+          }
+        },
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+        },
+        "resolve-package-path": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/resolve-package-path/-/resolve-package-path-4.0.3.tgz",
+          "integrity": "sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==",
+          "requires": {
+            "path-root": "^0.1.1"
+          }
+        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
         }
       }
     },
@@ -25368,9 +25603,9 @@
       }
     },
     "@embroider/test-setup": {
-      "version": "0.43.5",
-      "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-0.43.5.tgz",
-      "integrity": "sha512-ke+5B0VR2343ZrOqV9Ok2LyA4m2q2ApM1Oy1RC8+3+OI5lDVg8UgZG9n/G2e77KPMFxnK3eVpXcPdLcdOxW6+w==",
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/@embroider/test-setup/-/test-setup-0.50.0.tgz",
+      "integrity": "sha512-skZQpUQWvDP/AlC3SZGZf8YAJv4zLM2Q9KzaZbIoZf5Veozx/G8rrU/l+wI0uatZPQ1VjxxSNzh3u8IhEu231A==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.21",
@@ -26567,8 +26802,7 @@
     "assert-never": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz",
-      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==",
-      "dev": true
+      "integrity": "sha512-TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -26665,8 +26899,7 @@
     "at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
     },
     "atob": {
       "version": "2.1.2",
@@ -26989,6 +27222,11 @@
         "babel-template": "^6.24.1"
       }
     },
+    "babel-import-util": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-import-util/-/babel-import-util-1.1.0.tgz",
+      "integrity": "sha512-sfzgAiJsUT1es9yrHAuJZuJfBkkOE7Og6rovAIwK/gNJX6MjDfWTprbPngdJZTd5ye4F3FvpvpQmvKXObRzVYA=="
+    },
     "babel-loader": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
@@ -28343,15 +28581,6 @@
         "tree-sync": "^1.2.2"
       }
     },
-    "broccoli-file-creator": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz",
-      "integrity": "sha512-l9zthHg6bAtnOfRr/ieZ1srRQEsufMZID7xGYRW3aBDv3u/3Eux+Iawl10tAGYE5pL9YB4n5X4vxkp6iNOoZ9g==",
-      "requires": {
-        "broccoli-plugin": "^1.1.0",
-        "mkdirp": "^0.5.1"
-      }
-    },
     "broccoli-filter": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/broccoli-filter/-/broccoli-filter-1.3.0.tgz",
@@ -41979,8 +42208,7 @@
     "typescript-memoize": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/typescript-memoize/-/typescript-memoize-1.0.1.tgz",
-      "integrity": "sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w==",
-      "dev": true
+      "integrity": "sha512-oJNge1qUrOK37d5Y6Ly2txKeuelYVsFtNF6U9kXIN7juudcQaHJQg2MxLOy0CqtkW65rVDYuTCOjnSIVPd8z3w=="
     },
     "uc.micro": {
       "version": "1.0.6",
@@ -42933,8 +43161,7 @@
     "yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="
     }
   }
 }
diff --git a/package.json b/package.json
index 2541cc6..3222c21 100644
--- a/package.json
+++ b/package.json
@@ -27,14 +27,14 @@
     "ember-compatibility-test": "ember try:each"
   },
   "dependencies": {
-    "broccoli-file-creator": "^1.1.1",
+    "@embroider/macros": "^0.50.0",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^5.7.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.4.2",
-    "@embroider/test-setup": "^0.43.5",
+    "@embroider/test-setup": "^0.50.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",
     "auto-changelog": "https://git@github.com/mansona/auto-changelog.git#epic",