diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index 42f13524db4..298b7188f3e 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
@@ -128,7 +128,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/gcloud-datastore.mod">
-                  <fileset file="src/main/config-template/modules/gcloud-datastore.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/gcloud-datastore.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -136,23 +136,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml b/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
index 29e5be1228a..d621ddfd767 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
+++ b/jetty-gcloud/jetty-gcloud-session-manager/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules</outputDirectory>
       <includes>
         <include>gcloud-datastore.mod</include>
diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
index 57d4f02a1a5..dc58f83f4e8 100644
--- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
+++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-embedded.mod
@@ -23,7 +23,7 @@ lib/jetty-hazelcast-${jetty.version}.jar
 lib/hazelcast/hazelcast-${hazelcast.version}.jar
 
 [ini]
-hazelcast.version?=3.12.12
+hazelcast.version?=@hazelcast.version@
 
 [license]
 Hazelcast is an open source project hosted on Github and released under the Apache 2.0 license.
diff --git a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
index f4d152834b8..c6a4d9b736e 100644
--- a/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
+++ b/jetty-hazelcast/src/main/config/modules/session-store-hazelcast-remote.mod
@@ -25,7 +25,7 @@ lib/hazelcast/hazelcast-${hazelcast.version}.jar
 lib/hazelcast/hazelcast-client-${hazelcast.version}.jar
 
 [ini]
-hazelcast.version?=3.12.12
+hazelcast.version?=@hazelcast.version@
 jetty.webapp.addSystemClasses+=,org.eclipse.jetty.hazelcast.
 jetty.webapp.addServerClasses+=,-org.eclipse.jetty.hazelcast.
 
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index f6857114a5b..79a9dfcbcd2 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -33,9 +33,15 @@
               <useBuildFilters>false</useBuildFilters>
               <includeEmptyDirs>true</includeEmptyDirs>
               <outputDirectory>${assembly-directory}</outputDirectory>
+              <encoding>UTF-8</encoding>
+              <useDefaultDelimiters>false</useDefaultDelimiters>
+              <delimiters>
+                <delimiter>@</delimiter>
+              </delimiters>
               <resources>
                 <resource>
                   <directory>${basedir}/src/main/resources</directory>
+                  <filtering>true</filtering>
                 </resource>
               </resources>
             </configuration>
diff --git a/jetty-home/src/main/resources/modules/conscrypt.mod b/jetty-home/src/main/resources/modules/conscrypt.mod
index 2e1e7f50f1a..d987cfb8d13 100644
--- a/jetty-home/src/main/resources/modules/conscrypt.mod
+++ b/jetty-home/src/main/resources/modules/conscrypt.mod
@@ -29,6 +29,6 @@ Conscrypt is distributed under the Apache Licence 2.0
 https://github.com/google/conscrypt/blob/master/LICENSE
 
 [ini]
-conscrypt.version?=2.0.0
+conscrypt.version?=@conscrypt.version@
 jetty.sslContext.provider?=Conscrypt
 
diff --git a/jetty-home/src/main/resources/modules/hawtio.mod b/jetty-home/src/main/resources/modules/hawtio.mod
index ddc3ad43a70..4d91c1cc864 100644
--- a/jetty-home/src/main/resources/modules/hawtio.mod
+++ b/jetty-home/src/main/resources/modules/hawtio.mod
@@ -17,9 +17,12 @@ etc/hawtio.xml
 [files]
 etc/hawtio/
 lib/hawtio/
-maven://io.hawt/hawtio-default/1.4.16|lib/hawtio/hawtio.war
+maven://io.hawt/hawtio-default/${hawtio.version}|lib/hawtio/hawtio.war
 basehome:modules/hawtio/hawtio.xml|etc/hawtio.xml
 
+[ini]
+hawtio.version?=@hawtio.version@
+
 [license]
 Hawtio is a redhat JBoss project released under the Apache License, v2.0
 http://hawt.io/
diff --git a/jetty-home/src/main/resources/modules/jamon.mod b/jetty-home/src/main/resources/modules/jamon.mod
index 21bac47de96..e1da835cc68 100644
--- a/jetty-home/src/main/resources/modules/jamon.mod
+++ b/jetty-home/src/main/resources/modules/jamon.mod
@@ -17,8 +17,8 @@ etc/jamon.xml
 
 [files]
 lib/jamon/
-maven://com.jamonapi/jamon/2.81|lib/jamon/jamon-2.81.jar
-maven://com.jamonapi/jamon_war/2.81/war|lib/jamon/jamon.war
+maven://com.jamonapi/jamon/${jamon.version}|lib/jamon/jamon-${jamon.version}.jar
+maven://com.jamonapi/jamon_war/${jamon.version}/war|lib/jamon/jamon.war
 basehome:modules/jamon/jamon.xml|etc/jamon.xml
 
 [lib]
@@ -29,6 +29,9 @@ JAMon is a source forge hosted project released under a BSD derived license.
 http://jamonapi.sourceforge.net
 http://jamonapi.sourceforge.net/JAMonLicense.html
 
+[ini]
+jamon.version?=@jamon.version@
+
 [ini-template]
 ## Jamon Configuration
 # jamon.summaryLabels=demo
diff --git a/jetty-home/src/main/resources/modules/jolokia.mod b/jetty-home/src/main/resources/modules/jolokia.mod
index 975d709c25c..ee4875d5d24 100644
--- a/jetty-home/src/main/resources/modules/jolokia.mod
+++ b/jetty-home/src/main/resources/modules/jolokia.mod
@@ -15,9 +15,12 @@ jmx
 etc/jolokia.xml
 
 [files]
-maven://org.jolokia/jolokia-war/1.2.2/war|lib/jolokia/jolokia.war
+maven://org.jolokia/jolokia-war/${jolokia.version}/war|lib/jolokia/jolokia.war
 basehome:modules/jolokia/jolokia.xml|etc/jolokia.xml
 
+[ini]
+jolokia.version?=@jolokia.version@
+
 [license]
 Jolokia is released under the Apache License 2.0
 http://www.jolokia.org
diff --git a/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod b/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
index 3c588cc1b5c..d1caf93b061 100644
--- a/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
+++ b/jetty-infinispan/infinispan-common/src/main/config/modules/sessions/infinispan/infinispan-common.mod
@@ -12,7 +12,7 @@ lib/infinispan-common-${jetty.version}.jar
 lib/infinispan/*.jar
 
 [ini]
-infinispan.version?=9.4.8.Final
+infinispan.version?=@infinispan.version@
 
 [license]
 Infinispan is an open source project hosted on Github and released under the Apache 2.0 license.
diff --git a/jetty-infinispan/infinispan-embedded-query/pom.xml b/jetty-infinispan/infinispan-embedded-query/pom.xml
index d00add57203..202b4321ee0 100644
--- a/jetty-infinispan/infinispan-embedded-query/pom.xml
+++ b/jetty-infinispan/infinispan-embedded-query/pom.xml
@@ -60,7 +60,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-embedded-query-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/embedded/infinispan-embedded-query-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -68,23 +68,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
index d9db9a74ef2..f0f8436781a 100644
--- a/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
+++ b/jetty-infinispan/infinispan-embedded-query/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules/sessions/infinispan/embedded</outputDirectory>
       <includes>
         <include>infinispan-embedded-query-libs.mod</include>
diff --git a/jetty-infinispan/infinispan-embedded/pom.xml b/jetty-infinispan/infinispan-embedded/pom.xml
index 6a75b3ca564..ca81d1c0ebe 100644
--- a/jetty-infinispan/infinispan-embedded/pom.xml
+++ b/jetty-infinispan/infinispan-embedded/pom.xml
@@ -61,7 +61,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-embedded-libs.mod">
-                  <fileset file="src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -70,23 +70,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml
index 491f84e6116..93917acb50e 100644
--- a/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml
+++ b/jetty-infinispan/infinispan-embedded/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-templates</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules/sessions/infinispan/embedded</outputDirectory>
       <includes>
         <include>infinispan-embedded-libs.mod</include>
diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
similarity index 100%
rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/etc/sessions/infinispan/infinispan-embedded.xml
rename to jetty-infinispan/infinispan-embedded/src/main/config-template/etc/sessions/infinispan/infinispan-embedded.xml
diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod
similarity index 100%
rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/infinispan-embedded.mod
rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/infinispan-embedded.mod
diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod
similarity index 91%
rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod
rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod
index 1d2e9da7b87..bff64cdba50 100644
--- a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/session-store-infinispan-embedded.mod
+++ b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/session-store-infinispan-embedded.mod
@@ -16,7 +16,7 @@ sessions/infinispan/embedded/infinispan-embedded-libs
 basehome:modules/sessions/infinispan/embedded/infinispan.xml|etc/infinispan.xml
 
 [ini]
-infinispan.version?=9.4.8.Final
+infinispan.version?=@infinispan.version@
 
 [ini-template]
 #jetty.session.infinispan.idleTimeout.seconds=0
diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
similarity index 100%
rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-libs.mod
diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
similarity index 100%
rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan-embedded-serverclasses.mod
diff --git a/jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml b/jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml
similarity index 100%
rename from jetty-infinispan/infinispan-embedded/src/main/config-templates/modules/sessions/infinispan/embedded/infinispan.xml
rename to jetty-infinispan/infinispan-embedded/src/main/config-template/modules/sessions/infinispan/embedded/infinispan.xml
diff --git a/jetty-infinispan/infinispan-remote-query/pom.xml b/jetty-infinispan/infinispan-remote-query/pom.xml
index 08930cb169c..a5a1615a43b 100644
--- a/jetty-infinispan/infinispan-remote-query/pom.xml
+++ b/jetty-infinispan/infinispan-remote-query/pom.xml
@@ -61,7 +61,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-remote-query-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-query-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -69,23 +69,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
index 270dcfad382..74d1280ed3d 100644
--- a/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
+++ b/jetty-infinispan/infinispan-remote-query/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
       <includes>
         <include>infinispan-remote-query-libs.mod</include>
diff --git a/jetty-infinispan/infinispan-remote/pom.xml b/jetty-infinispan/infinispan-remote/pom.xml
index ec4bcdb2724..6a6433f5e18 100644
--- a/jetty-infinispan/infinispan-remote/pom.xml
+++ b/jetty-infinispan/infinispan-remote/pom.xml
@@ -62,7 +62,7 @@
             <configuration>
               <target>
                 <concat destfile="${project.build.directory}/infinispan-remote-libs.mod">
-                  <fileset file="src/main/config-template/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/sessions/infinispan/remote/infinispan-remote-libs.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
                 </concat>
               </target>
@@ -70,24 +70,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml b/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
index 802f815d6aa..f8c265477fb 100644
--- a/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
+++ b/jetty-infinispan/infinispan-remote/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -17,7 +17,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules/sessions/infinispan/remote</outputDirectory>
       <includes>
         <include>infinispan-remote-libs.mod</include>
diff --git a/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod b/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
index 95e033d10c6..dc1a043119e 100644
--- a/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
+++ b/jetty-infinispan/infinispan-remote/src/main/config-template/modules/session-store-infinispan-remote.mod
@@ -16,7 +16,7 @@ sessions/infinispan/remote/infinispan-remote-libs
 basehome:modules/sessions/infinispan/remote/resources/hotrod-client.properties|resources/hotrod-client.properties
 
 [ini]
-infinispan.version?=9.4.8.Final
+infinispan.version?=@infinispan.version@
 
 
 [license]
diff --git a/jetty-memcached/jetty-memcached-sessions/pom.xml b/jetty-memcached/jetty-memcached-sessions/pom.xml
index 1c24d8fc659..a4d2a9c3501 100644
--- a/jetty-memcached/jetty-memcached-sessions/pom.xml
+++ b/jetty-memcached/jetty-memcached-sessions/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.googlecode.xmemcached</groupId>
       <artifactId>xmemcached</artifactId>
-      <version>2.4.7</version>
+      <version>${xmemcached.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
index 515f9527204..53edec17017 100644
--- a/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
+++ b/jetty-memcached/jetty-memcached-sessions/src/main/config/modules/sessions/session-data-cache/xmemcached.mod
@@ -11,7 +11,10 @@ session-store
 slf4j-api
 
 [files]
-maven://com.googlecode.xmemcached/xmemcached/2.4.5|lib/xmemcached/xmemcached-2.4.5.jar
+maven://com.googlecode.xmemcached/xmemcached/${xmemcached.version}|lib/xmemcached/xmemcached-${xmemcached.version}.jar
+
+[ini]
+xmemcached.version?=@xmemcached.version@
 
 [lib]
 lib/jetty-memcached-sessions-${jetty.version}.jar
diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml
index f0e23eeb291..22341a47563 100644
--- a/jetty-nosql/pom.xml
+++ b/jetty-nosql/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.mongodb</groupId>
       <artifactId>mongo-java-driver</artifactId>
-      <version>2.13.2</version>
+      <version>${mongodb.version}</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
diff --git a/jetty-nosql/src/main/config/modules/session-store-mongo.mod b/jetty-nosql/src/main/config/modules/session-store-mongo.mod
index 9999bc7785b..89150dd08b0 100644
--- a/jetty-nosql/src/main/config/modules/session-store-mongo.mod
+++ b/jetty-nosql/src/main/config/modules/session-store-mongo.mod
@@ -14,7 +14,7 @@ sessions
 sessions/mongo/${connection-type}
 
 [files]
-maven://org.mongodb/mongo-java-driver/2.13.2|lib/nosql/mongo-java-driver-2.13.2.jar
+maven://org.mongodb/mongo-java-driver/${mongodb.version}|lib/nosql/mongo-java-driver-${mongodb.version}.jar
 
 [lib]
 lib/jetty-nosql-${jetty.version}.jar
@@ -28,6 +28,7 @@ http://www.apache.org/licenses/LICENSE-2.0.html
 
 [ini]
 connection-type?=address
+mongodb.version?=@mongodb.version@
 
 [ini-template]
 #jetty.session.mongo.dbName=HttpSessions
diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml
index 848793d9f21..088fe4ae87e 100644
--- a/jetty-server/pom.xml
+++ b/jetty-server/pom.xml
@@ -26,6 +26,31 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-resources-keystore</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <encoding>UTF-8</encoding>
+              <outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>src/main/config</directory>
+                  <includes>
+                    <include>**/**keystore**</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/jetty-unixsocket/pom.xml b/jetty-unixsocket/pom.xml
index 7a2b0f62bb5..50a3fc6af1d 100644
--- a/jetty-unixsocket/pom.xml
+++ b/jetty-unixsocket/pom.xml
@@ -82,32 +82,15 @@
                 <replaceregexp file="${project.build.directory}/deps.txt" match=" *(.*):(.*):jar:(.*):.*$" replace="maven://\1/\2/\3|lib/jnr/\2-\3.jar" byline="true" />
                 <replaceregexp file="${project.build.directory}/deps.txt" match="The following files have been resolved:" replace="[files]" />
                 <concat destfile="${project.build.directory}/unixsocket.mod">
-                  <fileset file="src/main/config-template/modules/unixsocket-prefix.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/unixsocket-prefix.mod" />
                   <fileset file="${project.build.directory}/deps.txt" />
-                  <fileset file="src/main/config-template/modules/unixsocket-suffix.mod" />
+                  <fileset file="${project.build.directory}/jetty-config-files/modules/unixsocket-suffix.mod" />
                 </concat>
               </target>
             </configuration>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>src/main/assembly/config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-unixsocket/src/main/assembly/config.xml b/jetty-unixsocket/src/main/assembly/config.xml
index 3c97242ba28..f4dd8865b05 100644
--- a/jetty-unixsocket/src/main/assembly/config.xml
+++ b/jetty-unixsocket/src/main/assembly/config.xml
@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>src/main/config-template</directory>
+      <directory>${project.build.directory}/jetty-config-files</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>
@@ -18,7 +18,7 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>target</directory>
+      <directory>${project.build.directory}</directory>
       <outputDirectory>modules</outputDirectory>
       <includes>
         <include>unixsocket.mod</include>
diff --git a/jetty-util/src/main/config/modules/log4j-impl.mod b/jetty-util/src/main/config/modules/log4j-impl.mod
index d5fa92e502d..bfe9bcb5440 100644
--- a/jetty-util/src/main/config/modules/log4j-impl.mod
+++ b/jetty-util/src/main/config/modules/log4j-impl.mod
@@ -28,5 +28,5 @@ Log4j is released under the Apache 2.0 license.
 http://www.apache.org/licenses/LICENSE-2.0.html
 
 [ini]
-log4j.version?=1.2.17
+log4j.version?=@log4j.version@
 jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/log4j/
diff --git a/jetty-util/src/main/config/modules/logback-impl.mod b/jetty-util/src/main/config/modules/logback-impl.mod
index f9fb173f2f5..05b6df0f2b4 100644
--- a/jetty-util/src/main/config/modules/logback-impl.mod
+++ b/jetty-util/src/main/config/modules/logback-impl.mod
@@ -36,5 +36,5 @@ or (per the licensee's choosing) under
     http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
 
 [ini]
-logback.version?=1.2.3
+logback.version?=@logback.version@
 jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/logback/
diff --git a/jetty-util/src/main/config/modules/slf4j-api.mod b/jetty-util/src/main/config/modules/slf4j-api.mod
index 0df154aa75d..b7146c345ac 100644
--- a/jetty-util/src/main/config/modules/slf4j-api.mod
+++ b/jetty-util/src/main/config/modules/slf4j-api.mod
@@ -16,7 +16,7 @@ maven://org.slf4j/slf4j-api/${slf4j.version}|lib/slf4j/slf4j-api-${slf4j.version
 lib/slf4j/slf4j-api-${slf4j.version}.jar
 
 [ini]
-slf4j.version?=1.7.30
+slf4j.version?=@slf4j.version@
 jetty.webapp.addServerClasses+=,${jetty.base.uri}/lib/slf4j/
 
 [license]
diff --git a/pom.xml b/pom.xml
index ad11604c663..3fbea06909e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,9 +37,11 @@
     <gson.version>2.8.8</gson.version>
     <guava.version>30.1.1-jre</guava.version>
     <guice.version>5.0.1</guice.version>
+    <hawtio.version>2.13.5</hawtio.version>
     <hazelcast.version>3.12.12</hazelcast.version>
     <infinispan.version>9.4.8.Final</infinispan.version>
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
+    <jamon.version>2.81</jamon.version>
     <javax.activation.version>1.1.0.v201105071233</javax.activation.version>
     <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
     <javax.mail.glassfish.version>1.4.1.v201005082020</javax.mail.glassfish.version>
@@ -57,6 +59,7 @@
     <jnr-ffi.version>2.2.7</jnr-ffi.version>
     <jnr-posix.version>3.1.10</jnr-posix.version>
     <jnr-unixsocket.version>0.38.11</jnr-unixsocket.version>
+    <jolokia.version>1.3.3</jolokia.version>
     <jsp.version>8.5.70</jsp.version>
     <junit.version>5.8.1</junit.version>
     <log4j2.version>2.14.0</log4j2.version>
@@ -64,6 +67,7 @@
     <maven.version>3.8.2</maven.version>
     <maven.plugin-tools.version>3.6.1</maven.plugin-tools.version>
     <maven.resolver.version>1.7.2</maven.resolver.version>
+    <mongodb.version>2.13.2</mongodb.version>
     <osgi.annotation.version>8.0.0</osgi.annotation.version>
     <osgi.core.version>6.0.0</osgi.core.version>
     <plexus-container.version>2.1.0</plexus-container.version>
@@ -72,6 +76,7 @@
     <taglibs-standard-impl.version>1.2.5</taglibs-standard-impl.version>
     <taglibs-standard-spec.version>1.2.5</taglibs-standard-spec.version>
     <weld.version>3.1.5.Final</weld.version>
+    <xmemcached.version>2.4.7</xmemcached.version>
 
     <!-- some maven plugins versions -->
     <asciidoctor.plugin.version>2.2.1</asciidoctor.plugin.version>
@@ -508,7 +513,7 @@
             <dependency>
               <groupId>org.eclipse.jetty.toolchain</groupId>
               <artifactId>jetty-assembly-descriptors</artifactId>
-              <version>1.0</version>
+              <version>1.1</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -1102,6 +1107,42 @@
         <artifactId>ant-launcher</artifactId>
         <version>${ant.version}</version>
       </dependency>
+      <!-- some modules use those artifacts so we can manage version from here -->
+      <dependency>
+        <groupId>io.hawt</groupId>
+        <artifactId>hawtio-default</artifactId>
+        <version>${hawtio.version}</version>
+        <type>war</type>
+      </dependency>
+      <dependency>
+        <groupId>com.jamonapi</groupId>
+        <artifactId>jamon</artifactId>
+        <version>${jamon.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>com.jamonapi</groupId>
+        <artifactId>jamon_war</artifactId>
+        <version>${jamon.version}</version>
+        <type>war</type>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.jolokia</groupId>
+        <artifactId>jolokia-war</artifactId>
+        <version>${jolokia.version}</version>
+        <type>war</type>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -1204,6 +1245,36 @@
       </activation>
       <build>
         <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <encoding>UTF-8</encoding>
+                  <useDefaultDelimiters>false</useDefaultDelimiters>
+                  <delimiters>
+                    <delimiter>@</delimiter>
+                  </delimiters>
+                  <outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/main/config</directory>
+                      <filtering>true</filtering>
+                      <excludes>
+                        <exclude>**/*keystore</exclude>
+                      </excludes>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-assembly-plugin</artifactId>
@@ -1224,6 +1295,65 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>config-template</id>
+      <activation>
+        <file>
+          <exists>src/main/config-template</exists>
+        </file>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <encoding>UTF-8</encoding>
+                  <useDefaultDelimiters>false</useDefaultDelimiters>
+                  <delimiters>
+                    <delimiter>@</delimiter>
+                  </delimiters>
+                  <outputDirectory>${project.build.directory}/jetty-config-files</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>src/main/config-template</directory>
+                      <filtering>true</filtering>
+                      <excludes>
+                        <exclude>**/*.p12</exclude>
+                      </excludes>
+                    </resource>
+                  </resources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/config.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>eclipse-release</id>
       <modules>