diff --git a/addons/api/package.json b/addons/api/package.json
index 265417370..ff4b1d326 100644
--- a/addons/api/package.json
+++ b/addons/api/package.json
@@ -58,7 +58,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.4",
-    "ember-template-lint": "^3.7.0",
+    "ember-template-lint": "^3.16.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ember": "^10.6.1",
diff --git a/addons/auth/package.json b/addons/auth/package.json
index 0336a2e74..6027059c8 100644
--- a/addons/auth/package.json
+++ b/addons/auth/package.json
@@ -51,7 +51,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.4",
-    "ember-template-lint": "^3.7.0",
+    "ember-template-lint": "^3.16.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ember": "^10.6.1",
diff --git a/addons/core/.template-lintrc.js b/addons/core/.template-lintrc.js
index 3b0b9af95..2a4017077 100644
--- a/addons/core/.template-lintrc.js
+++ b/addons/core/.template-lintrc.js
@@ -1,5 +1,5 @@
 'use strict';
 
 module.exports = {
-  extends: 'octane',
+  extends: ['recommended'],
 };
diff --git a/addons/core/addon/components/image/index.hbs b/addons/core/addon/components/image/index.hbs
index 44eb3a54d..b9f544084 100644
--- a/addons/core/addon/components/image/index.hbs
+++ b/addons/core/addon/components/image/index.hbs
@@ -1,3 +1,3 @@
 <span ...attributes class='image-container'>
   {{inline-svg @name}}
-</span>
\ No newline at end of file
+</span>
diff --git a/addons/core/package.json b/addons/core/package.json
index 1828dd7d3..ed65962a8 100644
--- a/addons/core/package.json
+++ b/addons/core/package.json
@@ -68,7 +68,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.4",
-    "ember-template-lint": "^3.7.0",
+    "ember-template-lint": "^3.16.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ember": "^10.6.1",
diff --git a/addons/rose/.template-lintrc.js b/addons/rose/.template-lintrc.js
index cf69ffde1..e7dbae71c 100644
--- a/addons/rose/.template-lintrc.js
+++ b/addons/rose/.template-lintrc.js
@@ -1,8 +1,7 @@
 'use strict';
 
 module.exports = {
-  plugins: ['ember-template-lint-plugin-prettier'],
-  extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'],
+  extends: ['recommended'],
   overrides: [
     {
       files: [
diff --git a/addons/rose/package.json b/addons/rose/package.json
index c914e30a9..313d4eed7 100644
--- a/addons/rose/package.json
+++ b/addons/rose/package.json
@@ -84,7 +84,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.4",
-    "ember-template-lint": "^3.7.0",
+    "ember-template-lint": "^3.16.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ember": "^10.6.1",
diff --git a/ui/admin/.template-lintrc.js b/ui/admin/.template-lintrc.js
index 8085394a5..0d12e0801 100644
--- a/ui/admin/.template-lintrc.js
+++ b/ui/admin/.template-lintrc.js
@@ -1,8 +1,7 @@
 'use strict';
 
 module.exports = {
-  plugins: ['ember-template-lint-plugin-prettier'],
-  extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'],
+  extends: ['recommended'],
   rules: {
     'no-passed-in-event-handlers': false,
     'no-bare-strings': true,
diff --git a/ui/admin/package.json b/ui/admin/package.json
index 4923fe366..234f105d7 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -78,8 +78,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.4",
-    "ember-template-lint": "^3.12.0",
-    "ember-template-lint-plugin-prettier": "^2.0.0",
+    "ember-template-lint": "^3.16.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-ember": "^10.6.1",
diff --git a/ui/desktop/.template-lintrc.js b/ui/desktop/.template-lintrc.js
index 7401a1e82..61faa6fc3 100644
--- a/ui/desktop/.template-lintrc.js
+++ b/ui/desktop/.template-lintrc.js
@@ -1,8 +1,7 @@
 'use strict';
 
 module.exports = {
-  plugins: ['ember-template-lint-plugin-prettier'],
-  extends: ['octane', 'ember-template-lint-plugin-prettier:recommended'],
+  extends: ['recommended'],
   rules: {
     'no-passed-in-event-handlers': false,
     'no-bare-strings': true,
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index 455c7c1c5..3bcae1d1d 100755
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -97,8 +97,7 @@
     "ember-qunit": "^5.1.4",
     "ember-resolver": "^8.0.3",
     "ember-source": "~3.28.4",
-    "ember-template-lint": "^3.7.0",
-    "ember-template-lint-plugin-prettier": "^2.0.0",
+    "ember-template-lint": "^3.16.0",
     "ember-wormhole": "^0.6.0",
     "eslint": "^8.18.0",
     "eslint-config-prettier": "^8.5.0",
diff --git a/yarn.lock b/yarn.lock
index c922a9400..f7e2e3ba6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11062,11 +11062,6 @@ date-and-time@^1.0.0:
   resolved "https://registry.yarnpkg.com/date-and-time/-/date-and-time-1.0.1.tgz#4959b7faf1ec5873e59d926d4528b9223a808a57"
   integrity sha512-7u+uNfnjWkX+YFQfivvW24TjaJG6ahvTrfw1auq7KlC7osuGcZBIWGBvB9UcENjH6JnLVhMqlRripk1dSHjAUA==
 
-date-fns@^2.23.0:
-  version "2.23.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
-  integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
-
 date-fns@^2.28.0:
   version "2.28.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.28.0.tgz#9570d656f5fc13143e50c975a3b6bbeb46cd08b2"
@@ -12915,13 +12910,6 @@ ember-source@~3.28.4:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
-ember-template-lint-plugin-prettier@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ember-template-lint-plugin-prettier/-/ember-template-lint-plugin-prettier-2.0.1.tgz#38889c8094309b63fd1bc0cbe1033023b2a01bc8"
-  integrity sha512-MPlyq1lNlL7U7EamXbmpjIUjHVQUARwmR+TJEmWZcf8lq/ExnV6Jyk3uvmrEXKOfsQS6egpoNgs3wqfh8qAP6Q==
-  dependencies:
-    prettier-linter-helpers "^1.0.0"
-
 ember-template-lint@^2.0.1:
   version "2.21.0"
   resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-2.21.0.tgz#7e120abf309a8810eeed26c52377943faf15a95b"
@@ -12939,7 +12927,7 @@ ember-template-lint@^2.0.1:
     v8-compile-cache "^2.2.0"
     yargs "^16.2.0"
 
-ember-template-lint@^3.12.0:
+ember-template-lint@^3.16.0:
   version "3.16.0"
   resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-3.16.0.tgz#7af2ec8d4386f4726be08c14c39ba121c56f0896"
   integrity sha512-hbP4JefkOLx9tMkrZ3UIvdBNoEnrT7rg6c70tIxpB9F+KpPneDbmpGMBsQVhhK4BirTXIFwAIfnwKcwkIk3bPQ==
@@ -12960,26 +12948,6 @@ ember-template-lint@^3.12.0:
     v8-compile-cache "^2.3.0"
     yargs "^16.2.0"
 
-ember-template-lint@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/ember-template-lint/-/ember-template-lint-3.7.0.tgz#e0565102b291974afeb65de6933f0d154be508d3"
-  integrity sha512-C3oFFdB+g14CvFKZrnAS8Yt0IojTpOhdU5KZoLUs6hOgQjkEF4l/OCBNPtBmL8Nm/dxmc5iTsd5TL98CCcnK+w==
-  dependencies:
-    "@ember-template-lint/todo-utils" "^10.0.0"
-    chalk "^4.1.2"
-    date-fns "^2.23.0"
-    ember-template-recast "^5.0.3"
-    find-up "^5.0.0"
-    fuse.js "^6.4.6"
-    get-stdin "^8.0.0"
-    globby "^11.0.4"
-    is-glob "^4.0.1"
-    micromatch "^4.0.4"
-    requireindex "^1.2.0"
-    resolve "^1.20.0"
-    v8-compile-cache "^2.3.0"
-    yargs "^16.2.0"
-
 ember-template-recast@^5.0.1, ember-template-recast@^5.0.3, ember-template-recast@^6.0.0:
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/ember-template-recast/-/ember-template-recast-6.1.3.tgz#1e9b256ee9da24bcaa7c213088d01f32afc88001"
@@ -14142,11 +14110,6 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
-
 fast-glob@^2.2.6:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
@@ -21642,13 +21605,6 @@ pretender@^3.4.3:
     fake-xml-http-request "^2.1.2"
     route-recognizer "^0.3.3"
 
-prettier-linter-helpers@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
-  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
-  dependencies:
-    fast-diff "^1.1.2"
-
 prettier@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"