diff --git a/doc/src/SUMMARY.md b/doc/src/SUMMARY.md
index 5cb91bd01f07d..dba8cd9090183 100644
--- a/doc/src/SUMMARY.md
+++ b/doc/src/SUMMARY.md
@@ -12,6 +12,6 @@
 
 ---
 
-# Challenges
-- [Core Transmutation](./core-transmutation.md)
-- [Memory safety of core intrinsics](./intrinsics-memory.md)
+- [Challenges](./challenges.md)
+  - [Core Transmutation](./challenges/0001-core-transmutation.md)
+  - [Memory safety of core intrinsics](./challenges/0002-intrinsics-memory.md)
diff --git a/doc/src/challenges.md b/doc/src/challenges.md
new file mode 100644
index 0000000000000..c8654bcc12532
--- /dev/null
+++ b/doc/src/challenges.md
@@ -0,0 +1,7 @@
+This chapter contains all existing challenges, including the ones that have already been solved or expired.
+
+For the most up-to-date information on a challenge status,
+please check their tracking issue linked in the challenge description.
+
+If you would like to submit a new challenge, please see
+["Call for Challenges" section](./general-rules.md#call-for-challenges).
\ No newline at end of file
diff --git a/doc/src/core-transmutation.md b/doc/src/challenges/0001-core-transmutation.md
similarity index 100%
rename from doc/src/core-transmutation.md
rename to doc/src/challenges/0001-core-transmutation.md
diff --git a/doc/src/intrinsics-memory.md b/doc/src/challenges/0002-intrinsics-memory.md
similarity index 97%
rename from doc/src/intrinsics-memory.md
rename to doc/src/challenges/0002-intrinsics-memory.md
index 92a25255efa34..3eac59fb02681 100644
--- a/doc/src/intrinsics-memory.md
+++ b/doc/src/challenges/0002-intrinsics-memory.md
@@ -83,5 +83,5 @@ All proofs must automatically ensure the absence of the following undefined beha
 * Producing an invalid value
 
 
-Note: All solutions to verification challenges need to satisfy the criteria established in the [challenge book](general-rules.md)
+Note: All solutions to verification challenges need to satisfy the criteria established in the [challenge book](../general-rules.md)
 in addition to the ones listed above.
diff --git a/doc/src/template.md b/doc/src/template.md
index 81e3c6be19fbc..50461e2a4e7c4 100644
--- a/doc/src/template.md
+++ b/doc/src/template.md
@@ -1,6 +1,6 @@
 # Challenge XXXX[^challenge_id]: Challenge Title
 
-- **Status:** *One of the following: [Open | Resolved | Expired]*
+- **Status:** *One of the following: \[Open | Resolved | Expired\]*
 - **Solution:** *Option field to point to the PR that solved this challenge.*
 - **Tracking Issue:** *Link to issue*
 - **Start date:** *YY/MM/DD*