diff --git a/package.json b/package.json
index 0685825b..8a41c696 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "@code-to-json/formatter": "0.5.49",
     "ember-cli-babel": "7.10.0",
     "ember-cli-typescript": "2.0.0-rc.2",
-    "ember-decorators": "5.2.0"
+    "ember-decorators": "6.1.1"
   },
   "husky": {
     "hooks": {
diff --git a/yarn.lock b/yarn.lock
index 5083e413..80cd1045 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -945,60 +945,28 @@
     ember-cli-babel-plugin-helpers "^1.0.0"
     ember-cli-version-checker "^3.0.0"
 
-"@ember-decorators/component@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ember-decorators/component/-/component-5.2.0.tgz#266955b517cf33a1cae4fa48c0794337b628a194"
-  integrity sha512-ZKsh116MQ0nWPxiQ2hls6Ok5QbZtSEJpt9LA330w2yMYy1c67YOD2XUG9fDyZ72M0P1Jzt/hd/8HJSqdJfjD5A==
-  dependencies:
-    "@ember-decorators/utils" "^5.2.0"
-    ember-cli-babel "^7.1.3"
-
-"@ember-decorators/controller@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ember-decorators/controller/-/controller-5.2.0.tgz#60a40f12fb1dbead8624bc6e4b27b2d64bc2d68c"
-  integrity sha512-6HZlY2gvdKRolgF8bIrYbbV9MtLpFHo8EtuUz/YZrJrIYPWYBMD5Myp+oB/wpH/qTiiY1a3XtmWFD3Lu+J6xGw==
-  dependencies:
-    "@ember-decorators/utils" "^5.2.0"
-    ember-cli-babel "^7.1.3"
-    ember-compatibility-helpers "^1.1.2"
-
-"@ember-decorators/data@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ember-decorators/data/-/data-5.2.0.tgz#8986190b94ff0c708c6c0969d49e14af2f334724"
-  integrity sha512-k1hZvrmWXNM0EWLQWtq5V1wquifblSSQJl1jMtHcs3C8jwu/SqYmwQdBEii2Y5CYclnM2xWaqy7kqPkSL7Qo2Q==
-  dependencies:
-    "@ember-decorators/utils" "^5.2.0"
-    ember-cli-babel "^7.1.3"
-    ember-compatibility-helpers "^1.1.2"
-
-"@ember-decorators/object@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ember-decorators/object/-/object-5.2.0.tgz#48307792b0f8981b637de0229716b890ca0c5be2"
-  integrity sha512-lKqwQ18DHT9TQCLQK6gyeskImaZBhe6C2qjD3wfbZDNxgn3FZI0u2GTSx5JZ3j8AraSHm/qT+1hOkUyktNBQsw==
+"@ember-decorators/component@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/component/-/component-6.1.1.tgz#b360dc4fa8e576ee1c840879399ef1745fd96e06"
+  integrity sha512-Cj8tY/c0MC/rsipqsiWLh3YVN72DK92edPYamD/HzvftwzC6oDwawWk8RmStiBnG9PG/vntAt41l3S7HSSA+1Q==
   dependencies:
-    "@ember-decorators/utils" "^5.2.0"
+    "@ember-decorators/utils" "^6.1.1"
     ember-cli-babel "^7.1.3"
-    ember-compatibility-helpers "^1.1.2"
 
-"@ember-decorators/service@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ember-decorators/service/-/service-5.2.0.tgz#639065d5784067ccbfa7e70bf6dc88ca54a89e20"
-  integrity sha512-FAovjVDCqqwBVmrGbkZu7SLt4DsXG/QBa/5WFwOddDQI8i3w8E1jk2E/yEhJOWriZc7MGAgBVVV6LESEskY8Hg==
+"@ember-decorators/object@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/object/-/object-6.1.1.tgz#50c922f5ac9af3ddd381cb6a43a031dfd9a70c7a"
+  integrity sha512-cb4CNR9sRoA31J3FCOFLDuR9ztM4wO9w1WlS4JeNRS7Z69SlB/XSXB/vplA3i9OOaXEy/zKWbu5ndZrHz0gvLw==
   dependencies:
-    "@ember-decorators/utils" "^5.2.0"
+    "@ember-decorators/utils" "^6.1.1"
     ember-cli-babel "^7.1.3"
-    ember-compatibility-helpers "^1.1.2"
 
-"@ember-decorators/utils@^5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@ember-decorators/utils/-/utils-5.2.0.tgz#75c79b6d2b69b7d9224a3697176bc198d4e274a9"
-  integrity sha512-GjVPkvqprQNOtsut16Nk3M/UWmqCDDFVSfvUyqasaPlYt9+d6w0y6XrjSnQ6+3VOyk4rUWE+3u0tJoukgeWVLw==
+"@ember-decorators/utils@^6.1.1":
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@ember-decorators/utils/-/utils-6.1.1.tgz#6b619814942b4fb3747cfa9f540c9f05283d7c5e"
+  integrity sha512-0KqnoeoLKb6AyoSU65TRF5T85wmS4uDn06oARddwNPxxf/lt5jQlh41uX3W7V/fWL9tPu8x1L1Vvpc80MN1+YA==
   dependencies:
-    babel-plugin-debug-macros "^0.2.0"
     ember-cli-babel "^7.1.3"
-    ember-cli-version-checker "^3.0.0"
-    ember-compatibility-helpers "^1.1.2"
-    semver "^6.0.0"
 
 "@ember/jquery@0.6.1":
   version "0.6.1"
@@ -5158,18 +5126,14 @@ ember-data@3.7.0:
     semver "^5.6.0"
     silent-error "^1.1.1"
 
-ember-decorators@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-5.2.0.tgz#6f8640765d30b5b3d1fb9b29ead1552427e25943"
-  integrity sha512-V0nSC/P0SRDfuv8zsB/UrV5nfp7Em2LBbfyS5nWIGteynPowxSUcFZtds4a/gW1anwzZT2VQgCftjmjcRMoDcw==
-  dependencies:
-    "@ember-decorators/component" "^5.2.0"
-    "@ember-decorators/controller" "^5.2.0"
-    "@ember-decorators/data" "^5.2.0"
-    "@ember-decorators/object" "^5.2.0"
-    "@ember-decorators/service" "^5.2.0"
-    ember-cli-babel "^7.1.3"
-    semver "^6.0.0"
+ember-decorators@6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-6.1.1.tgz#6d770f8999cf5a413a1ee459afd520838c0fc470"
+  integrity sha512-63vZPntPn1aqMyeNRLoYjJD+8A8obd+c2iZkJflswpDRNVIsp2m7aQdSCtPt4G0U/TEq2251g+N10maHX3rnJQ==
+  dependencies:
+    "@ember-decorators/component" "^6.1.1"
+    "@ember-decorators/object" "^6.1.1"
+    ember-cli-babel "^7.7.3"
 
 ember-export-application-global@2.0.0:
   version "2.0.0"