diff --git a/app/components/ember-cli-landing-page.hbs b/app/components/ember-cli-landing-page.hbs
new file mode 100644
index 00000000..0ef9bf50
--- /dev/null
+++ b/app/components/ember-cli-landing-page.hbs
@@ -0,0 +1,6 @@
+<article class="chapter">
+  <h1>
+    Ember CLI Overview
+  </h1>
+  <p>TODO</p>
+</article>
\ No newline at end of file
diff --git a/app/router.js b/app/router.js
index a3e7db36..3e27e8d4 100644
--- a/app/router.js
+++ b/app/router.js
@@ -34,7 +34,6 @@ class AppRouter extends EmberRouter {
 }
 
 AppRouter.map(function () {
-  this.route('ember-cli');
   this.route('project', { path: '/:project' });
 
   this.route(
diff --git a/app/routes/index.js b/app/routes/index.js
index 5caca4df..437a65c4 100644
--- a/app/routes/index.js
+++ b/app/routes/index.js
@@ -23,13 +23,13 @@ export default class IndexRoute extends Route {
         });
         foundProject = 'ember-data';
       } catch (e) {
+        await this.store.findRecord('project', 'ember-cli', {
+          includes: 'project-version',
+        });
         foundProject = 'ember-cli';
       }
     }
 
-    if (foundProject === 'ember-cli') {
-      return this.router.transitionTo('ember-cli');
-    }
     return this.router.transitionTo('project-version', foundProject, 'release');
   }
 }
diff --git a/app/routes/project.js b/app/routes/project.js
index bcc5f143..36965e1e 100644
--- a/app/routes/project.js
+++ b/app/routes/project.js
@@ -16,7 +16,7 @@ export default class ProjectRoute extends Route.extend(ScrollTracker) {
     }
 
     if (projectName.indexOf('cli') !== -1) {
-      return this.router.transitionTo('ember-cli');
+      projectNameToLookUp = 'ember-cli';
     }
 
     return this.store.findRecord('project', projectNameToLookUp, {
diff --git a/app/services/meta-store.js b/app/services/meta-store.js
index 11cf2433..75afc1a0 100644
--- a/app/services/meta-store.js
+++ b/app/services/meta-store.js
@@ -10,6 +10,7 @@ export default class MetaStoreService extends Service {
   @tracked availableProjectVersions = {
     ember: A(),
     'ember-data': A(),
+    'ember-cli': A(),
   };
   @tracked projectRevMap = {};
 
@@ -40,6 +41,7 @@ export default class MetaStoreService extends Service {
     this.availableProjectVersions = {
       ember: A(availableProjectVersions['ember']),
       'ember-data': A(availableProjectVersions['ember-data']),
+      'ember-cli': A(availableProjectVersions['ember-cli']),
     };
     this.projectRevMap = projectRevMap;
   }
diff --git a/app/templates/project-version/index.hbs b/app/templates/project-version/index.hbs
index af49c718..426b869d 100644
--- a/app/templates/project-version/index.hbs
+++ b/app/templates/project-version/index.hbs
@@ -1,5 +1,7 @@
 {{#if (eq @model.id "ember-data")}}
   <EmberDataLandingPage />
+{{else if (eq @model.id "ember-cli")}}
+  <EmberCliLandingPage />
 {{else}}
   <EmberLandingPage />
 {{/if}}
diff --git a/app/utils/get-last-version.js b/app/utils/get-last-version.js
index 4c3792ad..ac807f27 100644
--- a/app/utils/get-last-version.js
+++ b/app/utils/get-last-version.js
@@ -2,7 +2,7 @@ import semverCompare from 'semver-compare';
 
 export default function getLastVersion(projectVersions) {
   const sortedVersions = projectVersions
-    .map((v) => v.replace(/ember-data-|ember-/g, ''))
+    .map((v) => v.replace(/ember-cli-|ember-data-|ember-/g, ''))
     .sort((v1, v2) => {
       return semverCompare(v1, v2);
     });
diff --git a/package.json b/package.json
index df8a6815..f22d954c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "test": "tests"
   },
   "scripts": {
-    "clone": "rm -rf ember-api-docs-data && git clone --depth=1 https://github.com/ember-learn/ember-api-docs-data.git",
+    "clone": "rm -rf ember-api-docs-data && git clone -b ember-cli --single-branch --depth=1 https://github.com/ember-learn/ember-api-docs-data.git",
     "build": "ember build --environment=production",
     "lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",