diff --git a/modules/pom.xml b/modules/pom.xml
index b7cbe778bd..0c0d62ae48 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -16,7 +16,7 @@
     <description>Hibernate Validator modules creation to use in WildFly</description>
 
     <properties>
-        <module.xml.basedir>${basedir}/src/main/modules</module.xml.basedir>
+        <module.xml.targetdir>${project.build.directory}/modules</module.xml.targetdir>
         <hibernate.validator.module.slot>main</hibernate.validator.module.slot>
         <hibernate.validator.cdi.module.slot>main</hibernate.validator.cdi.module.slot>
         <javax.validation.api.module.slot>main</javax.validation.api.module.slot>
@@ -42,6 +42,27 @@
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>modules</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/modules</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${module.xml.targetdir}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -174,7 +195,7 @@
                         </goals>
                         <configuration>
                             <appliesToDist>${wildflyOriginalTargetDir}</appliesToDist>
-                            <patchConfig>${module.xml.basedir}/patch.xml</patchConfig>
+                            <patchConfig>${module.xml.targetdir}/patch.xml</patchConfig>
                             <updatedDist>${wildflyPatchedTargetDir}</updatedDist>
                             <outputFile>${patchFile}</outputFile>
                         </configuration>
diff --git a/modules/src/main/modules/patch.xml b/modules/src/main/modules/patch.xml
index 8bbc1fa5a4..82a8f842db 100644
--- a/modules/src/main/modules/patch.xml
+++ b/modules/src/main/modules/patch.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <patch-config xmlns="urn:jboss:patch-config:1.0">
-    <name>wildfly-10-hibernate-validator-6.0</name>
-    <description>This patch upgrades Hibernate Validator 6.0 within WildFly 10 installation</description>
+    <name>wildfly-10-hibernate-validator-${project.version}</name>
+    <description>This patch upgrades Hibernate Validator ${project.version} within WildFly 10 installation</description>
     <one-off />
-    <element patch-id="layer-base-wildfly-10-hibernate-validor-6.0">
+    <element patch-id="layer-base-wildfly-10-hibernate-validor-${project.version}">
         <one-off name="base" />
-        <description>This patch upgrades Hibernate Validator 6.0 within WildFly 10 installation</description>
+        <description>This patch upgrades Hibernate Validator ${project.version} within WildFly 10 installation</description>
         <specified-content>
             <modules>
                 <updated name="javax.validation.api" />