diff --git a/pom.xml b/pom.xml
index db45a567ef..4470a1e28a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.commonjava</groupId>
     <artifactId>commonjava</artifactId>
-    <version>18</version>
+    <version>21</version>
   </parent>
 
   <groupId>org.commonjava.indy</groupId>
diff --git a/tools/assemblies/src/main/resources/assemblies/complete.xml b/tools/assemblies/src/main/resources/assemblies/complete.xml
index e12c15ad1d..fecf7aaf62 100644
--- a/tools/assemblies/src/main/resources/assemblies/complete.xml
+++ b/tools/assemblies/src/main/resources/assemblies/complete.xml
@@ -63,7 +63,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:dataset:*</include>
+        <include>*:*:tar.gz:dataset:*</include>
       </includes>
       <outputDirectory>var/lib/indy/data</outputDirectory>
       <unpack>true</unpack>
@@ -73,7 +73,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:docset:*</include>
+        <include>*:*:tar.gz:docset:*</include>
       </includes>
       <outputDirectory>usr/share/doc/indy</outputDirectory>
       <unpack>true</unpack>
@@ -83,7 +83,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:binset:*</include>
+        <include>*:*:tar.gz:binset:*</include>
       </includes>
       <outputDirectory>bin</outputDirectory>
       <unpack>true</unpack>
@@ -93,7 +93,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:confset:*</include>
+        <include>*:*:tar.gz:confset:*</include>
       </includes>
       <outputDirectory>etc/indy</outputDirectory>
       <unpack>true</unpack>
@@ -103,7 +103,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:uiset:*</include>
+        <include>*:*:tar.gz:uiset:*</include>
       </includes>
       <outputDirectory>var/lib/indy/ui</outputDirectory>
       <unpack>true</unpack>
@@ -113,7 +113,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:reactui:*</include>
+        <include>*:*:tar.gz:reactui:*</include>
       </includes>
       <outputDirectory>var/lib/indy/ui</outputDirectory>
       <unpack>true</unpack>
diff --git a/tools/assemblies/src/main/resources/assemblies/data.xml b/tools/assemblies/src/main/resources/assemblies/data.xml
index b0da15de2d..aa739c30bc 100644
--- a/tools/assemblies/src/main/resources/assemblies/data.xml
+++ b/tools/assemblies/src/main/resources/assemblies/data.xml
@@ -23,18 +23,11 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:dataset:*</include>
+        <include>*:*:tar.gz:dataset:*</include>
       </includes>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
     </dependencySet>
   </dependencySets>
-  
-  <fileSets>
-    <fileSet>
-      <directory>${project.build.directory}/var/lib/indy/data</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-  </fileSets>
-  
+
 </assembly>
diff --git a/tools/assemblies/src/main/resources/assemblies/etc.xml b/tools/assemblies/src/main/resources/assemblies/etc.xml
index dcd8c3683d..3f030a1c8b 100644
--- a/tools/assemblies/src/main/resources/assemblies/etc.xml
+++ b/tools/assemblies/src/main/resources/assemblies/etc.xml
@@ -23,7 +23,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:confset:*</include>
+        <include>*:*:tar.gz:confset:*</include>
       </includes>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
diff --git a/tools/assemblies/src/main/resources/assemblies/skinny.xml b/tools/assemblies/src/main/resources/assemblies/skinny.xml
index 3ad7bc83cb..36f3cd03e3 100644
--- a/tools/assemblies/src/main/resources/assemblies/skinny.xml
+++ b/tools/assemblies/src/main/resources/assemblies/skinny.xml
@@ -63,7 +63,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:binset:*</include>
+        <include>*:*:tar.gz:binset:*</include>
       </includes>
       <outputDirectory>bin</outputDirectory>
       <unpack>true</unpack>
@@ -73,7 +73,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:uiset:*</include>
+        <include>*:*:tar.gz:uiset:*</include>
       </includes>
       <outputDirectory>var/lib/indy/ui</outputDirectory>
       <unpack>true</unpack>
@@ -83,7 +83,7 @@
       <useProjectArtifact>false</useProjectArtifact>
       <scope>provided</scope>
       <includes>
-        <include>*:tar.gz:reactui:*</include>
+        <include>*:*:tar.gz:reactui:*</include>
       </includes>
       <outputDirectory>var/lib/indy/ui</outputDirectory>
       <unpack>true</unpack>