diff --git a/workshop/content/00-conference-introduction/index.md b/workshop/content/00-conference-introduction/index.md
index 887a597..93afa31 100644
--- a/workshop/content/00-conference-introduction/index.md
+++ b/workshop/content/00-conference-introduction/index.md
@@ -4,12 +4,12 @@ title: Welcome to Jfokus 2025 Conference
 
 Welcome to the Jfokus 2025 Conference in beautiful Stockholm Waterfront Conference Center.
 
-**RTS Advania** and **Tanzu Spring** teams have prepared a raffle for a **McLaren Formula 1™ Race Car** Lego set.
+**Advania RTS** and **Tanzu Spring** teams have prepared a raffle for a **McLaren Formula 1™ Race Car** Lego set.
 
 ![McLaren Formula 1™ Race Car](42141.png)
 
-In order to qualify for the raffle, we expect you to finish this **Spring Application Advisor** lab. Once you complete the lab, you will get a link to a form where
-you can add your name and email address.
+In order to qualify for the raffle, we expect you to finish this **Spring Application Advisor** or **Spring AI** lab.
+Once you complete the lab, you will get a link to a form to submit your name/email for the raffle.
 
 Please ask the booth staff if you run into any issues.
 
diff --git a/workshop/content/01-first-steps/index.md b/workshop/content/01-first-steps/index.md
index e69873d..15d5a73 100644
--- a/workshop/content/01-first-steps/index.md
+++ b/workshop/content/01-first-steps/index.md
@@ -31,8 +31,14 @@ The Spring Boot migration from Spring Boot version 2.7 to 3.x (and Spring Framew
 Without a *VMware Spring Enterprise* subscription, [Spring Boot 2.7 is end of support](https://spring.io/projects/spring-boot#support) since 11/2023, which means that no new security fixes will be released as open-source.
 
 Let's run *Spring PetClinic* to validate that it works before our upgrade.
+
+```terminal:execute
+command: cd spring-petclinic
+session: 2
+```
+
 ```terminal:execute
-command: cd spring-petclinic && ./mvnw spring-boot:run
+command: ./mvnw spring-boot:run
 session: 2
 ```
 
diff --git a/workshop/content/02-next-upgrade-steps/index.md b/workshop/content/02-next-upgrade-steps/index.md
index 56b81c4..ca317a7 100644
--- a/workshop/content/02-next-upgrade-steps/index.md
+++ b/workshop/content/02-next-upgrade-steps/index.md
@@ -7,7 +7,6 @@ To execute the further steps of our upgrade plan, we have to rerun the commands
 advisor build-config get
 advisor build-config publish --url=${APP_ADVISOR_SERVER}
 advisor upgrade-plan get --url=${APP_ADVISOR_SERVER}
-
 ```
 If the first upgrade step was successfully applied, you should now see that the next step is the **Java 11 to 17 upgrade**, which is required for Spring Boot 3.x.
 
diff --git a/workshop/content/03-spring-boot-upgrades/index.md b/workshop/content/03-spring-boot-upgrades/index.md
index 4660667..8c78be1 100644
--- a/workshop/content/03-spring-boot-upgrades/index.md
+++ b/workshop/content/03-spring-boot-upgrades/index.md
@@ -37,4 +37,11 @@ url: {{< param  ingress_protocol >}}://petclinic-{{< param  session_name >}}.{{<
 session: 2
 ```
 
+{{< note >}}
+🏆 *Congratulations!* 🏆
+👍 You have finished the lab! 👍
 
+Feel free to [continue with optional steps](../04-final-upgrades) or go to
+
+[🏁 Workshop Summary 🏁](../99-workshop-summary)
+{{< /note >}}
diff --git a/workshop/content/04-final-upgrades/index.md b/workshop/content/04-final-upgrades/index.md
index 796f88b..496acd6 100644
--- a/workshop/content/04-final-upgrades/index.md
+++ b/workshop/content/04-final-upgrades/index.md
@@ -84,3 +84,9 @@ url: {{< param  ingress_protocol >}}://petclinic-{{< param  session_name >}}.{{<
 ```terminal:interrupt
 session: 2
 ```
+
+{{< note >}}
+Feel free to [continue with optional steps](../05-continous-upgrades) or go to
+
+[🏁 Workshop Summary 🏁](../99-workshop-summary)
+{{< /note >}}
diff --git a/workshop/content/99-workshop-summary/index.md b/workshop/content/99-workshop-summary/index.md
index 53df806..3dca3c8 100644
--- a/workshop/content/99-workshop-summary/index.md
+++ b/workshop/content/99-workshop-summary/index.md
@@ -7,7 +7,11 @@ In this workshop, we explored the capabilities of **Spring Application Advisor**
 Now it's time to start upgrading your applications!
 More information is available in the [official documentation](https://docs.vmware.com/en/Tanzu-Spring-Runtime/Commercial/Tanzu-Spring-Runtime/index-app-advisor.html).
 
-**You've made it to the end of lab!**
+{{< note >}}
+
+🏆 *Congratulations* 🏆
+
+👍 **You have finished the lab!** 👍
 
 You're qualified for an exclusive raffle.
 
@@ -17,4 +21,4 @@ Please enter your name and email in [this](https://forms.gle/EuZkmfsXMDMuWVFP8)
 
 The raffle will take on February 5, 2025 at **Advania and Tanzu Spring Booth** at 15:00
 
-
+{{< /note >}}
\ No newline at end of file