keycloak-aplcache

diff --git a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml
index 6ab98b9..b64b3af 100755
--- a/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml
+++ b/distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-subsystem/main/module.xml
@@ -22,6 +22,7 @@
         <property name="jboss.api" value="private"/>
     </properties>
     <resources>
+        <resource-root path="."/>
     </resources>
 
     <dependencies>

diff --git a/distribution/feature-packs/server-feature-pack/assembly.xml b/distribution/feature-packs/server-feature-pack/assembly.xml
index c118dec..c449b2f 100644
--- a/distribution/feature-packs/server-feature-pack/assembly.xml
+++ b/distribution/feature-packs/server-feature-pack/assembly.xml
@@ -28,9 +28,6 @@
         <fileSet>
             <directory>target/${project.build.finalName}</directory>
             <outputDirectory/>
-            <excludes>
-                <exclude>configuration/**</exclude>
-            </excludes>
         </fileSet>
         <fileSet>
             <directory>target/unpacked-themes/theme</directory>
@@ -53,13 +50,6 @@
             <filtered>true</filtered>
         </fileSet>
         <fileSet>
-            <directory>${configDir}</directory>
-            <includes>
-                <include>**/**</include>
-            </includes>
-            <outputDirectory>configuration</outputDirectory>
-        </fileSet>
-        <fileSet>
             <directory>../../../</directory>
             <includes>
                 <include>License.html</include>

diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
index 4bf7726..aa049fe 100755
--- a/distribution/server-overlay/assembly.xml
+++ b/distribution/server-overlay/assembly.xml
@@ -89,7 +89,7 @@
             <directory>src/main</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>README.txt</include>
+                <include>${readmeInclude}</include>
             </includes>
             <filtered>true</filtered>
         </fileSet>

diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 2ee5b40..d57c538 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -43,6 +43,7 @@
     </dependencies>
 
     <build>
+        <finalName>keycloak-overlay-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -183,10 +184,8 @@
             <properties>
                 <build-tools.version>${wildfly.build-tools.version}</build-tools.version>
                 <assemblyFile>assembly.xml</assemblyFile>
+                <readmeInclude>README.txt</readmeInclude>
             </properties>
-            <build>
-                <finalName>keycloak-overlay-${project.version}</finalName>
-            </build>
         </profile>
 
         <profile>
@@ -200,6 +199,7 @@
                 <build-tools.version>${eap.build-tools.version}</build-tools.version>
                 <assemblyFile>assembly.xml</assemblyFile>
                 <profileExcludes>%regex[(providers.*)|(docs/contrib.*)|(docs/examples.*)|(docs/schema.*)]</profileExcludes>
+                <readmeInclude></readmeInclude>
             </properties>
             <dependencies>
                 <dependency>
@@ -208,9 +208,6 @@
                     <type>zip</type>
                 </dependency>
             </dependencies>
-            <build>
-                <finalName>${product.name}-overlay-${product.filename.version}</finalName>
-            </build>
         </profile>
     </profiles>