diff --git a/libs/cli/src/generators/app/files/docs/__challengeNumber__-__projectName__.md__tmpl__ b/libs/cli/src/generators/app/files/docs/__challengeNumber__-__projectName__.md__tmpl__
new file mode 100644
index 0000000..9f6069f
--- /dev/null
+++ b/libs/cli/src/generators/app/files/docs/__challengeNumber__-__projectName__.md__tmpl__
@@ -0,0 +1,39 @@
+---
+title: <%= difficulty %> <%= title %>
+description: Challenge <%= challengeNumber %> is about ...
+---
+
+:::note
+WIP
+:::
+
+<div class="chip">Challenge #<%= challengeNumber %></div>
+
+## Information
+
+## Statement
+
+## Constraints
+
+---
+
+:::note
+Start the project by running: `npx nx serve <%= projectName %>`.
+:::
+
+:::tip[Reminder]
+Your PR title must start with <b>Answer:<%= challengeNumber %></b>.
+:::
+
+<div class="article-footer">
+  <a
+    href="https://github.com/tomalaforge/angular-challenges/pulls?q=label%3A<%= challengeNumber %>+label%3Aanswer"
+    alt="<%= title %> community solutions">
+    ❖ Community Answers
+  </a>
+  <a
+    href='https://github.com/tomalaforge/angular-challenges/pulls?q=label%3A<%= challengeNumber %>+label%3A"answer+author"'
+    alt="<%= title %> solution author">
+    ▶︎ Author Answer
+  </a>
+</div>
diff --git a/libs/cli/src/generators/app/files/readme/README.md__tmpl__ b/libs/cli/src/generators/app/files/readme/README.md__tmpl__
index 54f66ad..4305e46 100644
--- a/libs/cli/src/generators/app/files/readme/README.md__tmpl__
+++ b/libs/cli/src/generators/app/files/readme/README.md__tmpl__
@@ -1,32 +1,13 @@
-<h1><%= title %></h1>
+# <%= title %>
 
 > Author: Thomas Laforge
 
-<!-- TODO: add Information/Statement/Rules/Constraint/Steps -->
+### Run Application
 
-### Information
+```bash
+npx nx serve <%= projectName %>
+```
 
-### Statement
+### Documentation and Instruction
 
-### Step 1
-
-### Step 2
-
-### Constraints:
-
-### Submitting your work
-
-1. Fork the project
-2. clone it
-3. npm ci
-4. `npx nx serve <%= projectName %>`
-5. _...work on it_
-6. Commit your work
-7. Submit a PR with a title beginning with **Answer:<%= challengeNumber %>** that I will review and other dev can review.
-
-<a href="https://github.com/tomalaforge/angular-challenges/pulls?q=label%3A<%= challengeNumber %>+label%3Aanswer"><img src="https://img.shields.io/badge/-Solutions-green" alt="<%= projectName %>"/></a>
-<a href='https://github.com/tomalaforge/angular-challenges/pulls?q=label%3A<%= challengeNumber %>+label%3A"answer+author"'><img src="https://img.shields.io/badge/-Author solution-important" alt="<%= projectName %> solution author"/></a>
-
-<!-- <a href="{Blog post url}" target="_blank" rel="noopener noreferrer"><img src="https://img.shields.io/badge/-Blog post explanation-blue" alt="<%= projectName %> blog article"/></a>  -->
-
-_You can ask any question on_ <a href="https://twitter.com/laforge_toma" target="_blank" rel="noopener noreferrer"><img src="./../../logo/twitter.svg" height=20px alt="twitter"/></a>
+Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/<%= docRepository %>/<%= challengeNumber %>-<%= projectName %>/).
diff --git a/libs/cli/src/generators/app/generator.ts b/libs/cli/src/generators/app/generator.ts
index fb60992..0355e5b 100644
--- a/libs/cli/src/generators/app/generator.ts
+++ b/libs/cli/src/generators/app/generator.ts
@@ -37,8 +37,22 @@ export async function appGenerator(tree: Tree, options: Schema) {
     projectName: names(options.name).name,
     title: options.title,
     challengeNumber: options.challengeNumber,
+    docRepository: options.docRepository,
   });
 
+  generateFiles(
+    tree,
+    join(__dirname, 'files', 'docs'),
+    `./docs/src/content/docs/challenges/${options.docRepository}`,
+    {
+      tmpl: '',
+      projectName: names(options.name).name,
+      title: options.title,
+      challengeNumber: options.challengeNumber,
+      difficulty: options.challengeDifficulty,
+    }
+  );
+
   if (options.addTest) {
     generateFiles(tree, join(__dirname, 'files', 'test'), appDirectory, {
       tmpl: '',
diff --git a/libs/cli/src/generators/app/schema.d.ts b/libs/cli/src/generators/app/schema.d.ts
index 08d8403..12df137 100644
--- a/libs/cli/src/generators/app/schema.d.ts
+++ b/libs/cli/src/generators/app/schema.d.ts
@@ -1,6 +1,8 @@
 export interface Schema {
   title: string;
   challengeNumber: number;
+  challengeDifficulty: string;
+  docRepository: string;
   name: string;
   directory?: string;
   addTest?: boolean;
diff --git a/libs/cli/src/generators/app/schema.json b/libs/cli/src/generators/app/schema.json
index dd589bd..9340ee4 100644
--- a/libs/cli/src/generators/app/schema.json
+++ b/libs/cli/src/generators/app/schema.json
@@ -7,7 +7,7 @@
   "cli": "nx",
   "properties": {
     "name": {
-      "description": "The name of the application.",
+      "description": "The name of the application. (should be in camel case)",
       "type": "string",
       "$default": {
         "$source": "argv",
@@ -17,7 +17,7 @@
       "pattern": "^[a-zA-Z].*$"
     },
     "title": {
-      "description": "Title of your challenge.",
+      "description": "Title of your challenge. (use quote to add spaces)",
       "type": "string",
       "$default": {
         "$source": "argv",
@@ -34,6 +34,68 @@
       },
       "x-priority": "important"
     },
+    "challengeDifficulty": {
+      "description": "The difficulty of the challenge.",
+      "type": "string",
+      "x-priority": "important",
+      "x-prompt": {
+        "message": "Which category would you like?",
+        "type": "list",
+        "items": [
+          {
+            "value": "🟢",
+            "label": "Easy"
+          },
+          {
+            "value": "🟠",
+            "label": "Medium"
+          },
+          {
+            "value": "🔴",
+            "label": "Hard"
+          }
+        ]
+      }
+    },
+    "docRepository": {
+      "type": "string",
+      "description": "The category of your challenge.",
+      "x-priority": "important",
+      "x-prompt": {
+        "message": "Which category would you like?",
+        "type": "list",
+        "items": [
+          {
+            "value": "angular",
+            "label": "Angular"
+          },
+          {
+            "value": "angular-performance",
+            "label": "Angular Performance"
+          },
+          {
+            "value": "ngrx",
+            "label": "NgRx"
+          },
+          {
+            "value": "rxjs",
+            "label": "RxJs"
+          },
+          {
+            "value": "nx",
+            "label": "Nx"
+          },
+          {
+            "value": "testing",
+            "label": "Testing"
+          },
+          {
+            "value": "typescript",
+            "label": "Typescript"
+          }
+        ]
+      }
+    },
     "directory": {
       "description": "The directory of the new application.",
       "type": "string",