diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bad78eda9..231dd4311 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,9 +83,6 @@ jobs:
           cp -r target/generated-asciidoc/mac/variants/* target/generated-asciidoc/variants
           cp -r target/generated-asciidoc/windows/variants/* target/generated-asciidoc/variants
           
-          # make an index.html          
-          cp target/generated-asciidoc/spine-azure.html target/generated-asciidoc/index-azure.html
-          
           # Move things around to preserve the super-heroes structure
           mkdir -p target/site/super-heroes
           cp -R target/generated-asciidoc/* target/site/super-heroes
diff --git a/quarkus-workshop-super-heroes/README.adoc b/quarkus-workshop-super-heroes/README.adoc
index 96cf6957e..ff117af5b 100644
--- a/quarkus-workshop-super-heroes/README.adoc
+++ b/quarkus-workshop-super-heroes/README.adoc
@@ -4,16 +4,21 @@ Build and deploy a microservice architecture where Super Heroes fight against Su
 
 == Instructions
 
-There are several workshops available that you can follow depending your needs:
+There are several versions of this workshops available that you can follow depending your needs:
 
 * _Develop the Super Heroes with Quarkus_:
 If you are a developer, are new to quarkus, then this workshop might interest you.
-You will develop, from scratch, a set of microservices accessing databases, Kafka channels and exposing APIs.
-Check https://quarkus.io/quarkus-workshops/super-heroes/index.html to get the workshop instructions.
-* _Deploy the Super Heroes to Azure Container Apps_:
-If you are interested in deploying an already made application to Azure Container Apps, then this workshop is for you.
-You will not develop any Quarkus (you don't even need Java tools), but you will be pushing Docker containers, creating managed services on Azure (databases, Kafka) and monitoring the entire system (https://docs.microsoft.com/en-us/events/jdconf-2022/quarkus-superheroes-on-azure[watch a video presenting the workshop]).
-Check https://quarkus.io/quarkus-workshops/super-heroes/index-azure.html to get the workshop instructions.
+You will develop, from scratch, a set of microservices accessing databasesand exposing APIs.
+* _Create an AI-integration service_
+* _Deploy the microservices to Azure Container Apps_
+* _Containerize the microservices_
+* _Contract testing with Pact_
+* _Write a Quarkus extension_
+* _Write a Quarkus extension_
+* _Run Quarkus on Kubernetes_
+* _Messaging with Kafka_
+* _Native compilation_
+* _Observability_
 
 == Start the infrastructure
 
diff --git a/quarkus-workshop-super-heroes/docs/pom.xml b/quarkus-workshop-super-heroes/docs/pom.xml
index 3757948f8..5786a8d06 100644
--- a/quarkus-workshop-super-heroes/docs/pom.xml
+++ b/quarkus-workshop-super-heroes/docs/pom.xml
@@ -51,6 +51,7 @@ The default build will take around 50m.
         <semantic-kernel.version>0.2.9-alpha</semantic-kernel.version>
         <compiler-plugin.version>3.11.0</compiler-plugin.version>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
+        <exec-plugin.version>3.1.0</exec-plugin.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
@@ -216,25 +217,6 @@ The default build will take around 50m.
                             </attributes>
                         </configuration>
                     </execution>
-                    <execution>
-                        <!-- When we do #302, we can turn azure into an attribute and use the same spine.html
-                         For now, we just build a single copy of it-->
-                        <id>output-html-azure</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>process-asciidoc</goal>
-                        </goals>
-                        <configuration>
-                            <sourceDocumentName>spine-azure.adoc</sourceDocumentName>
-                            <outputDirectory>
-                                ${project.build.directory}/generated-asciidoc/
-                            </outputDirectory>
-                            <attributes>
-                                <options-file>default-options.adoc</options-file>
-                                <imagesdir>images</imagesdir> <!-- I don't know why this has to be specified as one level above the plantuml dir, when they're siblings, but it does -->
-                            </attributes>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
 
@@ -244,6 +226,7 @@ The default build will take around 50m.
             <plugin>
                 <artifactId>exec-maven-plugin</artifactId>
                 <groupId>org.codehaus.mojo</groupId>
+                <version>${exec-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -347,6 +330,7 @@ The default build will take around 50m.
                     <plugin>
                         <artifactId>exec-maven-plugin</artifactId>
                         <groupId>org.codehaus.mojo</groupId>
+                        <version>${exec-plugin.version}</version>
                         <executions>
                             <execution>
                                 <phase>generate-sources</phase>
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/assets/css/hol.css b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/assets/css/hol.css
index 1fb16f2b7..485e24c97 100755
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/assets/css/hol.css
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/assets/css/hol.css
@@ -204,7 +204,25 @@ samp {
 .content-area {
     margin-left: var(--site-margins);
     margin-right: var(--site-margins);
-    width: 60%;
+    display: flex;
+    flex-direction: row;
+    column-gap: 1em;
+
+}
+
+.mode {
+    width: 50%;
+    padding-top: 0em;
+    padding-left: 4em;
+    padding-right: 4em;
+    margin: 3em;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.right {
+    border-left: 1px lightgrey solid;
 }
 
 .cta > .content {
@@ -244,13 +262,25 @@ button:hover {
 }
 
 .big {
-    width: 60%;
-    margin-top: 1em;
+    width: 95%;
+    height: 60px;
+    margin-top: 2em;
     margin-bottom: 1em;
     padding: 1em;
     font-size: 1.2em;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
+.no-underline {
+    border: none;
+}
+
+.squish {
+    margin-top: 0rem;
+    padding-top: 0rem;
+}
 
 /*See here for the list of unicode codes for fontawesome*/
 /*https://fontawesome.com/v5/cheatsheet*/
@@ -307,5 +337,7 @@ pre code, pre pre {
 }
 
 ul.configurator {
-  list-style-type: none;
+    list-style-type: none;
+    padding-bottom: 0;
+    margin-bottom: 0;
 }
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-conclusion/conclusion-references.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-conclusion/conclusion-references.adoc
index e7cd1ca45..d575360b9 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-conclusion/conclusion-references.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-conclusion/conclusion-references.adoc
@@ -9,3 +9,6 @@
 * https://quarkus.io
 * https://code.quarkus.io
 * https://quarkus.io/guides/all-config
+* https://azure.microsoft.com/services/container-apps[Azure Container Apps Overview]
+* https://docs.microsoft.com/azure/container-apps[Azure Container Apps Documentation]
+* https://github.com/ozangunalp/managed-kafka-quarkus/tree/main/azure-event-hub[Managed Kafka Quarkus]
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing-azure-cli.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing-azure-cli.adoc
similarity index 100%
rename from quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing-azure-cli.adoc
rename to quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing-azure-cli.adoc
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing-wsl.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing-wsl.adoc
similarity index 91%
rename from quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing-wsl.adoc
rename to quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing-wsl.adoc
index 04091160d..02b7940dd 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing-wsl.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing-wsl.adoc
@@ -5,7 +5,7 @@ https://docs.microsoft.com/windows/wsl[Windows Subsystem for Linux] (WSL) lets d
 
 [WARNING]
 ====
-If you are using Windows, it is recommended to install WSL.
+If you are using Windows, it is recommended to install WSL as all the commands use bash.
 ====
 
 == Installing WSL
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing.adoc
index 5dfba5e03..945780251 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-installing.adoc
@@ -17,6 +17,14 @@ ifdef::use-ai[]
 include::introduction-installing-ai.adoc[leveloffset=+1]
 endif::use-ai[]
 
+ifdef::use-windows[]
+include::introduction-installing-wsl.adoc[leveloffset=+1]
+endif::use-windows[]
+
+ifdef::use-azure[]
+include::introduction-installing-azure-cli.adoc[leveloffset=+1]
+endif::use-azure[]
+
 == Recap
 
 Before going further, make sure the following commands work on your machine.
@@ -33,6 +41,9 @@ docker compose version
 ifdef::use-local-kubernetes[]
 kubectl version # If you used Rancher Desktop and plan to use Kubernetes
 endif::use-local-kubernetes[]
+ifdef::use-azure[]
+az --version
+endif::use-azure[]
 ----
 
 We have not mentioned cURL up to now, because most modern operating systems ship with it pre-installed.
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-presentation.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-presentation.adoc
index 785c6f1b6..f1a6942c1 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-presentation.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction-presentation.adoc
@@ -108,6 +108,14 @@ ifdef::use-observability[]
 * _Observability_:
 in this section, you will add metrics, health checks, and distributed tracing to your microservices
 endif::use-observability[]
+ifdef::use-azure[]
+* _Azure Container Apps and Quarkus_:
+this section introduces Quarkus and Azure Container Apps to make sure you have all the needed vocabulary to follow along
+* _Running the Application Locally_:
+in this section, you will build Docker images out of Quarkus microservices, execute them locally with Docker compose, push them to Azure Registry, all that using Docker and Azure CLI
+* _Running the Application on Azure Container Apps_:
+in this section, you will create an entire infrastructure on Azure (Postgres databases, Kafka, etc.) and deploy the microservices to Azure Container Apps
+endif::use-azure[]
 ifdef::use-extension[]
 * _Extending Quarkus_:
 in this section, you will create a Quarkus extension
@@ -169,6 +177,9 @@ endif::use-native[]
 ifdef::use-ai[]
 * OpenAI or Azure OpenAI keys (optional, only if you want to use the narration feature)
 endif::use-ai[]
+ifdef::use-azure[]
+* An Azure subscription and the Azure CLI
+endif::use-azure[]
 
 We will also be using Maven {maven-version}, but there is no
 need to install it. Instead, the workshop scaffolding includes
@@ -181,5 +192,5 @@ You can skip the next section if you have already installed all the prerequisite
 [WARNING]
 ====
 This workshop assumes a bash shell.
-ifdef::use-windows[If you run on Windows, in particular, adjust the commands accordingly.]
+ifdef::use-windows[If you run on Windows, in particular, adjust the commands accordingly or install WSL.]
 ====
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction.adoc
index 670ddc594..0af4c1b45 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/core-introduction/introduction.adoc
@@ -28,6 +28,9 @@ endif::use-messaging[]
 ifdef::use-ai[]
 * Use OpenAI to introduce some artificial intelligence
 endif::use-ai[]
+ifdef::use-azure[]
+* Deploy the entire application to Azure Container Apps
+endif::use-azure[]
 * Answer the ultimate question: are super-heroes stronger than super-villains?
 
 This workshop is a BYOL (_Bring Your Own Laptop_) session, so bring your Windows, OSX, or Linux laptop.
@@ -60,6 +63,13 @@ endif::use-kubernetes[]
 ifdef::use-observability[]
 * How to monitor your microservices with Prometheus
 endif::use-observability[]
+ifdef::use-azure[]
+* What is Azure Container Apps
+* How to push the Docker images to Azure Registry
+* How to create managed services in Azure (Postgres database, Kafka)
+* How to deploy microservices to Azure Container Apps
+* How to configure Docker images in Azure Container Apps
+endif::use-azure[]
 ifdef::use-extension[]
 * How to extend Quarkus with extensions
 endif::use-extension[]
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/default-options.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/default-options.adoc
index d72a4ce4a..ba8cd6cd8 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/default-options.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/default-options.adoc
@@ -1,7 +1,10 @@
 :os: all
-:use-native:
 :use-ai:
-:use-kubernetes:
+:use-azure:
+:use-container:
 :use-contract-testing:
 :use-extension:
+:use-kubernetes:
 :use-messaging:
+:use-native:
+:use-observability:
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/index.html b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/index.html
index da8840c0d..4bffd83d0 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/index.html
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/index.html
@@ -25,7 +25,7 @@
             window.location.href = url;
         }
 
-        function generateURL() {
+        function generateTailoredURL() {
             const selectedOptions = [];
 
             // Get the selected build option
@@ -44,77 +44,102 @@
             // Generate the URL based on selected options
             const url = baseUrl + 'variants/' + selectedOptions.join("-") + "/" + filename;
             window.location.href = url;
-
         }
 
     </script>
 </head>
 <body>
-<h1 class="title-band">Quarkus Workshop Configurator</h1>
+<h2 class="title-band">Quarkus Workshop Configurator</h2>
 
 <div class="content-area">
-    <button class="big" onclick="generateDefaultURL()">Just take me to the default workshop</button>
-
-    <h2><i class="fas fa-desktop"></i>What operating system are you using?</h2>
-    <ul class="configurator">
-        <li>
-            <label for="macRadio">
-                <input type="radio" name="osOption" id="macRadio" value="mac"><i class="fab fa-apple"></i>MacOS
-            </label>
-        </li>
-        <li>
-            <label for="windowsRadio">
-                <input type="radio" name="osOption" id="windowsRadio" value="windows"><i class="fab fa-windows"></i>Windows
-            </label>
-        </li>
-        <li>
-            <label for="linuxRadio">
-                <input type="radio" name="osOption" id="linuxRadio" value="linux"><i class="fab fa-linux"></i>Linux
-            </label></li>
-    </ul>
-
-
-    <h2 id="feature-selector"><i class="fas fa-book"></i>What content would you like to include in the workshop?</h2>
-    <ul class="configurator">
-        <li id="use-native-li">
-            <label>
-                <input type="checkbox" id="use-native">Native compilation
-            </label>
-        </li>
-        <li id="use-ai-li">
-            <label>
-                <input type="checkbox" id="use-ai">Creating an AI-integration service
-            </label>
-        </li>
-        <li id="use-kubernetes-li">
-            <label>
-                <input type="checkbox" id="use-kubernetes">Running Quarkus on Kubernetes
-            </label>
-        </li>
-        <li>
-        <li id="use-contract-testing-li">
-            <label>
-                <input type="checkbox" id="use-contract-testing">Contract testing with Pact
-            </label>
-        </li>
-        <li id="use-observability-li" hidden="true">
-            <label>
-                <input type="checkbox" id="use-observability">Observability
-            </label>
-        </li>
-    <li id="use-messaging-li">
-            <label>
-                <input type="checkbox" id="use-messaging">Messaging
-            </label>
-        </li>
-    <li id="use-extension-li">
-            <label>
-                <input type="checkbox" id="use-extension">Writing an extension
-            </label>
-        </li>
-    </ul>
-
-    <button onClick="generateURL()">Take me to my custom workshop</button>
+    <div class="mode">
+        <h3 class="no-underline squish">Default workshop configuration</h3>
+        <div>Go to the instructions for all operating systems, with default content.</div>
+        <button class="big" onclick="generateDefaultURL()">
+            Take me to the default workshop
+        </button>
+    </div>
+    <div class="mode right">
+        <h3 class="no-underline squish">Customize workshop</h3>
+        <div>Tailor instructions to your operating system and interests.</div>
+
+        <h4 class="no-underline"><i class="fas fa-desktop"></i>What operating system are you using?</h4>
+        <ul class="configurator">
+            <li>
+                <label for="macRadio">
+                    <input type="radio" name="osOption" id="macRadio" value="mac"><i
+                    class="fab fa-apple"></i>MacOS
+                </label>
+            </li>
+            <li>
+                <label for="windowsRadio">
+                    <input type="radio" name="osOption" id="windowsRadio" value="windows"><i
+                    class="fab fa-windows"></i>Windows
+                </label>
+            </li>
+            <li>
+                <label for="linuxRadio">
+                    <input type="radio" name="osOption" id="linuxRadio" value="linux"><i
+                    class="fab fa-linux"></i>Linux
+                </label></li>
+        </ul>
+
+        <h4 class="no-underline" id="feature-selector"><i class="fas fa-book"></i>What content would you like to
+            include?
+        </h4>
+        <ul class="configurator">
+            <li id="use-ai-li">
+                <label>
+                    <input type="checkbox" id="use-ai">Creating an AI-integration service
+                </label>
+            </li>
+            <li id="use-azure-li">
+                <label>
+                    <input type="checkbox" id="use-azure">Deploying the microservices to Azure Container Apps (needs
+                    containers)
+                </label>
+            </li>
+            <li id="use-container-li">
+                <label>
+                    <input type="checkbox" id="use-container">Containerizing the microservices
+                </label>
+            </li>
+            <li id="use-contract-testing-li">
+                <label>
+                    <input type="checkbox" id="use-contract-testing">Contract testing with Pact
+                </label>
+            </li>
+            <li id="use-extension-li">
+                <label>
+                    <input type="checkbox" id="use-extension">Writing a Quarkus extension
+                </label>
+            </li>
+            <li id="use-kubernetes-li">
+                <label>
+                    <input type="checkbox" id="use-kubernetes">Running Quarkus on Kubernetes (needs containers)
+                </label>
+            </li>
+            <li id="use-messaging-li">
+                <label>
+                    <input type="checkbox" id="use-messaging">Messaging with Kafka
+                </label>
+            </li>
+            <li id="use-native-li">
+                <label>
+                    <input type="checkbox" id="use-native">Native compilation
+                </label>
+            </li>
+            <li>
+            <li id="use-observability-li">
+                <label>
+                    <input type="checkbox" id="use-observability">Observability
+                </label>
+            </li>
+        </ul>
+        <button class="big" onclick="generateTailoredURL()">
+            Take me to my custom workshop
+        </button>
+    </div>
 </div>
 
 <script>
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca-administrating.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca-administrating.adoc
index 99d6bfcb9..8c5bef5af 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca-administrating.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca-administrating.adoc
@@ -1,5 +1,5 @@
 [[azure-aca-monitoring]]
-= Monitoring
+= Monitoring the Application on Azure Container Apps
 
 == Restarting a Microservice
 
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca.adoc
index cf35ef76e..c8fb34596 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-aca.adoc
@@ -3,15 +3,11 @@
 
 '''
 
-Even if you won't be developing any Quarkus code, you might want to discover why this Java runtime is perfect for developing containerized applications, and why it makes with Azure Container Apps.
-And if you don't know Azure Container Apps, this chapter is the right time to take a breath and discover this Azure service.
 In this chapter, you are going to see:
 
 * What's Azure Container Apps?
 * How does Azure Container Apps fit in the long list of Azure services?
 * Pros and cons of using Azure Container Apps
-* What's Quarkus? and how does it change the Java landscape
-* What are the main Quarkus idea, and how it helps in the _cloud native world_
 
 == What's Azure Container Apps?
 
@@ -56,5 +52,3 @@ They share the same disk space and network.
 New revisions are automatically created and are valuable for HTTP traffic redirection strategies, such as A/B testing.
 
 image::azure-aca-concepts.png[]
-
-include::../core-quarkus/quarkus-definition.adoc[leveloffset=+1]
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-cleaning-up.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-cleaning-up.adoc
new file mode 100644
index 000000000..2495fba10
--- /dev/null
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-cleaning-up.adoc
@@ -0,0 +1,10 @@
+= Cleaning Up Azure Resources
+
+Do NOT forget to remove the Azure resources once you are done running the workshop.
+
+[source,shell]
+----
+az group delete \
+  --name "$RESOURCE_GROUP"
+----
+
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-conclusion-references.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-conclusion-references.adoc
deleted file mode 100644
index 98b439331..000000000
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-conclusion-references.adoc
+++ /dev/null
@@ -1,14 +0,0 @@
-[[azure-conclusion-references]]
-= References
-
-* https://quarkus.io/quarkus-workshops/super-heroes
-* https://github.com/cescoffier/quarkus-todo-app
-* https://github.com/agoncal/baking-microservice-pie
-* https://forge.jboss.org/document/hands-on-lab
-* https://bit.ly/forge-hol
-* https://quarkus.io
-* https://code.quarkus.io
-* https://quarkus.io/guides/all-config
-* https://azure.microsoft.com/services/container-apps[Azure Container Apps Overview]
-* https://docs.microsoft.com/azure/container-apps[Azure Container Apps Documentation]
-* https://github.com/ozangunalp/managed-kafka-quarkus/tree/main/azure-event-hub[Managed Kafka Quarkus]
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-conclusion.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-conclusion.adoc
deleted file mode 100644
index 6805f24b2..000000000
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-conclusion.adoc
+++ /dev/null
@@ -1,45 +0,0 @@
-[[azure-conclusion]]
-= Clean Up Azure Resources
-
-Do NOT forget to remove the Azure resources once you are done running the workshop.
-
-[source,shell]
-----
-az group delete \
-  --name "$RESOURCE_GROUP"
-----
-
-= Conclusion
-
-'''
-
-This is the end of the Super Hero workshop.
-We hope you liked it, learnt a few things, and more importantly, will be able to take this knowledge back to your projects.
-
-This workshop started making sure your development environment was ready to develop the entire application.
-Then, there was some brief terminology to help you in understanding some concepts around Quarkus.
-If you find it was too short and need more details on Quarkus, Microservices, MicroProfile, Cloud Native, or GraalVM, check the Quarkus website for more references.footnote:[Quarkus https://quarkus.io]
-
-
-Then, we focused on developing several isolated microservices.
-Some written in pure JAX-RS (such as the Villain) others with Reactive JAX-RS and Reactive Hibernate (such as the Hero).
-These microservices return a data in JSON, validate data thanks to Bean Validation, store and retrieve data from a relational database with the help of JPA, Panache and JTA.
-
-You then installed an already coded Angular application on another instance of Quarkus.
-At this stage, the Angular application couldn't access the microservices because of CORS issues that we quickly fixed.
-
-Then, we made the microservices communicate with each other in HTTP thanks to REST Client.
-But HTTP-related technologies usually use synchronous communication and therefore need to deal with invocation failure.
-With Fault Tolerance, it was just a matter of using a few annotations and we can get some fallback when the communication fails.
-
-That's also why we introduced Reactive Messaging with Kafka: so we don't have a temporal coupling between the microservices.
-
-// TODO
-//With so many microservices, observability becomes mandatory.
-//That's why we added some health checks and metrics to our microservices.
-//
-//Then, comes production time.
-//We had to build executable JARs and executable binaries (thanks to GraalVM), and package our microservices into Docker containers.
-
-Remember that you can find all the code for this fascicle at {github-url}.
-If some parts were not clear enough, or if you found something missing, a bug, or you just want to leave a note or suggestion, please use the GitHub issue tracker at {github-issue}.
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing.adoc
deleted file mode 100644
index 6c0ac954e..000000000
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-installing.adoc
+++ /dev/null
@@ -1,28 +0,0 @@
-[[azure-intro-installing]]
-= Installing Software
-
-For this workshop you don't need to have a Java environment setup on your machine.
-All the Java code will be build with multistage Dockerfile builds.
-So only Docker is needed to build, deploy and execute the application.
-As for deploying the infrastructure and the application to Azure, we will use Azure CLI.
-
-include::azure-intro-installing-wsl.adoc[leveloffset=+1]
-
-include::azure-intro-installing-azure-cli.adoc[leveloffset=+1]
-
-include::../core-introduction/introduction-installing-docker.adoc[leveloffset=+1]
-
-include::../core-introduction/introduction-installing-git.adoc[leveloffset=+1]
-
-== Recap
-
-Just make sure the following commands work on your machine.
-
-[source,shell]
-----
-$ az --version
-$ docker version
-$ docker compose version
-$ curl --version
-$ git --version
-----
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-presenting.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-presenting.adoc
deleted file mode 100644
index c59e62bc2..000000000
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-presenting.adoc
+++ /dev/null
@@ -1,97 +0,0 @@
-[[azure-intro-presenting]]
-= Presenting the Workshop
-
-This workshop should give you a practical introduction to Azure Container Apps.
-You will practice all the needed tools to deploy an entire microservice architecture, mixing classical HTTP, reactive and event-based microservices.
-You will finish by monitoring and scaling the microservices so they can handle the load.
-
-The idea is that you leave this workshop with a good understanding of what Azure Container Apps is, what it is not, and how it can help you in your projects.
-Then, you'll be prepared to investigate a bit more on your own.
-
-== What Will You Be Deploying?
-
-In this workshop, you will deploy an existing application that allows superheroes to fight against supervillains.
-You will be containerizing and deploying several microservices communicating either synchronously via REST or asynchronously using Kafka:
-
-* _Super Hero UI_: an Angular application to pick up a random superhero, a random supervillain, and makes them fight.
-The Super Hero UI is exposed via Quarkus and invokes the Fight REST API.
-* _Villain REST API_: A classical HTTP microservice exposing CRUD operations on Villains, stored in a PostgreSQL database.
-* _Hero REST API_: A reactive HTTP microservice exposing CRUD operations on Heroes, stored in a Postgres database.
-* _Fight REST API_: This REST API invokes the Hero and Villain APIs to get a random superhero and supervillain.
-Each fight is, then, stored in a PostgreSQL database.
-This microservice can be developed using both the classical (_imperative_) or reactive approach.
-Invocations to the hero and villain services are protected using resilience patterns (retry, timeout, circuit-breakers).
-* _Statistics_: Each fight is asynchronously sent (via Kafka) to the Statistics microservice.
-It has an HTML + JQuery UI displaying all the statistics.
-
-[plantuml,align=center]
-----
-include::{plantDir}/0-introduction-physical-architecture.puml[]
-----
-
-The main UI allows you to pick up one random Hero and Villain by clicking on "New Fighters."
-Then it's just a matter of clicking on "Fight!" to get them to fight.
-The table at the bottom shows the list of the previous fights.
-
-ifdef::use-ai[]
-image::angular-ui-ai.png[]
-endif::use-ai[]
-ifndef::use-ai[]
-image::angular-ui.png[]
-endif::use-ai[]
-
-The Statistics UI shows the number of fights per hero and villain.
-
-image::angular-ui-stats.png[role=half-size]
-
-== How Does This Workshop Work?
-
-You have this material in your hands (either electronically or printed), and you can now follow it step by step.
-The structure of this workshop is as follow :
-
-* _Installing all the needed tools_:
-in this section, you will install all the tools and code to be able to bundle, package and deploy our application
-* _Azure Container Apps and Quarkus_:
-this section introduces Quarkus and Azure Container Apps to make sure you have all the needed vocabulary to follow along
-* _Running the Application Locally_:
-in this section, you will build Docker images out of Quarkus microservices, execute them locally with Docker compose, push them to Azure Registry, all that using Docker and Azure CLI
-* _Running the Application on Azure Container Apps_:
-in this section, you will create an entire infrastructure on Azure (Postgres databases, Kafka, etc.) and deploy the microservices to Azure Container Apps
-* _Administrating_:
-in this section, you will add some load to your microservices, monitor them, scale them, check the logs, etc.
-
-If you already have the tools installed, skip the _Installing all the needed tools_ section and jump to the sections _Azure Container Apps and Quarkus_ or straight to _Running the Application Locally_ (if you already know Quarkus and Azure Container Apps), and start hacking on the command lines.
-This "à la carte" mode lets you make the most of this 2 to 4-hour long hands-on lab.
-
-== What Do You Have to Do?
-
-This workshop should be as self-explanatory as possible.
-So your job is to follow the instructions by yourself, do what you are supposed to do, and do not hesitate to ask for any clarification or assistance;
-that's why the team is here.
-
-Oh, and be ready to have some fun!
-
-== Software Requirements
-
-First of all, make sure you have a 64bits computer with admin rights (so you can install all the needed tools) and at least 16Gb of RAM (as some tools need a few resources).
-
-[WARNING]
-====
-If you are using Mac OS X, make sure the version is greater than 10.11.x (Captain).
-====
-
-This workshop will make use of the following software, tools, frameworks that you will need to install and now (more or less) how it works:
-
-* Azure CLI
-* Docker
-* cURL (or any other command line HTTP client)
-* (optionally) Any IDE you feel comfortable with (eg. Intellij IDEA, Eclipse IDE, VS Code..)
-
-The following section focuses on how to install and set up the needed software.
-You can skip the next section if you have already installed all the prerequisites.
-
-[WARNING]
-====
-This workshop assumes a bash shell.
-If you run on Windows, in particular, adjust the commands accordingly.
-====
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-local-running-app.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-local-running-app.adoc
index 7aaa3870e..d8826355f 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-local-running-app.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-local-running-app.adoc
@@ -3,41 +3,19 @@
 
 '''
 
-In this chapter we will build containers out of our Quarkus microservices and execute them locally thanks to Docker Compose.
-Then, we will push the containers to Azure Container Registry so we can still run them locally, and later on Azure Container Apps.
+In this chapter we will push the containers we've built to Azure Container Registry so we can still run them locally, and later on Azure Container Apps.
 
 [NOTE]
 ====
 Building containers locally and pushing them to Azure Container Registry can take from 15 to 30 minutes (depending on your CPU and bandwith).
-If you think you will not have enough time to complete the Workshop, you can skip the next optional sections and go straight to _Running remote containers_.
 ====
 
-== Building containers
-
 In this section, we are going to package our microservices into containers.
 In particular, we are going to produce Linux 64 bits native executables and runs them in a container.
 The native compilation uses the OS and architecture of the host system.
 
 And... Linux Containers are ... _Linux_.
 So to build a container with a Linux native executable (even if you are on Windows or Mac), Quarkus comes with a trick to produce these executable.
-First, Quarkus comes with a set of `Dockerfiles`.
-The `Dockerfile.native` file is for running the application in native mode.
-It looks like this:
-
-[source,text]
-----
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root target/*-runner /work/application
-
-EXPOSE 8080
-USER 1001
-
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
-----
 
 It's a pretty straightforward `Dockerfile` taking a minimal base image and copying the generated native executable.
 
@@ -63,76 +41,6 @@ include::{projectdir}/infrastructure/azure-build-push-registry.sh[tags=adocCompi
 ----
 include::{projectdir}/infrastructure/azure-build-push-registry.sh[tags=adocBuilding]
 ----
-
-Check that you have all the Docker images installed locally:
-
-[source,shell]
-----
-docker image ls | grep quarkus
-----
-
-The output should look like this:
-
-[source,shell]
-----
-quarkus/ui-super-heroes         latest      266MB
-quarkus/event-statistics        latest      145MB
-quarkus/rest-fights             latest      198MB
-quarkus/rest-villains           latest      158MB
-quarkus/rest-heroes             latest      154MB
-----
---
-
-== Running local containers
-
-Now that we have all our Docker containers created, let's execute them all to be sure that everything is working.
-
-[example, role="cta"]
---
-Under `super-heroes/infrastructure` you will find the `docker-compose-app-local.yaml` file.
-It declares all the needed infrastructure (databases, Kafka) as well as our microservices.
-Execute it with:
-
-[source,shell]
-----
-docker compose -f docker-compose-app-local.yaml up
-----
-
-To know that all your containers are started, you can use the following command:
-
-[source,shell]
-----
-docker compose -f docker-compose-app-local.yaml ps
-----
-
-You should get something similar to the following list.
-Make sure all your containers are in _running_ status:
-
-[source,shell]
-----
-event-statistics    "./application -Dqua…"   running
-kafka               "sh -c 'export CLUST…"   running
-rest-fights         "./application -Dqua…"   running
-rest-heroes         "./application -Dqua…"   running
-rest-villains       "./application -Dqua…"   running
-super-database      "docker-entrypoint.s…"   running (healthy)
-ui-super-heroes     "/bin/sh -c 'npm sta…"   running
-----
-
-Once all the containers are started, you can:
-
-* Go to http://localhost:8080 to check the main UI
-* Go to http://localhost:8085 to check the statistics UI
-* curl http://localhost:8084/api/villains | jq
-* curl http://localhost:8083/api/heroes | jq
-* curl http://localhost:8082/api/fights/randomfighters | jq
-
-Then, make sure you shut down the entire application with:
-
-[source,shell]
-----
-docker compose -f docker-compose-app-local.yaml down
-----
 --
 
 == Pushing containers to Azure Container Registry
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-preparing.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-setting-up.adoc
similarity index 70%
rename from quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-preparing.adoc
rename to quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-setting-up.adoc
index 8c6f3aace..f1e64132e 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-intro-preparing.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure-setting-up.adoc
@@ -1,66 +1,5 @@
 [[azure-intro-preparing]]
-= Preparing for the Workshop
-
-This workshop needs internet to access Azure of course, but also to download all sorts of Maven artifacts, Docker images, and even pictures.
-Some of these artifacts are large, and because we have to share internet connexions at the workshop, it is better to download them before the workshop.
-Here are a few commands that you can execute before the workshop.
-
-== Clone the GitHub repository of the application
-
-[example, role="cta"]
---
-First, clone the GitHub repository of the Super Heroes application located at {github-url} by executing the following command:
-
-[source,shell,subs="attributes+"]
-----
-git clone {github-repo}.git --depth 1
-----
---
-
-The code of this Super Heroes application is separated into two different directories:
-
-[plantuml]
-----
-@startsalt
-{
-{
-T
-quarkus-workshop-super-heroes
-+ super-heroes         | The entire Super Hero application
-}
-}
-@endsalt
-----
-
-Under the `super-heroes` directory you will find the entire Super Hero application spread throughout a set of subdirectories, each one containing a microservice or some tooling.
-The final structure will be the following:
-
-[plantuml]
-----
-@startsalt
-{
-{
-T
-quarkus-workshop-super-heroes
-+ super-heroes
-++ event-statistics        | UI and application dealing with fight statistics (you will create it)
-++ infrastructure          | All the needed infrastructure (Postgres, Kafka...)
-++ kubernetes              | All the files required to deploy on Kubernetes
-++ load-super-heroes       | Stress tool loading heroes, villains and fights
-++ rest-fight              | REST API allowing super heroes to fight (you will create it)
-++ rest-hero               | Reactive REST API for CRUD operations on Heroes (you will create it)
-++ rest-villains            | REST API for CRUD operations on Villains (you will create it)
-++ ui-super-heroes         | Angular application so we can fight visually
-}
-}
-@endsalt
-----
-
-include::../core-introduction/introduction-preparing-checking-ports.adoc[leveloffset=+1]
-
-include::../core-appendix/appendix-preparing-warming-caches.adoc[leveloffset=+1]
-
-== Setting Up Azure
+= Setting Up Azure
 
 To be able to deploy the application to Azure, you first need an Azure subscription.
 If you don't have one, go to https://signup.azure.com and register.
@@ -83,7 +22,7 @@ include::{projectdir}/infrastructure/azure-setup-azure-env.sh[tags=adocAzAccount
 ----
 --
 
-=== Setting Up the Azure Environment
+== Setting Up the Azure Environment
 
 Azure CLI is extensible and you can install as many extensions as you need.
 
@@ -140,11 +79,11 @@ az provider register --namespace Microsoft.Insights
 ----
 --
 
-== Creating Azure Resources
+= Creating Azure Resources
 
 Before creating the infrastructure for the Super Heroes application and deploying the microservices to Azure Container Apps, we need to create some Azure resources.
 
-=== Setting Up the Azure environment variables
+== Setting Up the Azure environment variables
 
 Let's first set a few environment variables that will help us in creating the Azure infrastructure.
 
@@ -161,7 +100,7 @@ include::{projectdir}/infrastructure/azure-setup-env-var.sh[tags=adocEnvironment
 Now let's create the Azure resources.
 --
 
-=== Resource Group
+== Resource Group
 
 A https://docs.microsoft.com/azure/azure-resource-manager/management/manage-resource-groups-portal[resource group] is a container that holds related resources for an Azure solution.
 The resource group can include all the resources for the solution, or only those resources that you want to manage as a group.
@@ -178,7 +117,7 @@ include::{projectdir}/infrastructure/azure-setup-azure-env.sh[tags=adocCreateRes
 ----
 --
 
-=== Log Analytics Workspace
+== Log Analytics Workspace
 
 https://docs.microsoft.com/azure/azure-monitor/logs/quick-create-workspace[Log Analytics workspace] is the environment for Azure Monitor log data.
 Each workspace has its own data repository and configuration, and data sources and solutions are configured to store their data in a particular workspace.
@@ -201,7 +140,7 @@ include::{projectdir}/infrastructure/azure-setup-azure-env.sh[tags=adocLogAnalyt
 ----
 --
 
-=== Azure Container Registry
+== Azure Container Registry
 
 In the next chapters we will be creating Docker containers and pushing them to the Azure Container Registry.
 https://azure.microsoft.com/services/container-registry[Azure Container Registry] is a private registry for hosting container images.
@@ -236,7 +175,7 @@ If you log into the https://portal.azure.com[Azure Portal] you should see the fo
 image::azure-portal-2.png[]
 --
 
-== Setting Up the Environment Variables
+= Setting Up the Environment Variables
 
 The Super Heroes environment and application will be created and deployed using a set of Azure CLI commands.
 Each of these commands need a set of parameters, and some of these parameters can be set of environment variables.
@@ -252,7 +191,7 @@ include::{projectdir}/infrastructure/azure-setup-env-var.sh[tags=adocEnvironment
 ----
 --
 
-== Ready?
+= Ready?
 
 After the prerequisites have been installed and the different components have been warmed up, and some Azure resource created, it's now time to deploy some code!
 But before, let us introduce Azure Container Apps and Quarkus.
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure.adoc
deleted file mode 100644
index 965173815..000000000
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-azure-container-apps/azure.adoc
+++ /dev/null
@@ -1,35 +0,0 @@
-[[azure]]
-= Welcome
-
-Let's say you are not a (Java) developer, and you are interested in deploying your applications to the cloud.
-You know some Docker, you don't know anything about Kubernetes (and don't want to learn), but you have heard of https://azure.microsoft.com[Microsoft Azure].
-This workshop is for you.
-
-This workshop offers attendees an intro-level, hands-on session with https://azure.microsoft.com/services/container-apps[Azure Container Apps], from pushing containerized microservices, to deploying an entire infrastructure, to execute microservices and consuming them.
-But, what are we going to deploy to Azure Container Apps?
-Well, it's going to be a set of microservices:
-
-* Developed with https://quarkus.io[Quarkus] (the microservices are already developed, and you don't need to know Quarkus)
-* Exposing HTTP APIs
-* Exchanging events with Apache Kafka
-* Storing data in databases
-* With some parts of the dark side of microservices (resilience, health, monitoring)
-* Answer the ultimate question: are super-heroes stronger than super-villains?
-
-This workshop is a BYOL (_Bring Your Own Laptop_) session, so bring your Windows, OSX, or Linux laptop, and be ready to install a few set of tools.
-What you are going to learn:
-
-* What is Azure Container Apps and what is Quarkus
-* How to build Docker images out of an existing Java application
-* How to execute the Docker images locally with Docker Compose
-* How to push the Docker images to Azure Registry
-* How to create managed services in Azure (Postgres database, Kafka)
-* How to deploy microservices to Azure Container Apps
-* How to configure Docker images in Azure Container Apps
-* How you improve the resilience of our microservices
-* And much more!
-
-Ready? Here we go!
-Check the workshop at {base-url}quarkus-workshops/super-heroes/index-azure.html of flash the QR Code if you don’t want to type.
-
-image::azure-aca-qrcode.png[]
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-container/container.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-container/container.adoc
new file mode 100644
index 000000000..cec14b396
--- /dev/null
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-container/container.adoc
@@ -0,0 +1,203 @@
+[[container]]
+= Containers
+
+'''
+
+In this chapter we will build containers out of our Quarkus microservices and execute them locally thanks to Docker Compose.
+In particular, we are going to produce Linux 64 bits native executables and runs them in a container.
+The native compilation uses the OS and architecture of the host system.
+
+== Building containers
+
+First, Quarkus comes with a set of `Dockerfiles`.
+The `Dockerfile.native` file is for running the application in native mode.
+It looks like this:
+
+[source,text]
+----
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5
+WORKDIR /work/
+RUN chown 1001 /work \
+    && chmod "g+rwX" /work \
+    && chown 1001:root /work
+COPY --chown=1001:root target/*-runner /work/application
+
+EXPOSE 8080
+USER 1001
+
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+----
+
+[example, role="cta"]
+--
+Check that you have all the Docker images installed locally:
+
+[source,shell]
+----
+docker image ls | grep quarkus
+----
+
+The output should look like this:
+
+[source,shell]
+----
+quarkus/ui-super-heroes         latest      266MB
+quarkus/event-statistics        latest      145MB
+quarkus/rest-fights             latest      198MB
+quarkus/rest-villains           latest      158MB
+quarkus/rest-heroes             latest      154MB
+----
+--
+
+
+== Running containers locally
+
+Now that we have all our Docker containers created, let's execute them all to be sure that everything is working.
+
+[example, role="cta"]
+--
+Under `super-heroes/infrastructure` you will find the `docker-compose-app-local.yaml` file.
+It declares all the needed infrastructure (databases, Kafka) as well as our microservices.
+Execute it with:
+
+[source,shell]
+----
+docker compose -f docker-compose-app-local.yaml up
+----
+
+To know that all your containers are started, you can use the following command:
+
+[source,shell]
+----
+docker compose -f docker-compose-app-local.yaml ps
+----
+
+You should get something similar to the following list.
+Make sure all your containers are in _running_ status:
+
+[source,shell]
+----
+event-statistics    "./application -Dqua…"   running
+kafka               "sh -c 'export CLUST…"   running
+rest-fights         "./application -Dqua…"   running
+rest-heroes         "./application -Dqua…"   running
+rest-villains       "./application -Dqua…"   running
+super-database      "docker-entrypoint.s…"   running (healthy)
+ui-super-heroes     "/bin/sh -c 'npm sta…"   running
+----
+
+Once all the containers are started, you can:
+
+* Go to http://localhost:8080 to check the main UI
+* Go to http://localhost:8085 to check the statistics UI
+* curl http://localhost:8084/api/villains | jq
+* curl http://localhost:8083/api/heroes | jq
+* curl http://localhost:8082/api/fights/randomfighters | jq
+
+Then, make sure you shut down the entire application with:
+
+[source,shell]
+----
+docker compose -f docker-compose-app-local.yaml down
+----
+--
+
+== Building native executables
+
+
+And... Linux Containers are ... _Linux_.
+So before being able to build a container with our native executable, we need to produce compatible native executables.
+If you are using a Linux 64 bits machine, you are good to go.
+If not, Quarkus comes with a trick to produce these executable:
+
+[source,shell]
+----
+./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
+----
+
+The `-Dquarkus.native.container-build=true` allows running the native compilation inside a container (provided by Quarkus).
+The result is a Linux 64 bits executable.
+
+[TIP]
+====
+Building a native executable takes time, CPU, and memory.
+It's even more accurate in the container.
+So, first, be sure that your container system has enough memory to build the executable.
+It requires at least 6Gb of memory, 8Gb is recommended.
+====
+
+[example, role="cta"]
+--
+
+Execute the above command for all our microservices.
+We also copy the UI into the fight service, to simplify the process:
+
+[source,shell]
+----
+cd rest-hero
+./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
+cd ..
+cd rest-villains
+./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
+cd ..
+cd rest-fight
+cp -R ../ui-super-heroes/dist/* src/main/resources/META-INF/resources
+./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
+cd ..
+cd event-statistics
+./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
+cd ..
+----
+--
+
+== Building native containers
+
+Now that we have the native executables, we can build containers.
+When you create projects, Quarkus generates two `Dockerfiles`:
+
+1. `Dockerfile.jvm` - A `Dockerfile` for running the application in JVM mode
+2. `Dockerfile.native` - A `Dockerfile` for running the application in native mode
+
+We are interested in this second file.
+Open one of these `Dockerfile.native` files:
+
+[source,text]
+----
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+WORKDIR /work/
+COPY target/*-runner /work/application
+RUN chmod 775 /work
+EXPOSE 8080
+CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+----
+
+It's a pretty straightforward `Dockerfile` taking a minimal base image and copying the generated native executable.
+It also exposes the port 8080.
+Wait, our microservices are not configured to run on the port 8080.
+We need to override this property as well as a few other such as the HTTP client endpoints, and database locations.
+
+To build the containers, use the following scripts:
+
+[source,shell]
+----
+export ORG=xxxx
+cd rest-hero
+docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-hero .
+cd ..
+cd rest-villains
+docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-villain .
+cd ..
+cd rest-fight
+docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-fight .
+cd ..
+cd event-statistics
+docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-stats .
+cd ..
+----
+
+[NOTE]
+====
+Replace `ORG` with your DockerHub / Quay.io username.
+====
+
+== Running native containers locally
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes-cloud-open-shift.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes-open-shift.adoc
similarity index 100%
rename from quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes-cloud-open-shift.adoc
rename to quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes-open-shift.adoc
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes-cloud.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes.adoc
similarity index 66%
rename from quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes-cloud.adoc
rename to quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes.adoc
index ed6221ba4..e73f4eda4 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes-cloud.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/optional-kubernetes/kubernetes.adoc
@@ -1,112 +1,11 @@
-[[cloud]]
-= Containers & Cloud
+[[kubernetes]]
+= Kubernetes
 
 '''
 
-This chapter explores how you can deploy Quarkus applications in containers and Cloud platforms.
+This chapter explores how you can deploy containerized Quarkus applications in Cloud platforms using Kubernetes.
 There are many different approaches to achieve these deployments.
-In this chapter, we are focusing on the creation of containers using Quarkus native executables and the deployment of our system in Kubernetes/OpenShift.
-
-== From bare metal to containers
-
-In this section, we are going to package our microservices into containers.
-In particular, we are going to produce Linux 64 bits native executables and runs them in a container.
-The native compilation uses the OS and architecture of the host system.
-
-And... Linux Containers are ... _Linux_.
-So before being able to build a container with our native executable, we need to produce compatible native executables.
-If you are using a Linux 64 bits machine, you are good to go.
-If not, Quarkus comes with a trick to produce these executable:
-
-[source,shell]
-----
-./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
-----
-
-The `-Dquarkus.native.container-build=true` allows running the native compilation inside a container (provided by Quarkus).
-The result is a Linux 64 bits executable.
-
-[TIP]
-====
-Building a native executable takes time, CPU, and memory.
-It's even more accurate in the container.
-So, first, be sure that your container system has enough memory to build the executable.
-It requires at least 6Gb of memory, 8Gb is recommended.
-====
-
-[example, role="cta"]
---
-
-Execute the above command for all our microservices.
-We also copy the UI into the fight service, to simplify the process:
-
-[source,shell]
-----
-cd rest-hero
-./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
-cd ..
-cd rest-villains
-./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
-cd ..
-cd rest-fight
-cp -R ../ui-super-heroes/dist/* src/main/resources/META-INF/resources
-./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
-cd ..
-cd event-statistics
-./mvnw clean package -Pnative -Dquarkus.native.container-build=true -DskipTests
-cd ..
-----
---
-
-== Building containers
-
-Now that we have the native executables, we can build containers.
-When you create projects, Quarkus generates two `Dockerfiles`:
-
-1. `Dockerfile.jvm` - A `Dockerfile` for running the application in JVM mode
-2. `Dockerfile.native` - A `Dockerfile` for running the application in native mode
-
-We are interested in this second file.
-Open one of these `Dockerfile.native` files:
-
-[source,text]
-----
-FROM registry.access.redhat.com/ubi8/ubi-minimal
-WORKDIR /work/
-COPY target/*-runner /work/application
-RUN chmod 775 /work
-EXPOSE 8080
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
-----
-
-It's a pretty straightforward `Dockerfile` taking a minimal base image and copying the generated native executable.
-It also exposes the port 8080.
-Wait, our microservices are not configured to run on the port 8080.
-We need to override this property as well as a few other such as the HTTP client endpoints, and database locations.
-
-To build the containers, use the following scripts:
-
-[source,shell]
-----
-export ORG=xxxx
-cd rest-hero
-docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-hero .
-cd ..
-cd rest-villains
-docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-villain .
-cd ..
-cd rest-fight
-docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-fight .
-cd ..
-cd event-statistics
-docker build -f src/main/docker/Dockerfile.native -t $ORG/quarkus-workshop-stats .
-cd ..
-----
-
-[NOTE]
-====
-Replace `ORG` with your DockerHub / Quay.io username.
-====
+In this chapter, we are focusing on deploying our containers in Kubernetes.
 
 == Deploying on Kubernetes
 
@@ -291,7 +190,6 @@ Create a `deployment-hero.yaml` file with the following content:
 
 [source,yaml]
 ----
----
 apiVersion: "v1"
 kind: "List"
 items:
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/spine-azure.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/spine-azure.adoc
deleted file mode 100644
index 769ed809b..000000000
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/spine-azure.adoc
+++ /dev/null
@@ -1,63 +0,0 @@
-= Deploy to Azure Container Apps Workshop
-Antonio Goncalves
-v1.0, {docdate}: Quarkus {quarkus-version}
-
-:doctype: book
-:source-highlighter: coderay
-:source-language: java
-// Caption and XRef caption
-:appendix-caption: Appendix
-:listing-caption: Listing
-:figure-caption: Figure
-:table-caption: Table
-:xrefstyle: short
-// TOC
-:toc:
-:toclevels: 2
-:toc-title: Contents
-// Images
-:full-width: role=full-width
-:half-width: role=half-width
-:half-size: role=half-size
-:projectdir: {docdir}/../../../../super-heroes/
-// Conditional includes - can be overridden in the build to generate tailored docs
-include::{options-file}[]
-// Convert from named attributes to booleans
-ifeval::["{os}"=="mac"]
-:use-mac:
-endif::[]
-ifeval::["{os}"=="linux"]
-:use-linux:
-endif::[]
-ifeval::["{os}"=="windows"]
-:use-windows:
-endif::[]
-// Default cases
-ifeval::["{os}"=="all"]
-:use-mac:
-:use-linux:
-:use-windows:
-endif::[]
-// Do a fallback to everything if OS isn't set,
-ifndef::os[]
-:use-mac:
-:use-linux:
-:use-windows:
-endif::[]
-
-// Introduction
-include::optional-azure-container-apps/azure.adoc[leveloffset=+1]
-include::optional-azure-container-apps/azure-intro-presenting.adoc[leveloffset=+2]
-include::optional-azure-container-apps/azure-intro-installing.adoc[leveloffset=+2]
-include::optional-azure-container-apps/azure-intro-preparing.adoc[leveloffset=+2]
-<<<
-include::optional-azure-container-apps/azure-aca.adoc[leveloffset=+1]
-<<<
-include::optional-azure-container-apps/azure-local-running-app.adoc[leveloffset=+1]
-<<<
-include::optional-azure-container-apps/azure-aca-running-app.adoc[leveloffset=+1]
-//<<<
-//include::A-azure-container-apps/azure-aca-administrating.adoc[leveloffset=+1]
-<<<
-include::optional-azure-container-apps/azure-conclusion.adoc[leveloffset=+1]
-include::optional-azure-container-apps/azure-conclusion-references.adoc[leveloffset=+1]
diff --git a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/spine.adoc b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/spine.adoc
index 8dd92e7df..c41b6c1ab 100644
--- a/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/spine.adoc
+++ b/quarkus-workshop-super-heroes/docs/src/docs/asciidoc/spine.adoc
@@ -146,19 +146,35 @@ include::optional-observability/observability-prometheus.adoc[leveloffset=+2]
 <<<
 endif::use-observability[]
 
-// Extension
-ifdef::use-extension[]
-include::optional-quarkus-extension/quarkus-extension.adoc[leveloffset=+1]
+// Container
+ifdef::use-container[]
+include::optional-container/container.adoc[leveloffset=+1]
 <<<
-endif::use-extension[]
+endif::use-container[]
 
 // Kubernetes
 ifdef::use-kubernetes[]
-include::optional-kubernetes/kubernetes-cloud.adoc[leveloffset=+1]
-include::optional-kubernetes/kubernetes-cloud-open-shift.adoc[leveloffset=+2]
+include::optional-kubernetes/kubernetes.adoc[leveloffset=+1]
+include::optional-kubernetes/kubernetes-open-shift.adoc[leveloffset=+2]
 <<<
 endif::use-kubernetes[]
 
+// Azure
+ifdef::use-azure[]
+include::optional-azure-container-apps/azure-aca.adoc[leveloffset=+1]
+include::optional-azure-container-apps/azure-setting-up.adoc[leveloffset=+2]
+include::optional-azure-container-apps/azure-local-running-app.adoc[leveloffset=+2]
+include::optional-azure-container-apps/azure-aca-running-app.adoc[leveloffset=+2]
+include::optional-azure-container-apps/azure-aca-administrating.adoc[leveloffset=+2]
+include::optional-azure-container-apps/azure-cleaning-up.adoc[leveloffset=+2]
+endif::use-azure[]
+
+// Extension
+ifdef::use-extension[]
+include::optional-quarkus-extension/quarkus-extension.adoc[leveloffset=+1]
+<<<
+endif::use-extension[]
+
 
 // ====================================================
 // ====================== CORE ========================
diff --git a/quarkus-workshop-super-heroes/docs/src/resource-generation/generate-attribute-combinations.sh b/quarkus-workshop-super-heroes/docs/src/resource-generation/generate-attribute-combinations.sh
index dd88147af..b1735e9eb 100755
--- a/quarkus-workshop-super-heroes/docs/src/resource-generation/generate-attribute-combinations.sh
+++ b/quarkus-workshop-super-heroes/docs/src/resource-generation/generate-attribute-combinations.sh
@@ -3,13 +3,15 @@ set -e
 
 # Define the variable variations
 # To disable a variant, just set it to false, rather than removing it (or remove it everywhere, including the pom and the HTML)
-native=("true" "false")
-kubernetes=("true" "false")
 ai=("true" "false")
-observability=("false")
-messaging=("true" "false")
+azure=("true" "false")
+container=("true" "false")
 contract_testing=("true" "false")
 extension=("true" "false")
+kubernetes=("true" "false")
+messaging=("true" "false")
+native=("true" "false")
+observability=("false")
 
 basedir=$1
 
@@ -19,34 +21,40 @@ if [ -z ${2+x} ]; then oses=("all" "mac" "linux" "windows"); else oses=($2); fi
 
 # Iterate over the combinations
 for os in "${oses[@]}"; do
-    for use_native in "${native[@]}"; do
-        for use_kubernetes in "${kubernetes[@]}"; do
-            for use_ai in "${ai[@]}"; do
-                for use_observability in "${observability[@]}"; do
-                    for use_messaging in "${messaging[@]}"; do
-                        for use_contract_testing in "${contract_testing[@]}"; do
-                            for use_extension in "${extension[@]}"; do
-
-                                # Create a filename based on the combination
-                                # Any changes here should be reflected in the index.html UI, too
-                                # It would be nice to make nested folders but the maven iterator plugin needs a flat set of folders
-                                dirname=${basedir}/os-${os}-native-${use_native}-ai-${use_ai}-kubernetes-${use_kubernetes}-contract-testing-${use_contract_testing}-observability-${use_observability}-extension-${use_extension}-messaging-${use_messaging}
-                                mkdir -p ${dirname}
-
-                                filename="${dirname}/options.adoc"
-
-                                # Write the combination to the file
-                                echo ":os: $os" >"$filename"
-
-                                # For the true falses combos, only define a variable if it's true
-                                if [ "$use_native" = 'true' ]; then echo ":use-native:" >>"$filename"; fi
-                                if [ "$use_ai" = 'true' ]; then echo ":use-ai:" >>"$filename"; fi
-                                if [ "$use_kubernetes" = 'true' ]; then echo ":use-kubernetes:" >>"$filename"; fi
-                                if [ "$use_observability" = 'true' ]; then echo ":use-observability:" >>"$filename"; fi
-                                if [ "$use_messaging" = 'true' ]; then echo ":use-messaging:" >>"$filename"; fi
-                                if [ "$use_contract_testing" = 'true' ]; then echo ":use-contract-testing:" >>"$filename"; fi
-                                if [ "$use_extension" = 'true' ]; then echo ":use-extension:" >>"$filename"; fi
-                                echo "Created $filename"
+    for use_ai in "${ai[@]}"; do
+        for use_azure in "${azure[@]}"; do
+            for use_container in "${container[@]}"; do
+                for use_contract_testing in "${contract_testing[@]}"; do
+                    for use_extension in "${extension[@]}"; do
+                        for use_kubernetes in "${kubernetes[@]}"; do
+                            for use_messaging in "${messaging[@]}"; do
+                                for use_native in "${native[@]}"; do
+                                    for use_observability in "${observability[@]}"; do
+
+                                        # Create a filename based on the combination
+                                        # Any changes here should be reflected in the index.html UI, too
+                                        # It would be nice to make nested folders but the maven iterator plugin needs a flat set of folders
+                                        dirname=${basedir}/os-${os}-native-${use_native}-ai-${use_ai}-kubernetes-${use_kubernetes}-contract-testing-${use_contract_testing}-observability-${use_observability}-extension-${use_extension}-messaging-${use_messaging}
+                                        mkdir -p ${dirname}
+
+                                        filename="${dirname}/options.adoc"
+
+                                        # Write the combination to the file
+                                        echo ":os: $os" >"$filename"
+
+                                        # For the true falses combos, only define a variable if it's true
+                                        if [ "$use_ai" = 'true' ]; then echo ":use-ai:" >>"$filename"; fi
+                                        if [ "$use_azure" = 'true' ]; then echo ":use-azure:" >>"$filename"; fi
+                                        if [ "$use_container" = 'true' ]; then echo ":use-container:" >>"$filename"; fi
+                                        if [ "$use_contract_testing" = 'true' ]; then echo ":use-contract-testing:" >>"$filename"; fi
+                                        if [ "$use_extension" = 'true' ]; then echo ":use-extension:" >>"$filename"; fi
+                                        if [ "$use_kubernetes" = 'true' ]; then echo ":use-kubernetes:" >>"$filename"; fi
+                                        if [ "$use_messaging" = 'true' ]; then echo ":use-messaging:" >>"$filename"; fi
+                                        if [ "$use_native" = 'true' ]; then echo ":use-native:" >>"$filename"; fi
+                                        if [ "$use_observability" = 'true' ]; then echo ":use-observability:" >>"$filename"; fi
+                                        echo "Created $filename"
+                                    done
+                                done
                             done
                         done
                     done
diff --git a/quarkus-workshop-super-heroes/docs/src/resource-generation/qrcode.java b/quarkus-workshop-super-heroes/docs/src/resource-generation/qrcode.java
index 46dc6e437..7c7c4f7b5 100644
--- a/quarkus-workshop-super-heroes/docs/src/resource-generation/qrcode.java
+++ b/quarkus-workshop-super-heroes/docs/src/resource-generation/qrcode.java
@@ -20,6 +20,11 @@
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * To invoke this, run jbang https://github
+ * .com/quarkusio/quarkus-workshops/blob/main/quarkus-workshop-super-heroes/docs/src/resource
+ * -generation/qrcode.java https://shattereddisk.github.io/rickroll/ mycode.png
+ */
 class qrcode {
 
     // We can do either 1color or rgb