diff --git a/pom.xml b/pom.xml
index 2df4eb67..1babb82b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
         <version.commons-compress>1.26.0</version.commons-compress>
 
         <version.keycloak>25.0.2</version.keycloak>
+        <version.keycloak.client>26.0.0-SNAPSHOT</version.keycloak.client>
 
         <version.frontend-maven-plugin>1.12.1</version.frontend-maven-plugin>
         <version.node>v16.13.1</version.node>
@@ -218,6 +219,15 @@
                                             <overWrite>true</overWrite>
                                             <outputDirectory>${project.build.directory}</outputDirectory>
                                         </artifactItem>
+                                        <artifactItem>
+                                            <groupId>org.keycloak</groupId>
+                                            <artifactId>keycloak-client-guides</artifactId>
+                                            <version>${version.keycloak.client}</version>
+                                            <classifier>asciidoc</classifier>
+                                            <type>zip</type>
+                                            <overWrite>true</overWrite>
+                                            <outputDirectory>${project.build.directory}</outputDirectory>
+                                        </artifactItem>
                                     </artifactItems>
                                 </configuration>
                             </execution>
diff --git a/src/main/java/org/keycloak/webbuilder/Guides.java b/src/main/java/org/keycloak/webbuilder/Guides.java
index 32ce6fbf..6bbf84bd 100644
--- a/src/main/java/org/keycloak/webbuilder/Guides.java
+++ b/src/main/java/org/keycloak/webbuilder/Guides.java
@@ -30,7 +30,8 @@ public Guides(File tmpDir, File guidesDir, AsciiDoctor asciiDoctor) throws IOExc
             loadGuides(asciiDoctor, d, category);
         }
 
-        Arrays.stream(tmpDir.getParentFile().listFiles((f, s) -> s.startsWith("keycloak-guides"))).findFirst().ifPresent(f -> {
+        Arrays.stream(tmpDir.getParentFile().listFiles((f, s) -> s.startsWith("keycloak-guides") || s.startsWith("keycloak-client-guides")))
+                .forEach(f -> {
             try {
                 loadGuides(asciiDoctor, new File(f, "generated-guides/server"), GuideCategory.SERVER);
                 loadGuides(asciiDoctor, new File(f, "generated-guides/operator"), GuideCategory.OPERATOR);
@@ -238,9 +239,9 @@ public enum GuideCategory {
         SECURING_APPS("securing-apps", "Securing applications"),
         HIGH_AVAILABILITY("high-availability", "High availability");
 
-        private String label;
+        private final String label;
 
-        private String id;
+        private final String id;
 
         GuideCategory(String id, String label) {
             this.id = id;
diff --git a/src/main/java/org/keycloak/webbuilder/builders/ResourcesBuilder.java b/src/main/java/org/keycloak/webbuilder/builders/ResourcesBuilder.java
index cea0ebcb..0fb840e0 100644
--- a/src/main/java/org/keycloak/webbuilder/builders/ResourcesBuilder.java
+++ b/src/main/java/org/keycloak/webbuilder/builders/ResourcesBuilder.java
@@ -4,11 +4,9 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Arrays;
-import java.util.Optional;
-import java.util.stream.Stream;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class ResourcesBuilder extends AbstractBuilder {
 
@@ -23,17 +21,19 @@ protected void build() throws Exception {
 
         FileUtils.copyDirectory(new File(context.getBlogDir(), "images"), new File(new File(targetResourcesDir, "images"), "blog"));
         FileUtils.copyDirectory(new File(context.getGuidesDir(), "images"), guidesImageDir);
-        Optional<File> genGuidesDir = Arrays.stream(context.getTmpDir().getParentFile().listFiles((f, s) -> s.startsWith("keycloak-guides"))).findFirst();
-
-        Optional<File> genGuidesImagesDir = genGuidesDir.flatMap( d -> Arrays.stream(new File(d, "generated-guides").listFiles(n -> n.getName().equals("images"))).findAny());
-        if (genGuidesImagesDir.isPresent()) {
-            for (File f : genGuidesImagesDir.get().listFiles()) {
-                if (f.isFile()) {
-                    FileUtils.copyFileToDirectory(f, guidesImageDir);
-                } else {
-                    FileUtils.copyDirectoryToDirectory(f, guidesImageDir);
-                }
-            }
+        List<File> genGuidesImagesDirs = Arrays.stream(context.getTmpDir().getParentFile()
+                .listFiles((f, s) -> s.startsWith("keycloak-guides") || s.startsWith("keycloak-client-guides")))
+                .flatMap(d -> Arrays.stream(new File(d, "generated-guides").listFiles(n -> n.getName().equals("images"))))
+                .collect(Collectors.toList());
+
+         for (File genGuidesImagesDir : genGuidesImagesDirs) {
+            for (File f : genGuidesImagesDir.listFiles()) {
+                 if (f.isFile()) {
+                     FileUtils.copyFileToDirectory(f, guidesImageDir);
+                 } else {
+                     FileUtils.copyDirectoryToDirectory(f, guidesImageDir);
+                 }
+             }
         }
 
         printStep("copied", "blog images");