diff --git a/app/templates/index.hbs b/app/templates/index.hbs
index 93940f63..8e062baa 100644
--- a/app/templates/index.hbs
+++ b/app/templates/index.hbs
@@ -52,6 +52,9 @@
         <li class='list-unstyled' data-test-ember-5-link>
           <LinkTo @route='ember' @model='v5.x'>v5.x</LinkTo>
         </li>
+        <li class='list-unstyled' data-test-ember-6-link>
+          <LinkTo @route='ember' @model='v6.x'>v6.x</LinkTo>
+        </li>
       </ul>
     </li>
     <li class='item list-unstyled'>
diff --git a/content/ember/v6/importing-inject-from-ember-service.md b/content/ember/v6/importing-inject-from-ember-service.md
new file mode 100644
index 00000000..ef1f66ef
--- /dev/null
+++ b/content/ember/v6/importing-inject-from-ember-service.md
@@ -0,0 +1,20 @@
+---
+title: Importing `inject` from `@ember/service`
+until: 7.0.0
+since: 6.3.0
+displayId: importing-inject-from-ember-service
+---
+
+Importing `inject` from `@ember/service` is deprecated. Please import `service` instead.
+
+Example:
+
+```diff
+import { Route } from '@ember/routing/route';
+- import { inject as service } from '@ember/service';
++ import { service } from '@ember/service';
+
+export default class MyRoute extends Route {
+  @service store;
+}
+```
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 2e8bd346..43e20a16 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -20,11 +20,13 @@ module.exports = function (defaults) {
     prember: {
       urls: [
         '/',
+        '/v6.x',
         '/v5.x',
         '/v4.x',
         '/v3.x',
         '/v2.x',
         '/v1.x',
+        '/ember/v6.x',
         '/ember/v5.x',
         '/ember/v4.x',
         '/ember/v3.x',
diff --git a/lib/content-docs-generator/index.js b/lib/content-docs-generator/index.js
index 017daba1..3821ab15 100644
--- a/lib/content-docs-generator/index.js
+++ b/lib/content-docs-generator/index.js
@@ -11,6 +11,7 @@ const contentFolders = [
   'ember/v3',
   'ember/v4',
   'ember/v5',
+  'ember/v6',
   'ember-data/v2',
   'ember-data/v3',
   'ember-data/v4',
diff --git a/tests/acceptance/visual-regression-test.js b/tests/acceptance/visual-regression-test.js
index 07a5003f..f85a6b65 100644
--- a/tests/acceptance/visual-regression-test.js
+++ b/tests/acceptance/visual-regression-test.js
@@ -110,6 +110,16 @@ module('Acceptance | visual regression', function (hooks) {
 
     await percySnapshot('ember-5.x');
 
+    // v6.x Ember
+    await click('[data-test-main-deprecations-link]');
+    await click('[data-test-ember-6-link] > a');
+
+    assert
+      .dom('[data-test-deprecations-added-in]')
+      .hasText('Deprecations Added in Ember 6.x');
+
+    await percySnapshot('ember-6.x');
+
     // Individual page
     await visit('/id/ember-polyfills-deprecate-assign');
     assert.dom('h1').hasText('Deprecation Guide for Ember.assign');