diff --git a/_data/guides.yaml b/_data/guides.yaml
index 1053f6d8a..3fb45a27c 100644
--- a/_data/guides.yaml
+++ b/_data/guides.yaml
@@ -7,9 +7,41 @@ categories:
       - title: Getting Started with WildFly
         url: /get-started
         description: Build and run a Jakarta EE application with WildFly in a few minutes
-      - title: Java Microservices on Kubernetes with WildFly
-        url: /guides/get-started-microservices-on-kubernetes
-        description: Build and run Jakarta EE applications with WildFly on Kubernetes in a few minutes
+  - category: Cloud / Containerization
+    cat-id: cloud-containerization
+    groups:
+      - title: Jakarta REST service
+        guides:
+          - description: Build the Container Image
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-part1
+          - description: Run the Container Image on Kubernetes
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-part2
+      - title: Jakarta REST service using a Database
+        guides:
+          - description: Build the Container Image
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-database-part1
+          - description: Run the Container Image on Kubernetes
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-database-part2
+      - title: Jakarta REST service using Infinispan
+        guides:
+          - description: Build the Container Image
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-infinispan-part1
+          - description: Run the Container Image on Kubernetes
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-infinispan-part2
+      - title: Jakarta REST service using a Message Broker
+        guides:
+          - description: Build the Container Image
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-jms-part1
+          - description: Run the Container Image on Kubernetes
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-jms-part2
+      - title: Jakarta REST service invoking another Jakarta REST service
+        guides:
+          - description: Build the Container Image
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-client-part1
+          - description: Run the Container Image on Kubernetes
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-client-part2
+          - description: Propagate Authentication and Authorization
+            url: /guides/get-started-microservices-on-kubernetes/simple-microservice-client-part3
   - category: Automation
     cat-id: automation
     guides:
diff --git a/_includes/index-guides.html b/_includes/index-guides.html
index 417c6dfba..cb42e6e85 100644
--- a/_includes/index-guides.html
+++ b/_includes/index-guides.html
@@ -6,14 +6,28 @@ <h1 class="title">{{ page.title }}</h1>
   <div class="grid-wrapper news-list-blocks">
     {% for item in site.data["guides"].categories %}
         <h2 class="grid__item width-12-12" id="{{ item.cat-id }}">{{ item.category }}</h3>
-        {% for guide in item.guides %}
-          <div class="grid__item width-3-12 news-block-item">
-            <div class="post-title">
-              <h4><a href="{{site.baseurl}}{{ guide.url }}">{{ guide.title}}</a></h4>
-              <div class="description">{{ guide.description | markdownify }}</div>
-            </div>
-          </div>
-        {% endfor %}
+        {% if item.groups %}
+            {% for group in item.groups %}
+                <div class="grid__item width-3-12 news-block-item">
+                    <div class="post-title">
+                        <h4>{{ group.title}}</h4>
+                        {% for guide in group.guides %}
+                        <div class="description"><a href="{{site.baseurl}}{{ guide.url }}">{{ guide.description}}</a></div>
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endfor %}
+        {% endif %}
+        {% if item.guides %}
+            {% for guide in item.guides %}
+              <div class="grid__item width-3-12 news-block-item">
+                <div class="post-title">
+                  <h4><a href="{{site.baseurl}}{{ guide.url }}">{{ guide.title}}</a></h4>
+                  <div class="description">{{ guide.description | markdownify }}</div>
+                </div>
+              </div>
+            {% endfor %}
+        {% endif %}
     {% endfor %}
   </div>
 </div>
\ No newline at end of file