diff --git a/package-lock.json b/package-lock.json
index 416632ce3..91c9b6b74 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -63,7 +63,7 @@
         "ember-qunit": "7.0.0",
         "ember-resolver": "13.1.0",
         "ember-sinon-qunit": "7.5.0",
-        "ember-source": "5.12.0",
+        "ember-source": "6.2.0",
         "ember-template-imports": "4.3.0",
         "ember-template-lint": "6.1.0",
         "ember-template-lint-plugin-prettier": "5.0.0",
@@ -33324,14 +33324,15 @@
       }
     },
     "node_modules/ember-source": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-5.12.0.tgz",
-      "integrity": "sha512-2MWlJmQEeeiIk9p5CDMuvD470YPi7/4wXgU41ftbWc9svwF+0usoe4PLoLC0T/jV6YX+3SY5tumQfxLSLoFhmQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-6.2.0.tgz",
+      "integrity": "sha512-J1IFfKldkRzbWXUr0oUU6JKQ9fEkW4Dq4qEus9WmxDArNWTl6/Yr1g5uXXbO/4XO8++6h0pv6G9gRmasYfl/JA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.24.4",
         "@ember/edition-utils": "^1.2.0",
+        "@embroider/addon-shim": "^1.9.0",
         "@glimmer/compiler": "0.92.4",
         "@glimmer/destroyable": "0.92.3",
         "@glimmer/env": "^0.1.7",
@@ -33355,7 +33356,7 @@
         "broccoli-funnel": "^3.0.8",
         "broccoli-merge-trees": "^4.2.0",
         "chalk": "^4.0.0",
-        "ember-auto-import": "^2.6.3",
+        "ember-auto-import": "^2.10.0",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-get-component-path-option": "^1.0.0",
         "ember-cli-is-package-missing": "^1.0.0",
@@ -33376,7 +33377,7 @@
         "node": ">= 18.*"
       },
       "peerDependencies": {
-        "@glimmer/component": "^1.1.2"
+        "@glimmer/component": ">= 1.1.2"
       }
     },
     "node_modules/ember-source/node_modules/@glimmer/global-context": {
diff --git a/package.json b/package.json
index 4cebfa8d2..260bec02a 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "ember-qunit": "7.0.0",
     "ember-resolver": "13.1.0",
     "ember-sinon-qunit": "7.5.0",
-    "ember-source": "5.12.0",
+    "ember-source": "6.2.0",
     "ember-template-imports": "4.3.0",
     "ember-template-lint": "6.1.0",
     "ember-template-lint-plugin-prettier": "5.0.0",