diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-01.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-01.md
index 1ce8fa719..9560fd484 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-01.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-01.md
@@ -26,6 +26,6 @@ In challenge 1 you will connect/onboard your existing K8s cluster to Azure Arc.
 * (https://learn.microsoft.com/en-us/cli/azure/connectedk8s?view=azure-cli-latest)
 
 ## Solution - Spoilerwarning
-[Solution Steps](../walkthrough/challenge-01/solution.md)
+[Solution Steps](../walkthrough/challenge-01/solution-01.md)
 
 [Next challenge](challenge-02.md) | [Back](../Readme.md)
\ No newline at end of file
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-02.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-02.md
index 033183bea..6e2fe6be6 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-02.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-02.md
@@ -32,6 +32,6 @@ All telemetry, logs, and security signals generated by these services flow into
 * https://learn.microsoft.com/en-us/azure/defender-for-cloud/defender-for-containers-arc-enable-programmatically
 
 ## Solution - Spoilerwarning
-[Solution Steps](../walkthrough/challenge-02/solution.md)
+[Solution Steps](../walkthrough/challenge-02/solution-02.md)
 
 [Next challenge](challenge-03.md) | [Back](../Readme.md)
\ No newline at end of file
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-03.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-03.md
index 0114fcb3b..b3bf813b8 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-03.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-03.md
@@ -20,6 +20,6 @@ In challenge 3 you will deploy a LLM/SLM to your Azure Arc-enabled Kubernetes Cl
 * (https://github.com/kaito-project/kaito) GPU Based LLM/SLM
 
 ### Solution - Spoilerwarning
-[Solution Steps](../walkthrough/challenge-03/solution.md)
+[Solution Steps](../walkthrough/challenge-03/solution-03.md)
 
 [Next challenge](challenge-04.md) | [Back](../Readme.md)
\ No newline at end of file
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-04.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-04.md
index c2230721c..43247bf7f 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-04.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-04.md
@@ -25,6 +25,6 @@ In challenge 4 you will deploy Azure Arc-enabled Data Services to your cluster a
 * [Azure Arc Data Controller deployment](https://learn.microsoft.com/en-us/azure/azure-arc/data/create-data-controller)
 
 ## Solution - Spoilerwarning
-[Solution Steps](../walkthrough/challenge-04/solution.md)
+[Solution Steps](../walkthrough/challenge-04/solution-04.md)
 
 [Next challenge](challenge-05.md) | [Back](../Readme.md)
\ No newline at end of file
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-05.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-05.md
index 0c603ab1e..14e4b66e2 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-05.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/challenges/challenge-05.md
@@ -21,6 +21,6 @@ Configure GitOps with Flux for cluster management. In this microhack we chose to
 * [Flux documentation - Get started](https://fluxcd.io/docs/get-started/)
 
 ## Solution - Spoilerwarning
-[Solution Steps](../walkthrough/challenge-05/solution.md)
+[Solution Steps](../walkthrough/challenge-05/solution-05.md)
 
 [Back](../Readme.md)
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/solution.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/solution-01.md
similarity index 99%
rename from 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/solution.md
rename to 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/solution-01.md
index 64dede320..c5e2f79ca 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/solution.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01/solution-01.md
@@ -62,7 +62,7 @@ kubectl get nodes
 ## Task 2 - Connect K8s cluster using script
 
 * In your shell go to the folder where you cloned the microhack repository
-* Change to the sub-folder '03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthroughs/challenge-01'
+* Change to the sub-folder '03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-01'
 * Execute the script to
     * register required resource providers in your subscription (this step may take several minutes if the resource providers have not been registered before):
         * Microsoft.Kubernetes
@@ -216,4 +216,4 @@ Now, reload the resources page in the Azure portl. You should see at least the f
 
 You successfully completed challenge 1! 🚀🚀🚀
 
-[Next challenge](../../challenges/challenge-02.md) - [Next Challenge's Solution](../challenge-02/solution.md)
\ No newline at end of file
+[Next challenge](../../challenges/challenge-02.md) - [Next Challenge's Solution](../challenge-02/solution-02.md)
\ No newline at end of file
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-02/solution.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-02/solution-02.md
similarity index 99%
rename from 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-02/solution.md
rename to 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-02/solution-02.md
index 0b4e9c373..285697bb4 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-02/solution.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-02/solution-02.md
@@ -365,4 +365,4 @@ kubectl describe $constraint_name
 
 You successfully completed challenge 2! 🚀🚀🚀
 
-[Back to challenge 01](../challenge-01/solution.md) - [Next challenge](../../challenges/challenge-03.md) - [Next Challenge's Solution](../challenge-03/solution.md)
\ No newline at end of file
+[Back to challenge 01](../challenge-01/solution-01.md) - [Next challenge](../../challenges/challenge-03.md) - [Next Challenge's Solution](../challenge-03/solution-03.md)
\ No newline at end of file
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-03/solution.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-03/solution-03.md
similarity index 94%
rename from 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-03/solution.md
rename to 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-03/solution-03.md
index 623fe038f..8f1455a29 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-03/solution.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-03/solution-03.md
@@ -1,6 +1,6 @@
 # Walkthrough Challenge 3 - Deploy CPU based Large & Small Language Models (LLM/SLM)
 
-[Back to challenge](../../challenges/challenge-03.md) - [Next Challenge's Solution](../challenge-04/solution.md)
+[Back to challenge](../../challenges/challenge-03.md) - [Next Challenge's Solution](../challenge-04/solution-04.md)
 
 ## Prerequisites
 * You have an arc-connected k8s cluster/finisched challenge 01.
@@ -80,4 +80,4 @@ echo "Open http://$NODE_IP:$NODE_PORT"
 
 You successfully completed challenge 3! 🚀🚀🚀
 
-[Next challenge](../../challenges/challenge-04.md) - [Next Challenge's Solution](../challenge-04/solution.md)
+[Next challenge](../../challenges/challenge-04.md) - [Next Challenge's Solution](../challenge-04/solution-04.md)
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-04/solution.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-04/solution-04.md
similarity index 98%
rename from 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-04/solution.md
rename to 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-04/solution-04.md
index 5dbb3c3fe..7adb6070c 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-04/solution.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-04/solution-04.md
@@ -1,6 +1,6 @@
 # Walkthrough Challenge 4 - Deploy SQL Managed Instance to your cluster
 
-[Back to challenge](../../challenges/challenge-04.md) - [Next Challenge's Solution](../challenge-05/solution.md)
+[Back to challenge](../../challenges/challenge-04.md) - [Next Challenge's Solution](../challenge-05/solution-05.md)
 
 ## prerequisites
 - [client tools](https://learn.microsoft.com/en-us/azure/azure-arc/data/install-client-tools)
@@ -200,4 +200,4 @@ echo "Server=$master_ip,$node_port;Database=master;User Id=sa;Password=<your-pas
 
 You successfully completed challenge 4! 🚀🚀🚀
 
-[Next challenge](../../challenges/challenge-05.md) - [Next Challenge's Solution](../challenge-05/solution.md)
\ No newline at end of file
+[Next challenge](../../challenges/challenge-05.md) - [Next Challenge's Solution](../challenge-05/solution-05.md)
\ No newline at end of file
diff --git a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/solution.md b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/solution-05.md
similarity index 95%
rename from 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/solution.md
rename to 03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/solution-05.md
index a18f2422a..e70a4c5e2 100644
--- a/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/solution.md
+++ b/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/solution-05.md
@@ -61,7 +61,7 @@ az k8s-extension create \
      git config core.sparseCheckout true
      
      # Specify the folder to checkout (the namespaces folder for this challenge)
-     echo "03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthroughs/challenge-05/namespaces" >> .git/info/sparse-checkout
+     echo "03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/namespaces" >> .git/info/sparse-checkout
      
      # Pull the content
      git pull origin main
@@ -73,7 +73,7 @@ az k8s-extension create \
 In order to manage a namespace via flux, you need a repository. In this microhack we're using a public github repository. If using a private repo make sure to add credentials so flux is able to access your repository. The following command creates a flux configuration which watches the namespaces folder within this repository. All namespace definitions found in this folder will be applied to the cluster.
 ```bash
 repository="https://github.com/<your-github-username>/MicroHack" #Change to your own fork of the Microhack repository
-path="/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthroughs/challenge-05/namespaces"
+path="/03-Azure/01-03-Infrastructure/03_Hybrid_Azure_Arc_Kubernetes/walkthrough/challenge-05/namespaces"
 
 az k8s-configuration flux create \
   --resource-group $arc_resource_group \