diff --git a/markdown-templates/readme/congratulations.md b/markdown-templates/readme/congratulations.md
deleted file mode 100644
index 4b67033..0000000
--- a/markdown-templates/readme/congratulations.md
+++ /dev/null
@@ -1,12 +0,0 @@
-<img src="https://octodex.github.com/images/welcometocat.png" align="right" height="250px" />
-
-⭐️ Congratulations {{ login }}! ⭐️
-
-You completed this exercise! Nice work! 🥳
-
-If you would like to practice again, you can retrace your steps below. Just press the **Start Exercise** button again.
-
-> [!TIP]
-> Mona won't grade you this time! 😉
-
-{{ final_message }}
diff --git a/markdown-templates/readme/exercise-finished.md b/markdown-templates/readme/exercise-finished.md
new file mode 100644
index 0000000..d90beb2
--- /dev/null
+++ b/markdown-templates/readme/exercise-finished.md
@@ -0,0 +1,19 @@
+# Congratulations! :tada:
+
+<img src="https://octodex.github.com/images/welcometocat.png" align="right" height="250px" />
+
+Yay **{{ login }}** you finished the exercise! Nice work :tada:
+
+If you would like to retrace your steps, you can always revisit the exercise.
+
+[![](https://img.shields.io/badge/Return%20to%20Exercise-%E2%86%92-1f883d?style=for-the-badge&logo=github&labelColor=197935)]({{{ issue_url }}})
+
+> [!TIP]
+> Mona won't grade you this time! 😉
+
+
+### Craving more? :raising_hand:
+
+Did you enjoy this practical style of learning? There's no better way to learn than building things, right?!
+
+Let's keep the momentum going! Head over to [GitHub Skills](https://skills.github.com) catalog to find another hands-on exercise. :rocket: