diff --git a/package.json b/package.json
index 48c69bd2..43d8c2ea 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "ember-cli-sri": "2.1.1",
     "ember-cli-template-lint": "1.0.0",
     "ember-cli-uglify": "3.0.0",
-    "ember-data": "3.28.5",
+    "ember-data": "4.0.2",
     "ember-decorators": "6.1.1",
     "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
diff --git a/yarn.lock b/yarn.lock
index 8c59a4a3..f66c4cf8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3784,49 +3784,52 @@
     babel-runtime "6.26.0"
     execa "0.9.0"
 
-"@ember-data/adapter@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-3.28.5.tgz#34c3bca462983197803f2a9f571fc581da7bad7e"
-  integrity sha512-ywfm5F/yFujnR+UmKw9NHIStrxvEP/nIyL2/7YzZnqbVq8Ny+LVKyuRB0bRY0iZQ+IAWQODbM59A8YjcVRC6Cg==
+"@ember-data/adapter@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/adapter/-/adapter-4.0.2.tgz#b7d05f80722f0f92d7876ae0538b7ac0d30ecd0b"
+  integrity sha512-tOqlpaJSlgsA0xv+kXcLYFlhsgIJ/pJc/ldUPkJAyq47LP0l/u7zqY+u+ek6TA+qRGU1YLT5eUVQ9GwdEbRcQA==
   dependencies:
-    "@ember-data/private-build-infra" "3.28.5"
-    "@ember-data/store" "3.28.5"
+    "@ember-data/private-build-infra" "4.0.2"
+    "@ember-data/store" "4.0.2"
     "@ember/edition-utils" "^1.2.0"
     "@ember/string" "^3.0.0"
+    ember-auto-import "^2.2.4"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
     ember-cli-typescript "^4.1.0"
 
-"@ember-data/canary-features@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-3.28.5.tgz#74cee8904deb0462f11f095fd9683114e23cc444"
-  integrity sha512-mJzaJ6oCeP4QEJ+9BOr0mdsQ2970yECmiBePadoGiJRJ9JRQcc4GoZfaO/W6Ej7nmp/kSWC/Pc3ROaSkq33SJg==
+"@ember-data/canary-features@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/canary-features/-/canary-features-4.0.2.tgz#1adcdc537aa96daff446c741d36bede8e85b6bc6"
+  integrity sha512-apTSVB+ayY9rMXg8N8mGREFHd5Ymfi7tM30815L5Yb96VlYDk5u8vGImCXqdXKPIgFVn+WGao0uHWCXRB2KNWg==
   dependencies:
     ember-cli-babel "^7.26.6"
     ember-cli-typescript "^4.1.0"
 
-"@ember-data/debug@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-3.28.5.tgz#d5cfd8fb33d13f30eaa3038cd0d69714561cf3b4"
-  integrity sha512-NzbeD5Ax6UvJ6/wFt2ud7AZdIfRLeLH+FP9xzmnqT7NN+Eyn9eti4eqwFgyYljALURpCOxLQ/BhQOtUSWfjOFw==
+"@ember-data/debug@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/debug/-/debug-4.0.2.tgz#b244e07689305ae9dd070915d12b7cfe371ad19c"
+  integrity sha512-MhyPF90LsksihSn8GvqslG/H8ASGLiaNJ2YfdcI+lOGgoCsuNtxbcfcfFxQE5WNbnjkNxohZznAQ/tcwch4TjA==
   dependencies:
-    "@ember-data/private-build-infra" "3.28.5"
+    "@ember-data/private-build-infra" "4.0.2"
     "@ember/edition-utils" "^1.2.0"
     "@ember/string" "^3.0.0"
+    ember-auto-import "^2.2.4"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
     ember-cli-typescript "^4.1.0"
 
-"@ember-data/model@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-3.28.5.tgz#5aa2c684226ccf3e633f036795bfdfb87d7d19b4"
-  integrity sha512-g95kqeJccZxo1f9j95GWYbgJXAhCE7xwSiwIBs68ZzEAHV74dE/2QapwC8wsN9t89fSpDG/Lz8JXf0EUMPoglA==
+"@ember-data/model@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/model/-/model-4.0.2.tgz#37d65838f1cd1704781fc4cffa6acbe18abdd4f9"
+  integrity sha512-dkwz3iKNp03ACqbD6oTp4ouqSz/ja41Q17jjb/KKK65ym6J0Y6OvtMVBlzHb+UpnHfKVkKAdpslk8svUm3T8vg==
   dependencies:
-    "@ember-data/canary-features" "3.28.5"
-    "@ember-data/private-build-infra" "3.28.5"
-    "@ember-data/store" "3.28.5"
+    "@ember-data/canary-features" "4.0.2"
+    "@ember-data/private-build-infra" "4.0.2"
+    "@ember-data/store" "4.0.2"
     "@ember/edition-utils" "^1.2.0"
     "@ember/string" "^3.0.0"
+    ember-auto-import "^2.2.4"
     ember-cached-decorator-polyfill "^0.1.4"
     ember-cli-babel "^7.26.6"
     ember-cli-string-utils "^1.1.0"
@@ -3835,13 +3838,13 @@
     ember-compatibility-helpers "^1.2.0"
     inflection "~1.13.1"
 
-"@ember-data/private-build-infra@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-3.28.5.tgz#f3f4ac9f2d728abd3652ae0096ab3b3983841051"
-  integrity sha512-uyiUE/vBunvulFfVWwf/eFLRl3hBhBFoTG+GTjhTGdosLmACjzcaOGe9bGNhmnGBQZLPckWSgM1qrCKDEQCgPw==
+"@ember-data/private-build-infra@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/private-build-infra/-/private-build-infra-4.0.2.tgz#e2af4a9cab3f720c4f702da1236c1034d5c7d3cd"
+  integrity sha512-bFPTSVvcGkvpCRn5dkvZLEZgjPxzWAakpqsKpC6UCmWkVHj1eDeuPBPpGkBZD9MVK95Y8VFmD0vIABwDlBFTmw==
   dependencies:
     "@babel/plugin-transform-block-scoping" "^7.8.3"
-    "@ember-data/canary-features" "3.28.5"
+    "@ember-data/canary-features" "4.0.2"
     "@ember/edition-utils" "^1.2.0"
     babel-plugin-debug-macros "^0.3.3"
     babel-plugin-filter-imports "^4.0.0"
@@ -3867,15 +3870,16 @@
     semver "^7.1.3"
     silent-error "^1.1.1"
 
-"@ember-data/record-data@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-3.28.5.tgz#fbfaf6fafecbd793fba9ca7d8ca1f96926368f28"
-  integrity sha512-VdJqu1GtYOFVtPWEU7PflGfDT2lZKJqI0rbCN+W2Nf1iLjpzEoB7nM05RnCKL0EhAwn/UKhOh1c3/Ztm5N9YNw==
+"@ember-data/record-data@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/record-data/-/record-data-4.0.2.tgz#7e5aab655591758346b20954ace27c83331b2346"
+  integrity sha512-F1oiMcmeGQkaVp50j6MTeE7sAPSBLUhMnfNRDO70jhVIcMmj0W1W6qvRbk3tVOq+TZ7+Jc8TFWh+43gC6EBfsQ==
   dependencies:
-    "@ember-data/canary-features" "3.28.5"
-    "@ember-data/private-build-infra" "3.28.5"
-    "@ember-data/store" "3.28.5"
+    "@ember-data/canary-features" "4.0.2"
+    "@ember-data/private-build-infra" "4.0.2"
+    "@ember-data/store" "4.0.2"
     "@ember/edition-utils" "^1.2.0"
+    ember-auto-import "^2.2.4"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
     ember-cli-typescript "^4.1.0"
@@ -3885,26 +3889,29 @@
   resolved "https://registry.yarnpkg.com/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz#ecb86efdf5d7733a76ff14ea651a1b0ed1f8a843"
   integrity sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==
 
-"@ember-data/serializer@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-3.28.5.tgz#572ead11e595428607a58cdecd612f6bb97cd114"
-  integrity sha512-EAkkA0VFhfqf3FYvvdvcqAcA2kfVHimmyI0wFGxDwMUGGAJAA+SnPuPtAjM6YD193SMSsU8ixfjbKH72BFqfJg==
+"@ember-data/serializer@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/serializer/-/serializer-4.0.2.tgz#8aeaa458787a0d2bb54836674110a5c93049e791"
+  integrity sha512-He8olHmgARXrHx+Gi1F2z4BSN2YmLm3GnIjPuTXjrRpgRV1u7EFrt1H84yo3voYA9c7PIIHoxhLyitm2sfWyBQ==
   dependencies:
-    "@ember-data/private-build-infra" "3.28.5"
-    "@ember-data/store" "3.28.5"
+    "@ember-data/private-build-infra" "4.0.2"
+    "@ember-data/store" "4.0.2"
+    ember-auto-import "^2.2.4"
     ember-cli-babel "^7.26.6"
     ember-cli-test-info "^1.0.0"
     ember-cli-typescript "^4.1.0"
 
-"@ember-data/store@3.28.5":
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-3.28.5.tgz#a0038a3b09fdcf233bb070438fb8538c509801fa"
-  integrity sha512-UTCohm4u9V8qaISjO2mhVG2A62g/Gnb0zAPd4CnV84lyowE0LQw1ACN9KWRSgeaTOAUfEWP9MkQeuQQuikYtig==
+"@ember-data/store@4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@ember-data/store/-/store-4.0.2.tgz#7fe95a9e1ff1b146244a5742962293080c6ecadf"
+  integrity sha512-+WJUAP1Xz+N+UAssEqipuBsQ38HoHCmQL470Hr6aZ5jK2rs3yZ4X3GGa+Mj2aRNTTDbNEP3w7tnTQyXElzZkJA==
   dependencies:
-    "@ember-data/canary-features" "3.28.5"
-    "@ember-data/private-build-infra" "3.28.5"
+    "@ember-data/canary-features" "4.0.2"
+    "@ember-data/private-build-infra" "4.0.2"
     "@ember/string" "^3.0.0"
     "@glimmer/tracking" "^1.0.4"
+    ember-auto-import "^2.2.4"
+    ember-cached-decorator-polyfill "^0.1.4"
     ember-cli-babel "^7.26.6"
     ember-cli-path-utils "^1.0.0"
     ember-cli-typescript "^4.1.0"
@@ -9178,7 +9185,7 @@ ember-auto-import@^1.11.3:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-auto-import@^2.2.0:
+ember-auto-import@^2.2.0, ember-auto-import@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.4.tgz#68c08cb0b7533293024c97387fc449b00561185a"
   integrity sha512-iXHH+bSMP/uWvJmIhjt+PZz4ymqOLccIxZUouVcUFLKA5EAWE7gamlA684m0pIbSE/V9zKpOul4OfIgKXFprBg==
@@ -9890,22 +9897,23 @@ ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.2:
     fs-extra "^9.1.0"
     semver "^5.4.1"
 
-ember-data@3.28.5:
-  version "3.28.5"
-  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.28.5.tgz#9ba88ed90b8d3ca319cd85f4dfd2c448202f898b"
-  integrity sha512-7zUlYt4GMAJIDQ977cdOTV7J+bWmchV1+1vFg4iSv9Vx+rBnk8816BcYEqkuDq8VfN9Wp/WwqrPV+qBZZ3lyPg==
-  dependencies:
-    "@ember-data/adapter" "3.28.5"
-    "@ember-data/debug" "3.28.5"
-    "@ember-data/model" "3.28.5"
-    "@ember-data/private-build-infra" "3.28.5"
-    "@ember-data/record-data" "3.28.5"
-    "@ember-data/serializer" "3.28.5"
-    "@ember-data/store" "3.28.5"
+ember-data@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-4.0.2.tgz#57e5aac358466ce52a3264051ddc268dc44c3a26"
+  integrity sha512-vpz44QuQS1QRRV18idb7N2UH8PIvfwtBXyxrAetB9W/9rZP7aU00y38flJN6ioeZRI3iVhdpNoqhkpUsm/xztQ==
+  dependencies:
+    "@ember-data/adapter" "4.0.2"
+    "@ember-data/debug" "4.0.2"
+    "@ember-data/model" "4.0.2"
+    "@ember-data/private-build-infra" "4.0.2"
+    "@ember-data/record-data" "4.0.2"
+    "@ember-data/serializer" "4.0.2"
+    "@ember-data/store" "4.0.2"
     "@ember/edition-utils" "^1.2.0"
     "@ember/string" "^3.0.0"
     "@glimmer/env" "^0.1.7"
     broccoli-merge-trees "^4.2.0"
+    ember-auto-import "^2.2.4"
     ember-cli-babel "^7.26.6"
     ember-cli-typescript "^4.1.0"
     ember-inflector "^4.0.1"