diff --git a/package.json b/package.json
index b1c7b656..552c56e8 100644
--- a/package.json
+++ b/package.json
@@ -47,12 +47,12 @@
     "@ember/optional-features": "0.7.0",
     "@mike-north/js-lib-renovate-config": "1.3.1",
     "@mike-north/js-lib-semantic-release-config": "1.0.1",
-    "@types/ember": "3.1.2",
+    "@types/ember": "3.16.10",
     "@types/ember-qunit": "3.4.15",
     "@types/ember-test-helpers": "1.0.10",
     "@types/ember-testing-helpers": "0.0.4",
     "@types/ember__test-helpers": "0.7.12",
-    "@types/qunit": "2.9.6",
+    "@types/qunit": "2.19.6",
     "@types/rsvp": "4.0.4",
     "broccoli-asset-rev": "3.0.0",
     "ember-ajax": "5.1.1",
diff --git a/yarn.lock b/yarn.lock
index 17d4b4af..cb589dd9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1741,29 +1741,27 @@
     "@types/jquery" "*"
     "@types/rsvp" "*"
 
-"@types/ember@3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.1.2.tgz#b795e41f4a5569447c006e293195e62dc139cced"
-  integrity sha512-Z4jxklUlnoWEkenLaMDDmzguL3UUcAIaCiu28nNYlIovWTGmvKuJgUKSqd+03j4jjzaz+yz0fepM408XULew/A==
-  dependencies:
-    "@types/ember__application" "*"
-    "@types/ember__array" "*"
-    "@types/ember__component" "*"
-    "@types/ember__controller" "*"
-    "@types/ember__debug" "*"
-    "@types/ember__engine" "*"
-    "@types/ember__error" "*"
-    "@types/ember__object" "*"
-    "@types/ember__polyfills" "*"
-    "@types/ember__routing" "*"
-    "@types/ember__runloop" "*"
-    "@types/ember__service" "*"
-    "@types/ember__string" "*"
-    "@types/ember__template" "*"
-    "@types/ember__test" "*"
-    "@types/ember__utils" "*"
-    "@types/htmlbars-inline-precompile" "*"
-    "@types/jquery" "*"
+"@types/ember@3.16.10":
+  version "3.16.10"
+  resolved "https://registry.yarnpkg.com/@types/ember/-/ember-3.16.10.tgz#6593913b5e61fe31af495fd8285b58a79c2a1655"
+  integrity sha512-HiSj3/a5f0JGQ4eveyGzC1QIviTFARcZXvtkNxb9p+2a7xyOo4sxLq7TwPKXelsvBU+gd+m5IIoq5IcdTbRKtw==
+  dependencies:
+    "@types/ember__application" "^3"
+    "@types/ember__array" "^3"
+    "@types/ember__component" "^3"
+    "@types/ember__controller" "^3"
+    "@types/ember__debug" "^3"
+    "@types/ember__engine" "^3"
+    "@types/ember__error" "^3"
+    "@types/ember__object" "^3"
+    "@types/ember__polyfills" "^3"
+    "@types/ember__routing" "^3"
+    "@types/ember__runloop" "^3"
+    "@types/ember__service" "^3"
+    "@types/ember__string" "^2"
+    "@types/ember__template" "^3"
+    "@types/ember__test" "^3"
+    "@types/ember__utils" "^3"
     "@types/rsvp" "*"
 
 "@types/ember__application@*":
@@ -1776,6 +1774,16 @@
     "@types/ember__object" "*"
     "@types/ember__routing" "*"
 
+"@types/ember__application@^3":
+  version "3.16.7"
+  resolved "https://registry.yarnpkg.com/@types/ember__application/-/ember__application-3.16.7.tgz#083865a4ae9fb117cb6c98ac72a0aefefd40b65c"
+  integrity sha512-WoR1OAJzxzuHMkGAg3IDgM44dGx/9sTBAHtggJGZ3UdF/bWxTjwD1CIvhhA/PoPZ3/r132RPPdeO8OA32kTvVw==
+  dependencies:
+    "@types/ember__application" "^3"
+    "@types/ember__engine" "^3"
+    "@types/ember__object" "^3"
+    "@types/ember__routing" "^3"
+
 "@types/ember__array@*":
   version "3.16.4"
   resolved "https://registry.yarnpkg.com/@types/ember__array/-/ember__array-3.16.4.tgz#d61b5b876e4976de03aa027ea89cb48cd640d49d"
@@ -1784,6 +1792,14 @@
     "@types/ember__array" "*"
     "@types/ember__object" "*"
 
+"@types/ember__array@^3":
+  version "3.16.7"
+  resolved "https://registry.yarnpkg.com/@types/ember__array/-/ember__array-3.16.7.tgz#1710424b5de289ea8094202259eb2f0a7f8c8552"
+  integrity sha512-6T5Waj3igtUKgcSVpZ3UNSAKSkynZ5d/BJ1UsOdY5PJmzYw9qexAfKrDIz/iYcseBdhqHXzxGDdEtqATESpnyw==
+  dependencies:
+    "@types/ember__array" "^3"
+    "@types/ember__object" "^3"
+
 "@types/ember__component@*":
   version "3.16.6"
   resolved "https://registry.yarnpkg.com/@types/ember__component/-/ember__component-3.16.6.tgz#affc4798ee97f58747f5d173b8f739ddab26e551"
@@ -1793,6 +1809,15 @@
     "@types/ember__object" "*"
     "@types/jquery" "*"
 
+"@types/ember__component@^3":
+  version "3.16.10"
+  resolved "https://registry.yarnpkg.com/@types/ember__component/-/ember__component-3.16.10.tgz#e208593db81cbdf3704e472ed1ff0522777d95e8"
+  integrity sha512-v0KhPCPxwQi26avcPoce5ozSe2ylFtD03ivdmNpkR63z9bSdaY1vI0osgH8/d3OSMr+8FS27r0gDZ5nAJq1sLA==
+  dependencies:
+    "@types/ember__component" "^3"
+    "@types/ember__object" "^3"
+    "@types/jquery" "*"
+
 "@types/ember__controller@*":
   version "3.16.6"
   resolved "https://registry.yarnpkg.com/@types/ember__controller/-/ember__controller-3.16.6.tgz#1fbb5f9483b9b9fd59b78f7289e6bd382e457f9c"
@@ -1800,6 +1825,13 @@
   dependencies:
     "@types/ember__object" "*"
 
+"@types/ember__controller@^3":
+  version "3.16.10"
+  resolved "https://registry.yarnpkg.com/@types/ember__controller/-/ember__controller-3.16.10.tgz#603ae11df8cc753d2443483dacf3a05a234c2b25"
+  integrity sha512-qhsrVrmfPSYAWX3pokoX+MY3/WwCQbC6zkDIMIlirKoFOvo92BcqoyhDjKXqAa2ixMWWq6/QnIitsR6fGlJpWg==
+  dependencies:
+    "@types/ember__object" "^3"
+
 "@types/ember__debug@*":
   version "3.16.5"
   resolved "https://registry.yarnpkg.com/@types/ember__debug/-/ember__debug-3.16.5.tgz#ce04532c100fdc1c97c9f308d69a88d6e956db97"
@@ -1809,6 +1841,15 @@
     "@types/ember__engine" "*"
     "@types/ember__object" "*"
 
+"@types/ember__debug@^3":
+  version "3.16.9"
+  resolved "https://registry.yarnpkg.com/@types/ember__debug/-/ember__debug-3.16.9.tgz#dea17bb612e0c065e7605cc7e1d58fbbbd9ef247"
+  integrity sha512-mw/WqS2V0sgG/f5qrpwQ0GbbLTCXIs7HxYB3/GRQffoiBPEKcTnXkBVBjmhWGd9qgfuN1JQnMTxNquil3p8pzw==
+  dependencies:
+    "@types/ember__debug" "^3"
+    "@types/ember__engine" "^3"
+    "@types/ember__object" "^3"
+
 "@types/ember__destroyable@*":
   version "3.22.0"
   resolved "https://registry.yarnpkg.com/@types/ember__destroyable/-/ember__destroyable-3.22.0.tgz#2af2c27f5d8996694c3f0fe906e2536b2e4c5aca"
@@ -1822,11 +1863,24 @@
     "@types/ember__engine" "*"
     "@types/ember__object" "*"
 
+"@types/ember__engine@^3":
+  version "3.16.6"
+  resolved "https://registry.yarnpkg.com/@types/ember__engine/-/ember__engine-3.16.6.tgz#6de54634f69bac65beafbd6b68d2f4cf0d673539"
+  integrity sha512-IfStcDWd1fbF6CMwqVvP3IG+6wKd93q2VNUIBVsk951ky0FJGTZO1PFmCM6YLcz4Iuohp6nPy/vw76q+bSwWzQ==
+  dependencies:
+    "@types/ember__engine" "^3"
+    "@types/ember__object" "^3"
+
 "@types/ember__error@*":
   version "3.16.1"
   resolved "https://registry.yarnpkg.com/@types/ember__error/-/ember__error-3.16.1.tgz#752d977f4ee35d4fa66bcfeebae6e85240fc62a6"
   integrity sha512-bnB58krc18B8qgSMsRBbrVbNb4msyb8pMzS9Yo3brw/bRjuPb1ONUrjieAVHeespXlXNJOusvvX/pji641iCPQ==
 
+"@types/ember__error@^3":
+  version "3.16.3"
+  resolved "https://registry.yarnpkg.com/@types/ember__error/-/ember__error-3.16.3.tgz#dbe481fdde1dc671d7d4261c451bffd4f8874e4a"
+  integrity sha512-fi8Lr9vNtt+gxruaiDl+mcJ0GT7W3ZYtbR4/Q0jMufKTLyw0+YE6XikNfnUb1BhbJrzElEa5BhXBJRW/A4pdYA==
+
 "@types/ember__object@*":
   version "3.12.6"
   resolved "https://registry.yarnpkg.com/@types/ember__object/-/ember__object-3.12.6.tgz#5f77662881e3c6f877d63e08b46861c52a36714a"
@@ -1835,11 +1889,24 @@
     "@types/ember__object" "*"
     "@types/rsvp" "*"
 
+"@types/ember__object@^3":
+  version "3.12.10"
+  resolved "https://registry.yarnpkg.com/@types/ember__object/-/ember__object-3.12.10.tgz#7421f2211e4f0058e6a57ad61176e51b2719b04e"
+  integrity sha512-vTHmMUPLX277ZCK1WyHj2RGcf73TUgUIc/89f+gUTzQNg1OaioAmuAxBVMW81Xp5rk710X0SDIhb76+HhDGEEA==
+  dependencies:
+    "@types/ember__object" "^3"
+    "@types/rsvp" "*"
+
 "@types/ember__polyfills@*":
   version "3.12.1"
   resolved "https://registry.yarnpkg.com/@types/ember__polyfills/-/ember__polyfills-3.12.1.tgz#aed838e35a3e8670d247333d4c7ea2c2f7b3c43e"
   integrity sha512-Xw9RxFizB8guT6YGg3VNi5tjbzAjqk+bLtAJ1oVl2I1FylKrRFh0bwobxT2K0BF/i0QFEYlqckHpN/OoCpkvkA==
 
+"@types/ember__polyfills@^3":
+  version "3.12.4"
+  resolved "https://registry.yarnpkg.com/@types/ember__polyfills/-/ember__polyfills-3.12.4.tgz#4df839c8413acb2f3d9af103bfe8b9d8a5a86cea"
+  integrity sha512-v/LoWB/zBvkgOnxUOkTxkCkZLmwWp3LDASiK3VO2XlUqG2ES+0yECLjhMJNT3ZHaSCVhkTOKvOIaQG/hBiwWPw==
+
 "@types/ember__routing@*":
   version "3.16.15"
   resolved "https://registry.yarnpkg.com/@types/ember__routing/-/ember__routing-3.16.15.tgz#14e7e98ae331d05b19aacc29c9759c9f3dc222ec"
@@ -1851,6 +1918,17 @@
     "@types/ember__routing" "*"
     "@types/ember__service" "*"
 
+"@types/ember__routing@^3":
+  version "3.16.20"
+  resolved "https://registry.yarnpkg.com/@types/ember__routing/-/ember__routing-3.16.20.tgz#1c39f269226ad0121324ecf7474f005e579b04cb"
+  integrity sha512-qaozd9XCYbtohN5Rb1F7hpNyKn8xfLyDuvPvPsLHPfEDmCm5oXWehwSuLzZCHMXPKloJLprdMjqXoix+w4ybyw==
+  dependencies:
+    "@types/ember__component" "^3"
+    "@types/ember__controller" "^3"
+    "@types/ember__object" "^3"
+    "@types/ember__routing" "^3"
+    "@types/ember__service" "^3"
+
 "@types/ember__runloop@*":
   version "3.16.3"
   resolved "https://registry.yarnpkg.com/@types/ember__runloop/-/ember__runloop-3.16.3.tgz#c37ed507aed0f642ef19cbc4b5d0b3a167e3ada6"
@@ -1858,6 +1936,13 @@
   dependencies:
     "@types/ember__runloop" "*"
 
+"@types/ember__runloop@^3":
+  version "3.16.7"
+  resolved "https://registry.yarnpkg.com/@types/ember__runloop/-/ember__runloop-3.16.7.tgz#7bde1f5a52ce1e23ae1e95ac63bb6ca8dfd49b00"
+  integrity sha512-HWbmI6tKiVmTFr14LbcsIVw14HXGxz+Qo8fXEubzmrvP37thxpS0oF80jfVF77LYEG//C/LULn5c0MPS6pUMTg==
+  dependencies:
+    "@types/ember__runloop" "^3"
+
 "@types/ember__service@*":
   version "3.16.1"
   resolved "https://registry.yarnpkg.com/@types/ember__service/-/ember__service-3.16.1.tgz#e8f941ec50ff4a7531487dc60830b4e6c7da6a47"
@@ -1865,6 +1950,13 @@
   dependencies:
     "@types/ember__object" "*"
 
+"@types/ember__service@^3":
+  version "3.16.5"
+  resolved "https://registry.yarnpkg.com/@types/ember__service/-/ember__service-3.16.5.tgz#6f137f014250631047db3a5c298abd2c2c3fb028"
+  integrity sha512-qKGtelfFq4+HETN1zEsEbfhWAzSRGP0eAUiiepyTilNnbONYENfXl02z66kJzHRYpNpIRg0Y96p0Fn34KCE1lA==
+  dependencies:
+    "@types/ember__object" "^3"
+
 "@types/ember__string@*":
   version "3.16.3"
   resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-3.16.3.tgz#6c474d422dfae5c382a3c52bd3c994048d04b72e"
@@ -1872,11 +1964,23 @@
   dependencies:
     "@types/ember__template" "*"
 
+"@types/ember__string@^2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/ember__string/-/ember__string-2.0.3.tgz#8d0279a084c2fd84a5177ee210294338001b6d45"
+  integrity sha512-eHdsIfCvTMXLTggJTKu6kjXtuosc99mOU+ZxURoJwWiizCpcoz28bdT7swEIie/kw+NIjD7OfbJJOFd7bQO5bw==
+  dependencies:
+    "@types/ember__template" "^3"
+
 "@types/ember__template@*":
   version "3.16.1"
   resolved "https://registry.yarnpkg.com/@types/ember__template/-/ember__template-3.16.1.tgz#30d7f50a49b190934db0f5a56dd76ad86c21efc6"
   integrity sha512-APQINizzizl2LHWGMFBCanRjKZQsdzqn7b+us17zbNhnx/R0IZAJq901x/i7eozCRwxsDKmGzNABSCIu6uc1Tg==
 
+"@types/ember__template@^3":
+  version "3.16.4"
+  resolved "https://registry.yarnpkg.com/@types/ember__template/-/ember__template-3.16.4.tgz#3c83cf8105536bd21af6afe6dee9da4be26a443d"
+  integrity sha512-Z/eFOq/Qh5IC3ox3bSZwQzW9fDZE52lquYps2uESIkAmakMi/IHPzon3JdiFXore2KX5Ddyv6OZXo81Zai6g9A==
+
 "@types/ember__test-helpers@0.7.12":
   version "0.7.12"
   resolved "https://registry.yarnpkg.com/@types/ember__test-helpers/-/ember__test-helpers-0.7.12.tgz#53bcf5fcf6e77732dd286cba3782a6a965a0dace"
@@ -1894,11 +1998,23 @@
   dependencies:
     "@types/ember__application" "*"
 
+"@types/ember__test@^3":
+  version "3.16.4"
+  resolved "https://registry.yarnpkg.com/@types/ember__test/-/ember__test-3.16.4.tgz#473ca3898f5aa841cc5b006d633ed0c8e22f59ae"
+  integrity sha512-yq0AOEOjC8CnlaI/FBO8il1m82Z7svcn23sBMg00Gu9E6KJBGfxR/ebma+VcfT1VeTiif6i1i2j0XhLswDVLxw==
+  dependencies:
+    "@types/ember__application" "^3"
+
 "@types/ember__utils@*":
   version "3.16.2"
   resolved "https://registry.yarnpkg.com/@types/ember__utils/-/ember__utils-3.16.2.tgz#3fa9a0666a3e8204262e2a2960289aaf01f29467"
   integrity sha512-tBbqewgegiKSpGZvGh3pbcoXwLCMvKVdLRE97vys75nAEz/vBzkGJm+PDz1HVaTkRukWbRhlDiTm2qFH8qRnSw==
 
+"@types/ember__utils@^3":
+  version "3.16.5"
+  resolved "https://registry.yarnpkg.com/@types/ember__utils/-/ember__utils-3.16.5.tgz#f076521793a7524106fe85e12233e4ff488878d6"
+  integrity sha512-9coUBii1Gv73Uh4RFh1sgRjHEylpSaBSC8hfYeK8/+tZxjfBhujzv09SX/IWQbIjg/+mIUkoGg+jeybNMT/Bqg==
+
 "@types/estree@*":
   version "0.0.50"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
@@ -2012,10 +2128,10 @@
   resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.11.2.tgz#4cb99ae3ea6afe94b9c4cfd3ab715a285729ca9c"
   integrity sha512-Bt0fz9l8sWxqP+cjoqWQyNVyOPPK+7GPhKIKLLTi7llR0FV+pyd50FXTXafZeZnsFVUgXw4pdupydz75E6vxjQ==
 
-"@types/qunit@2.9.6":
-  version "2.9.6"
-  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.9.6.tgz#5d6ba092920edf9dc7377f5091e36eb448743a02"
-  integrity sha512-FfKb3sBW9sdjj8mPzAXtsKn53sOHpzi4PZj0H7P5G24VruwaOmvi0L2kJpuYARQjOKRl/YVlZQ6JWPnspWOkZA==
+"@types/qunit@2.19.6":
+  version "2.19.6"
+  resolved "https://registry.yarnpkg.com/@types/qunit/-/qunit-2.19.6.tgz#2c0af41f8afdc6db554a7f575a2b6df535b86bd0"
+  integrity sha512-bz9STa6EHurtpSfn5cNiScBladlw43bM+7luQA985Kd9YlF4dZaLmKt3c5/oSyN1AWAl50YBpqTq0BxCP64nGg==
 
 "@types/range-parser@*":
   version "1.2.4"