diff --git a/adapters/oidc/spring-boot-container-bundle/pom.xml b/adapters/oidc/spring-boot-container-bundle/pom.xml
index bdbcee5e3a..35c8383e7a 100644
--- a/adapters/oidc/spring-boot-container-bundle/pom.xml
+++ b/adapters/oidc/spring-boot-container-bundle/pom.xml
@@ -36,7 +36,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.4.3</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/docs/guides/pom.xml b/docs/guides/pom.xml
index 206e76e3a2..70df23c321 100644
--- a/docs/guides/pom.xml
+++ b/docs/guides/pom.xml
@@ -78,7 +78,6 @@
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>1.5.5</version>
                 <configuration>
                     <sourceDocumentName>index.adoc</sourceDocumentName>
                     <backend>html5</backend>
diff --git a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideMojo.java b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideMojo.java
index cc27a686df..6e27ef3a56 100644
--- a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideMojo.java
+++ b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideMojo.java
@@ -10,7 +10,7 @@ import org.codehaus.plexus.util.FileUtils;
 
 import java.io.File;
 
-@Mojo(name = "keycloak-guide", defaultPhase = LifecyclePhase.GENERATE_SOURCES)
+@Mojo(name = "keycloak-guide", defaultPhase = LifecyclePhase.GENERATE_SOURCES, threadSafe = true)
 public class GuideMojo extends AbstractMojo {
 
     @Parameter(property = "project.build.sourceDirectory")
diff --git a/federation/sssd/pom.xml b/federation/sssd/pom.xml
index d08ac4220a..e605c3e6f1 100644
--- a/federation/sssd/pom.xml
+++ b/federation/sssd/pom.xml
@@ -18,7 +18,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.3</version>
                 <executions>
                     <!-- Run shade goal on package phase -->
                     <execution>
diff --git a/integration/client-cli/admin-cli/pom.xml b/integration/client-cli/admin-cli/pom.xml
index 6692be8031..e3db6cfe96 100755
--- a/integration/client-cli/admin-cli/pom.xml
+++ b/integration/client-cli/admin-cli/pom.xml
@@ -58,7 +58,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <!--version>2.4.3</version-->
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/integration/client-cli/client-registration-cli/pom.xml b/integration/client-cli/client-registration-cli/pom.xml
index 836a223a80..66c0281eff 100755
--- a/integration/client-cli/client-registration-cli/pom.xml
+++ b/integration/client-cli/client-registration-cli/pom.xml
@@ -57,7 +57,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <!--version>2.4.3</version-->
                 <executions>
                     <execution>
                         <phase>package</phase>
diff --git a/pom.xml b/pom.xml
index d1dd0ec6eb..3ffc9ccae0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,6 +190,7 @@
         <frontend.plugin.version>1.12.0</frontend.plugin.version>
         <docker.maven.plugin.version>0.40.3</docker.maven.plugin.version>
         <verifier.plugin.version>1.1</verifier.plugin.version>
+        <shade.plugin.version>3.4.1</shade.plugin.version>
 
         <!-- Surefire Settings -->
         <surefire.memory.Xms>512m</surefire.memory.Xms>
@@ -1803,6 +1804,11 @@
                         <nexusUrl>${jboss.repo.nexusUrl}</nexusUrl>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-shade-plugin</artifactId>
+                    <version>${shade.plugin.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
@@ -1829,7 +1835,6 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${surefire-plugin.version}</version>
                     <configuration>
-                        <forkMode>once</forkMode>
                         <argLine>-Djava.awt.headless=true ${surefire.memory.settings} ${surefire.system.args} -Duser.language=en -Duser.region=US -XX:+ExitOnOutOfMemoryError -XX:+HeapDumpOnOutOfMemoryError</argLine>
                         <runOrder>alphabetical</runOrder>
                         <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
@@ -1957,6 +1962,11 @@
                         </execution>
                     </executions>
                 </plugin>
+                <plugin>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctor-maven-plugin</artifactId>
+                    <version>1.5.8</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
diff --git a/services/pom.xml b/services/pom.xml
index 059c494703..04280f69e5 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -308,7 +308,6 @@
                     <plugin>
                         <groupId>org.asciidoctor</groupId>
                         <artifactId>asciidoctor-maven-plugin</artifactId>
-                        <version>1.5.3</version>
                         <executions>
                             <execution>
                                 <id>generate-docs</id>
diff --git a/themes/pom.xml b/themes/pom.xml
index a9ced75b47..ee3d1e295b 100755
--- a/themes/pom.xml
+++ b/themes/pom.xml
@@ -69,6 +69,17 @@
                 <directory>src/main/resources-community</directory>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/node_modules/**/*</exclude>
+                        <exclude>**/web_modules/**/*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>