diff --git a/scala/assembly/pom.xml b/scala/assembly/pom.xml
index 804cfd74015..fedafa30bc1 100644
--- a/scala/assembly/pom.xml
+++ b/scala/assembly/pom.xml
@@ -102,8 +102,8 @@
                 <version>${maven-assembly-plugin.version}</version>
                 <configuration>
                     <descriptors>
-                        <descriptor>src/main/assembly/assembly.xml
-                        </descriptor>
+		        <descriptor>src/main/assembly/assembly.xml</descriptor>
+                        <descriptor>src/main/assembly/fat-assembly.xml</descriptor>
                     </descriptors>
                 </configuration>
                 <executions>
diff --git a/scala/assembly/src/main/assembly/assembly.xml b/scala/assembly/src/main/assembly/assembly.xml
index 6d25a4f692b..6c10473bad7 100644
--- a/scala/assembly/src/main/assembly/assembly.xml
+++ b/scala/assembly/src/main/assembly/assembly.xml
@@ -120,34 +120,6 @@
           <include>/**</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <outputDirectory>/assembly</outputDirectory>
-      <directory>${project.parent.basedir}/dllib/target</directory>
-      <includes>
-          <include>bigdl-dllib*-jar-with-dependencies.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>/assembly</outputDirectory>
-      <directory>${project.parent.basedir}/orca/target</directory>
-      <includes>
-          <include>bigdl-orca*-jar-with-dependencies.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>/assembly</outputDirectory>
-      <directory>${project.parent.basedir}/friesian/target</directory>
-      <includes>
-          <include>bigdl-friesian*-jar-with-dependencies.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <outputDirectory>/assembly</outputDirectory>
-      <directory>${project.parent.basedir}/ppml/target</directory>
-      <includes>
-          <include>bigdl-ppml*-jar-with-dependencies.jar</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <outputDirectory>/python</outputDirectory>
       <directory>${project.parent.basedir}/../python/ppml/scripts</directory>
diff --git a/scala/assembly/src/main/assembly/fat-assembly.xml b/scala/assembly/src/main/assembly/fat-assembly.xml
new file mode 100644
index 00000000000..9cc69da14b3
--- /dev/null
+++ b/scala/assembly/src/main/assembly/fat-assembly.xml
@@ -0,0 +1,118 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+  <id>fat-jars</id>
+  <formats>
+    <format>dir</format>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+        <outputDirectory>/conf</outputDirectory>
+        <directory>${project.parent.basedir}/dllib/src/main/resources</directory>
+        <includes>
+            <include>spark-bigdl.conf</include>
+        </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/bin</outputDirectory>
+      <directory>${project.parent.basedir}/../scripts</directory>
+      <includes>
+        <include>*with-dllib.sh</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/apps</outputDirectory>
+      <directory>${project.parent.basedir}/../apps</directory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/python</outputDirectory>
+      <directory>${project.parent.basedir}/dllib/target</directory>
+      <includes>
+          <include>bigdl-dllib*-python-api.zip</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/python</outputDirectory>
+      <directory>${project.parent.basedir}/orca/target</directory>
+      <includes>
+          <include>bigdl-orca*-python-api.zip</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/python</outputDirectory>
+      <directory>${project.parent.basedir}/friesian/target</directory>
+      <includes>
+          <include>bigdl-friesian*-python-api.zip</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/python</outputDirectory>
+      <directory>${project.parent.basedir}/target</directory>
+      <includes>
+          <include>bigdl*-python-api.zip</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/examples/dllib</outputDirectory>
+      <directory>${project.parent.basedir}/../python/dllib/examples</directory>
+      <includes>
+          <include>/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/examples/orca</outputDirectory>
+      <directory>${project.parent.basedir}/../python/orca/example</directory>
+      <includes>
+          <include>/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/examples/chronos</outputDirectory>
+      <directory>${project.parent.basedir}/../python/chronos/example</directory>
+      <includes>
+          <include>/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/examples/friesian</outputDirectory>
+      <directory>${project.parent.basedir}/../python/friesian/example</directory>
+      <includes>
+          <include>/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/</outputDirectory>
+      <directory>${project.parent.basedir}/tpp</directory>
+      <includes>
+          <include>/**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/jars</outputDirectory>
+      <directory>${project.parent.basedir}/dllib/target</directory>
+      <includes>
+          <include>bigdl-dllib*-jar-with-dependencies.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/jars</outputDirectory>
+      <directory>${project.parent.basedir}/orca/target</directory>
+      <includes>
+          <include>bigdl-orca*-jar-with-dependencies.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <outputDirectory>/jars</outputDirectory>
+      <directory>${project.parent.basedir}/friesian/target</directory>
+      <includes>
+          <include>bigdl-friesian*-jar-with-dependencies.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
+