diff --git a/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__ b/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__
index f92f20c..40bc795 100644
--- a/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__
+++ b/libs/cli/src/generators/challenge/files/docs/__challengeNumber__-__projectName__.md__tmpl__
@@ -1,6 +1,9 @@
 ---
 title: <%= difficulty %> <%= title %>
 description: Challenge <%= challengeNumber %> is about ...
+author: <%= author %>
+challengeNumber: <%= challengeNumber %>
+command: <%= appProjectName %>
 sidebar:
   order: <%= order %>
   badge: New
@@ -10,33 +13,9 @@ sidebar:
 WIP: The following documentation need to be written.
 :::
 
-<div class="chip">Challenge #<%= challengeNumber %></div>
-
 ## Information
 
 ## Statement
 
 ## Constraints
 
----
-
-:::note
-Start the project by running: `npx nx serve <%= appProjectName %>`.
-:::
-
-:::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/challenge/generator.ts b/libs/cli/src/generators/challenge/generator.ts
index ece5f3c..bd09979 100644
--- a/libs/cli/src/generators/challenge/generator.ts
+++ b/libs/cli/src/generators/challenge/generator.ts
@@ -91,6 +91,7 @@ export async function challengeGenerator(tree: Tree, options: Schema) {
       tmpl: '',
       projectName: names(options.name).name,
       appProjectName,
+      author: options.author,
       title: options.title,
       challengeNumber,
       difficulty,
diff --git a/libs/cli/src/generators/challenge/schema.d.ts b/libs/cli/src/generators/challenge/schema.d.ts
index a352d7f..67b0636 100644
--- a/libs/cli/src/generators/challenge/schema.d.ts
+++ b/libs/cli/src/generators/challenge/schema.d.ts
@@ -1,5 +1,6 @@
 export interface Schema {
   title: string;
+  author: string;
   challengeDifficulty: string;
   docRepository: string;
   name: string;
diff --git a/libs/cli/src/generators/challenge/schema.json b/libs/cli/src/generators/challenge/schema.json
index 7b68cd3..955d72d 100644
--- a/libs/cli/src/generators/challenge/schema.json
+++ b/libs/cli/src/generators/challenge/schema.json
@@ -17,7 +17,7 @@
       "pattern": "^[a-zA-Z].*$"
     },
     "title": {
-      "description": "Title of your challenge. (use quote to add spaces)",
+      "description": "Title of your challenge.",
       "type": "string",
       "maxLength": "25",
       "$default": {
@@ -26,6 +26,12 @@
       },
       "x-priority": "important"
     },
+    "author": {
+      "description": "Your full name",
+      "type": "string",
+      "maxLength": "25",
+      "x-priority": "important"
+    },
     "challengeDifficulty": {
       "description": "The difficulty of the challenge.",
       "type": "string",
@@ -114,5 +120,11 @@
     }
   },
   "additionalProperties": false,
-  "required": ["name", "title", "challengeDifficulty", "docRepository"]
+  "required": [
+    "name",
+    "title",
+    "author",
+    "challengeDifficulty",
+    "docRepository"
+  ]
 }