diff --git a/storage/mysql/pom.xml b/storage/mysql/pom.xml
index d977f00cb8..ec2c23c8ce 100644
--- a/storage/mysql/pom.xml
+++ b/storage/mysql/pom.xml
@@ -70,18 +70,23 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-app-dependencies</id>
-                        <phase>process-classes</phase>
+                        <id>unpack-static-resources</id>
+                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>unpack-dependencies</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <configuration>
-                            <excludeArtifactIds>apicurio-common-app-components-config-index,apicurio-common-app-components-logging,apicurio-common-app-components-config-definitions,apicurio-common-app-components-config-impl,apicurio-common-app-components-core,apicurio-common-app-components-multitenancy</excludeArtifactIds>
-                            <includeGroupIds>io.apicurio</includeGroupIds>
-                            <includeTypes>jar,maven-plugin</includeTypes>
-                            <outputDirectory>
-                                ${project.build.directory}/classes
-                            </outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>apicurio-registry-app</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <includes>**/web.xml,**/application.properties</includes>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
@@ -111,25 +116,18 @@
                 <version>${apicurio-common-app-components.version}</version>
                 <executions>
                     <execution>
-                        <id>unpack-static-resources</id>
-                        <phase>generate-resources</phase>
+                        <id>merge-properties</id>
+                        <phase>process-classes</phase>
                         <goals>
-                            <goal>unpack</goal>
+                            <goal>merge</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>apicurio-registry-app</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>true</overWrite>
-                                    <includes>**/web.xml,**/application.properties</includes>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.outputDirectory}</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <output>${project.build.outputDirectory}/application.properties</output>
+                            <inputs>
+                                <param>${project.build.outputDirectory}/application.properties</param>
+                                <param>${project.build.outputDirectory}/overlay.properties</param>
+                            </inputs>
+                            <deleteInputs>true</deleteInputs>
                         </configuration>
                     </execution>
                     <execution>