diff --git a/addons/api/package.json b/addons/api/package.json
index 6acac254a..42c6aa541 100644
--- a/addons/api/package.json
+++ b/addons/api/package.json
@@ -35,7 +35,7 @@
     "ember-cli-mirage": "^3.0.3",
     "ember-data": "~5.3.12",
     "miragejs": "^0.1.48",
-    "tracked-built-ins": "^3.1.1"
+    "tracked-built-ins": "^4.0.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.25.1",
diff --git a/addons/core/package.json b/addons/core/package.json
index 8b4cc1f94..0f42275a9 100644
--- a/addons/core/package.json
+++ b/addons/core/package.json
@@ -41,7 +41,7 @@
     "ember-cli-htmlbars": "^6.3.0",
     "ember-cli-sass": "^11.0.1",
     "ember-concurrency": "^4.0.3",
-    "ember-feature-flags": "^6.0.0",
+    "ember-feature-flags": "^7.0.0",
     "ember-intl": "^7.1.8",
     "ember-loading": "^2.0.0",
     "ember-truth-helpers": "^4.0.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 24daec657..ef1e86570 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -73,8 +73,8 @@ importers:
         specifier: ^0.1.48
         version: 0.1.48
       tracked-built-ins:
-        specifier: ^3.1.1
-        version: 3.4.0(@babel/core@7.27.1)
+        specifier: ^4.0.0
+        version: 4.0.0(@babel/core@7.27.1)
     devDependencies:
       '@babel/eslint-parser':
         specifier: ^7.25.1
@@ -366,8 +366,8 @@ importers:
         specifier: ^4.0.3
         version: 4.0.4(@babel/core@7.27.1)(@glint/template@1.5.2)
       ember-feature-flags:
-        specifier: ^6.0.0
-        version: 6.1.0
+        specifier: ^7.0.0
+        version: 7.0.0(@glint/template@1.5.2)(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8))(webpack@5.99.8)
       ember-intl:
         specifier: ^7.1.8
         version: 7.1.8(@ember/test-helpers@5.2.2(@babel/core@7.27.1)(@glint/template@1.5.2))(@glint/template@1.5.2)(typescript@5.8.3)(webpack@5.99.8)
@@ -927,8 +927,8 @@ importers:
         specifier: ^11.0.0
         version: 11.1.0(postcss@8.5.3)(stylelint@15.11.0(typescript@5.8.3))
       tracked-built-ins:
-        specifier: ^3.3.0
-        version: 3.4.0(@babel/core@7.27.1)
+        specifier: ^4.0.0
+        version: 4.0.0(@babel/core@7.27.1)
       webpack:
         specifier: ^5.95.0
         version: 5.99.8
@@ -1144,8 +1144,8 @@ importers:
         specifier: ^11.0.0
         version: 11.1.0(postcss@8.5.3)(stylelint@15.11.0(typescript@5.8.3))
       tracked-built-ins:
-        specifier: ^3.3.0
-        version: 3.4.0(@babel/core@7.27.1)
+        specifier: ^4.0.0
+        version: 4.0.0(@babel/core@7.27.1)
       webpack:
         specifier: ^5.95.0
         version: 5.99.8
@@ -4009,6 +4009,9 @@ packages:
   content-tag@2.0.3:
     resolution: {integrity: sha512-htLIdtfhhKW2fHlFLnZH7GFzHSdSpHhDLrWVswkNiiPMZ5uXq5JfrGboQKFhNQuAAFF8VNB2EYUj3MsdJrKKpg==}
 
+  content-tag@3.1.3:
+    resolution: {integrity: sha512-4Kiv9mEroxuMXfWUNUHcljVJgxThCNk7eEswdHMXdzJnkBBaYDqDwzHkoh3F74JJhfU3taJOsgpR6oEGIDg17g==}
+
   content-type@1.0.5:
     resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
     engines: {node: '>= 0.6'}
@@ -4688,9 +4691,11 @@ packages:
       qunit:
         optional: true
 
-  ember-feature-flags@6.1.0:
-    resolution: {integrity: sha512-PH4nmJCzMWs4on7crK8c4MyTDZ1EBg7qBYa7ZEYGqpSDRm/3apF0vlDDtA3lSaBCve2V/+djltkQnC06bf4Rwg==}
-    engines: {node: 8.* || >= 10.*}
+  ember-feature-flags@7.0.0:
+    resolution: {integrity: sha512-+9XuZxqntTdD8RnFGziy2JW05hFmMe/4ri4StI5mXUpldfpg5FKMxen61cS/tnr9lNj12UTza6bzmEQnkhsHJg==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      ember-source: '>= 4.0.0'
 
   ember-focus-trap@1.1.1:
     resolution: {integrity: sha512-5tOWu6eV1UoNZE+P9Gl9lJXNrENZVCoOXi52ePb7JOrOZ3ckOk1OkPsFwR4Jym9VJ7vZ6S3Z3D8BrkFa2aCpYw==}
@@ -4844,6 +4849,10 @@ packages:
     resolution: {integrity: sha512-OS8TUVG2kQYYwP3netunLVfeijPoOKIs1SvPQRTNOQX4Pu8xGGBEZmrv0U1YTnQn12Eg+p6w/0UdGbUnITjyzw==}
     engines: {node: 12.* || >= 14}
 
+  ember-template-imports@4.3.0:
+    resolution: {integrity: sha512-jZ5D6KLKU8up/AynZltmKh4lkXBPgTGSPgomprI/55XvIVqn42UNUpEz7ra/mO3QiGODDZOUesbggPe49i38sQ==}
+    engines: {node: 16.* || >= 18}
+
   ember-template-lint-plugin-prettier@5.0.0:
     resolution: {integrity: sha512-aXUYM4yuIdPZ80+AsAU8QBwGSJJ/aAkRsNcQ5vI5HmXiBjzHlDc/ZhmP6iVcYuCmoA/3iKcssMAYwIDbuby4pg==}
     engines: {node: ^16.0.0 || ^18.0.0 || >=20.0.0}
@@ -8525,8 +8534,8 @@ packages:
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
-  tracked-built-ins@3.4.0:
-    resolution: {integrity: sha512-aRwWQXC3VkY50oYxS7wKZiavkjf3uaN+UYUH30D5gxUqbxDN2LnNsfWyDfckmxHUGw4gJDH5lpRS0jX/tim0vw==}
+  tracked-built-ins@4.0.0:
+    resolution: {integrity: sha512-0Jl43A1SDZd+yYCJvXfgDSn4Wk/zcawkyFTBPqOETU5UJRngnVEnQ8oOjawqPRg6qja3sKjIQ8z6X9xJzcUTUA==}
 
   tracked-maps-and-sets@3.0.2:
     resolution: {integrity: sha512-UIRcWsX1kDOcC/Q2R58weYWlw01EnmWWBwUv3okWS+zMBvsgIfYoO6veHhuNE3hgzWCEImNp46QS5CyKnw5QUA==}
@@ -12821,6 +12830,8 @@ snapshots:
 
   content-tag@2.0.3: {}
 
+  content-tag@3.1.3: {}
+
   content-type@1.0.5: {}
 
   continuable-cache@0.3.1: {}
@@ -13985,11 +13996,19 @@ snapshots:
       - supports-color
       - webpack
 
-  ember-feature-flags@6.1.0:
+  ember-feature-flags@7.0.0(@glint/template@1.5.2)(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8))(webpack@5.99.8):
     dependencies:
-      ember-cli-babel: 7.26.11
+      '@babel/core': 7.27.1
+      '@ember/string': 4.0.1
+      ember-auto-import: 2.10.0(@glint/template@1.5.2)(webpack@5.99.8)
+      ember-cli-babel: 8.2.0(@babel/core@7.27.1)
+      ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8)
+      ember-template-imports: 4.3.0
+      tracked-built-ins: 4.0.0(@babel/core@7.27.1)
     transitivePeerDependencies:
+      - '@glint/template'
       - supports-color
+      - webpack
 
   ember-focus-trap@1.1.1(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8)):
     dependencies:
@@ -14321,6 +14340,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  ember-template-imports@4.3.0:
+    dependencies:
+      broccoli-stew: 3.0.0
+      content-tag: 3.1.3
+      ember-cli-version-checker: 5.1.2
+    transitivePeerDependencies:
+      - supports-color
+
   ember-template-lint-plugin-prettier@5.0.0(ember-template-lint@6.1.0)(prettier@3.6.2):
     dependencies:
       '@prettier/sync': 0.2.1(prettier@3.6.2)
@@ -18697,7 +18724,7 @@ snapshots:
 
   tr46@0.0.3: {}
 
-  tracked-built-ins@3.4.0(@babel/core@7.27.1):
+  tracked-built-ins@4.0.0(@babel/core@7.27.1):
     dependencies:
       '@embroider/addon-shim': 1.10.0
       decorator-transforms: 2.3.0(@babel/core@7.27.1)
diff --git a/ui/admin/package.json b/ui/admin/package.json
index 5210546e1..6e2736771 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -103,7 +103,7 @@
     "stylelint": "^15.11.0",
     "stylelint-config-prettier-scss": "^0.0.1",
     "stylelint-config-standard-scss": "^11.0.0",
-    "tracked-built-ins": "^3.3.0",
+    "tracked-built-ins": "^4.0.0",
     "webpack": "^5.95.0"
   },
   "engines": {
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 36d12f2b9..f178f5f32 100644
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -112,7 +112,7 @@
     "stylelint-config-prettier-scss": "^0.0.1",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-config-standard-scss": "^11.0.0",
-    "tracked-built-ins": "^3.3.0",
+    "tracked-built-ins": "^4.0.0",
     "webpack": "^5.95.0"
   },
   "engines": {