diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index 26532d78f7..47a108a981 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -29,39 +29,10 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/keycloak</directory>
             <outputDirectory>modules/system/add-ons/keycloak</outputDirectory>
-            <includes>
-                <include>com/google/zxing/**</include>
-                <include>org/freemarker/**</include>
-                <include>org/jboss/aesh/0.65/**</include>
-                <include>org/keycloak/**</include>
-                <include>org/liquibase/**</include>
-                <include>org/mongodb/**</include>
-                <include>org/twitter4j/**</include>
-                <include>aopalliance/**</include>
-                <include>com/thoughtworks/xstream/**</include>
-                <include>org/antlr/**</include>
-                <include>org/apache/**</include>
-                <include>org/codehouse/**</include>
-                <include>org/drools/**</include>
-                <include>org/eclipse/**</include>
-                <include>org/kie/**</include>
-                <include>org/mvel/**</include>
-                <include>org/sonatype/**</include>
-                <include>sun/jdk/jgss/**</include>
-            </includes>
-        </fileSet>
-        <!-- Authorization -->
-        <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/modules/system/layers/keycloak-authz</directory>
-            <outputDirectory>modules/system/add-ons/keycloak-authz</outputDirectory>
             <includes>
                 <include>**/**</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/content</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/unpacked/keycloak-${project.version}/themes</directory>
             <outputDirectory>themes</outputDirectory>
@@ -90,6 +61,23 @@
             </includes>
             <outputDirectory>bin</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/bin</directory>
+            <includes>
+                <include>add-user-keycloak.*</include>
+                <include>federation-sssd-setup.sh</include>
+                <include>kcadm.*</include>
+                <include>kcreg.*</include>
+            </includes>
+            <outputDirectory>bin</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/keycloak-${project.version}/bin/client</directory>
+            <includes>
+                <include>keycloak*</include>
+            </includes>
+            <outputDirectory>bin/client</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>
@@ -97,16 +85,6 @@
             <source>target/README.txt</source>
             <outputDirectory></outputDirectory>
         </file>
-        <file>
-            <source>${project.build.directory}/unpacked/keycloak-${project.version}/bin/add-user-keycloak.sh</source>
-            <outputDirectory>bin</outputDirectory>
-            <destName>add-user-keycloak.sh</destName>
-        </file>
-        <file>
-            <source>${project.build.directory}/unpacked/keycloak-${project.version}/bin/add-user-keycloak.bat</source>
-            <outputDirectory>bin</outputDirectory>
-            <destName>add-user-keycloak.bat</destName>
-        </file>
     </files>
 
 </assembly>