diff --git a/distribution/theme-template-zip/build.xml b/distribution/theme-template-zip/build.xml
index 793f4d615f..0e2103f994 100755
--- a/distribution/theme-template-zip/build.xml
+++ b/distribution/theme-template-zip/build.xml
@@ -2,38 +2,10 @@
 
     <target name="all">
         <delete dir="target/themes"/>
-        <copy todir="target/themes/login/template" overwrite="true">
-            <fileset dir="../../forms/common-themes/src/main/resources/theme/login/base">
-            </fileset>
-        </copy>
-        <copy todir="target/themes/login/template" overwrite="true">
-            <fileset dir="../../forms/common-themes/src/main/resources/theme/login/patternfly">
-            </fileset>
-        </copy>
-        <copy tofile="target/themes/login/template/theme.properties" file="../../forms/common-themes/src/main/resources/theme/login/patternfly/theme.properties" overwrite="true">
-           <filterchain>
-               <linecontains negate="true">
-                   <contains value="parent"/>
-               </linecontains>
-           </filterchain>
-        </copy>
-        <copy todir="target/themes/account/template" overwrite="true">
-            <fileset dir="../../forms/common-themes/src/main/resources/theme/account/base">
-            </fileset>
-        </copy>
-        <copy todir="target/themes/account/template" overwrite="true">
-            <fileset dir="../../forms/common-themes/src/main/resources/theme/account/patternfly">
-            </fileset>
-        </copy>
-        <copy tofile="target/themes/account/template/theme.properties" file="../../forms/common-themes/src/main/resources/theme/account/patternfly/theme.properties" overwrite="true">
-            <filterchain>
-                <linecontains negate="true">
-                    <contains value="parent"/>
-                </linecontains>
-            </filterchain>
-        </copy>
         <copy todir="target/themes" overwrite="true">
-            <fileset dir="../../examples/themes"/>
+            <fileset dir="../../forms/common-themes/src/main/resources/theme">
+            </fileset>
         </copy>
     </target>
-</project>
\ No newline at end of file
+
+</project>
diff --git a/distribution/war-dist/assembly.xml b/distribution/war-dist/assembly.xml
index e9c96a90cd..3438589dd0 100755
--- a/distribution/war-dist/assembly.xml
+++ b/distribution/war-dist/assembly.xml
@@ -24,12 +24,12 @@
             <outputDirectory>adapters</outputDirectory>
         </dependencySet>
         <dependencySet>
-            <unpack>false</unpack>
+            <unpack>true</unpack>
             <useTransitiveDependencies>false</useTransitiveDependencies>
             <includes>
                 <include>org.keycloak:keycloak-example-themes-dist:zip</include>
             </includes>
-            <outputDirectory>examples</outputDirectory>
+            <outputDirectory>configuration</outputDirectory>
         </dependencySet>
     </dependencySets>
     <!--