diff --git a/README.md b/README.md
index 092215f4ffedafd660ca7f7078eca0ffce372fef..85dd0110f7269f629de7f59947953edc9a29b57d 100644
--- a/README.md
+++ b/README.md
@@ -199,6 +199,12 @@ This will launch the complete construction cycle without running the tests, star
 
 **Important**: You shouldn't have a local WildFly instance running or Maven will not be able to start its own WildFly and will try to deploy the application in the running instance. This will cause changes to the WildFly configuration that may leave it in an unstable state.
 
+Once WildFly is running, you can quickly redeploy the application (typically after making some changes) by executing the following command:
+
+```bash
+mvn install wildfly:deploy-only -DskipTests=true
+```
+
 To stop the WildFly launched you can execute the following command:
 
 ```bash
diff --git a/domain/pom.xml b/domain/pom.xml
index 6147fbea7623010442aeb297d9606956b68686ca..c8bed6a5a1d3e432164d46e3af81856d8cbf64a8 100644
--- a/domain/pom.xml
+++ b/domain/pom.xml
@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>es.uvigo.esei.xcs</groupId>
@@ -43,6 +44,23 @@
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 			</plugin>
+
+			<!-- Disables both plugins to avoid WildFly download for testing-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/ear/pom.xml b/ear/pom.xml
index e9b71ac02d112794644d2d791e04361b4256d917..0dae35407fe652e89df3843c0d8f3a49a0a92d9f 100644
--- a/ear/pom.xml
+++ b/ear/pom.xml
@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>es.uvigo.esei.xcs</groupId>
@@ -8,10 +9,10 @@
 	</parent>
 	<artifactId>ear</artifactId>
 	<packaging>ear</packaging>
-	
+
 	<name>EAR</name>
 	<description>XCS Sample - EAR</description>
-	
+
 	<dependencies>
 		<dependency>
 			<groupId>es.uvigo.esei.xcs</groupId>
@@ -36,7 +37,7 @@
 			<type>war</type>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -64,13 +65,31 @@
 				</configuration>
 			</plugin>
 			<plugin>
-                <groupId>org.wildfly.plugins</groupId>
-                <artifactId>wildfly-maven-plugin</artifactId>
-                <configuration>
-                	<skip>false</skip>
-                	<filename>${project.parent.artifactId}-${project.version}.${project.packaging}</filename>
-                </configuration>
-            </plugin>
+				<groupId>org.wildfly.plugins</groupId>
+				<artifactId>wildfly-maven-plugin</artifactId>
+				<configuration>
+					<skip>false</skip>
+					<filename>
+						${project.parent.artifactId}-${project.version}.${project.packaging}</filename>
+				</configuration>
+			</plugin>
+
+			<!-- Disables both plugins to avoid WildFly download for testing-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/pom.xml b/pom.xml
index 0f7cbceb36d44489e3dbc0c10243c78b35996ce5..39ff4b26beab650fdebd68999f1b4e1f69c78cf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
 		<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
 		<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
 		<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
-		<wildfly.maven.plugin.version>1.2.2.Final</wildfly.maven.plugin.version>
+		<wildfly.maven.plugin.version>2.1.0.Final</wildfly.maven.plugin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -92,11 +92,11 @@
 				<scope>import</scope>
 			</dependency>
 			<dependency>
-			    <groupId>org.jboss.shrinkwrap.resolver</groupId>
-			    <artifactId>shrinkwrap-resolver-bom</artifactId>
-			    <version>${shrinkwrap.resolver.bom.version}</version>
-			    <type>pom</type>
-			    <scope>import</scope>
+				<groupId>org.jboss.shrinkwrap.resolver</groupId>
+				<artifactId>shrinkwrap-resolver-bom</artifactId>
+				<version>${shrinkwrap.resolver.bom.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.jboss.arquillian.selenium</groupId>
@@ -105,7 +105,7 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-      
+
 			<!-- Modules -->
 			<dependency>
 				<groupId>${project.groupId}</groupId>
@@ -655,6 +655,13 @@
 
 		<profile>
 			<id>wildfly-mysql-run</id>
+			<dependencies>
+				<dependency>
+					<groupId>com.mysql</groupId>
+					<artifactId>mysql-connector-j</artifactId>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
 			<build>
 				<plugins>
 					<plugin>
@@ -676,135 +683,69 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
+						<groupId>org.wildfly.plugins</groupId>
+						<artifactId>wildfly-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>unpack</id>
-								<phase>process-test-classes</phase>
-								<goals>
-									<goal>unpack</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>org.wildfly</groupId>
-											<artifactId>wildfly-dist</artifactId>
-											<version>${wildfly.version}</version>
-											<type>zip</type>
-											<overWrite>false</overWrite>
-											<outputDirectory>target</outputDirectory>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-							<execution>
-								<id>copy-mysql</id>
-								<phase>process-test-classes</phase>
+								<id>start-wildfly</id>
+								<phase>install</phase>
 								<goals>
-									<goal>copy</goal>
+									<goal>start</goal>
 								</goals>
 								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>com.mysql</groupId>
-											<artifactId>mysql-connector-j</artifactId>
-											<type>jar</type>
-											<overWrite>false</overWrite>
-											<outputDirectory>${project.build.directory}/wildfly-${wildfly.version}/standalone/deployments</outputDirectory>
-										</artifactItem>
-									</artifactItems>
+									<add-user>
+										<users>
+											<user>
+												<username>wildfly-admin</username>
+												<password>xcsadmin</password>
+												<applicationUser>false</applicationUser>
+											</user>
+										</users>
+									</add-user>
 								</configuration>
 							</execution>
 							<execution>
-								<id>copy-mysql-for-execution</id>
-								<phase>process-test-classes</phase>
+								<id>add-mysql</id>
+								<phase>install</phase>
 								<goals>
-									<goal>copy</goal>
+									<goal>deploy-artifact</goal>
 								</goals>
 								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>com.mysql</groupId>
-											<artifactId>mysql-connector-j</artifactId>
-											<type>jar</type>
-											<overWrite>false</overWrite>
-											<outputDirectory>${project.build.directory}</outputDirectory>
-											<destFileName>mysql-connector-j-${mysql.connector.java.version}.jar</destFileName>
-										</artifactItem>
-									</artifactItems>
+									<groupId>com.mysql</groupId>
+									<artifactId>mysql-connector-j</artifactId>
+									<name>mysql-connector-j-${mysql.connector.java.version}.jar</name>
 								</configuration>
-								<!-- This JAR will be used for executing the Wildfly server -->
 							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-resources-plugin</artifactId>
-						<executions>
 							<execution>
-								<id>copy-wildfly-resources</id>
-								<phase>process-test-classes</phase>
+								<id>configure-wildfly</id>
+								<phase>install</phase>
 								<goals>
-									<goal>copy-resources</goal>
+									<goal>execute-commands</goal>
 								</goals>
 								<configuration>
-									<outputDirectory>${project.build.directory}/wildfly-${wildfly.version}/standalone/configuration</outputDirectory>
-									<resources>
-										<resource>
-											<directory>src/test/resources-wildfly-embedded-mysql</directory>
-											<include>standalone.xml</include>
-										</resource>
-									</resources>
+									<batch>true</batch>
+									<commands>
+										<command>data-source add --jndi-name=java:jboss/datasources/xcs --name=xcs-sample --jta=true --use-ccm=true
+											--connection-url=jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid --driver-name=mysql-connector-j-${mysql.connector.java.version}.jar
+											--user-name=xcs --password=xcs</command>
+										<command>/core-service=management/security-realm=RemotingRealm:add</command>
+										<command>/core-service=management/security-realm=RemotingRealm/authentication=jaas:add(name="AppRealmLoopThrough")</command>
+										<command>/subsystem=remoting/http-connector=http-remoting-connector:write-attribute(name="security-realm", value="RemotingRealm")</command>
+										<command>/subsystem=security/security-domain=AppRealmLoopThrough:add(cache-type=default)</command>
+										<command>/subsystem=security/security-domain=AppRealmLoopThrough/authentication=classic:add(login-modules=[{"code"=>"Client", "flag" =>
+											"required", "module-options" => [("multi-threaded" => "true")]}])</command>
+										<command>/subsystem=security/security-domain=xcs-sample-security-domain:add</command>
+										<command>/subsystem=security/security-domain=xcs-sample-security-domain/authentication=classic:add(login-modules=[{"code"=>"Database", "flag"
+											=> "required", "module-options" => [("dsJndiName" => "java:jboss/datasources/xcs"),("principalsQuery" => "SELECT password FROM User WHERE
+											login=?"),("rolesQuery" => "SELECT role, 'Roles' FROM User WHERE login=?"),("hashAlgorithm" => "MD5"),("hashEncoding" =>
+											"hex"),("ignorePasswordCase" => "true")]}])</command>
+									</commands>
 								</configuration>
 							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.wildfly.plugins</groupId>
-						<artifactId>wildfly-maven-plugin</artifactId>
-						<configuration>
-							<before-deployment>
-								<batch />
-								<commands>
-									<command>deploy ${project.build.directory}/mysql-connector-j-${mysql.connector.java.version}.jar</command>
-									<command>data-source add --jndi-name=java:jboss/datasources/xcs --name=xcs-sample --jta=true --use-ccm=true
-										--connection-url=jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid --driver-name=mysql-connector-j-${mysql.connector.java.version}.jar
-										--user-name=xcs --password=xcs</command>
-									<command>/core-service=management/security-realm=RemotingRealm:add</command>
-									<command>/core-service=management/security-realm=RemotingRealm/authentication=jaas:add(name="AppRealmLoopThrough")</command>
-									<command>/subsystem=remoting/http-connector=http-remoting-connector:write-attribute(name="security-realm", value="RemotingRealm")</command>
-									<command>/subsystem=security/security-domain=AppRealmLoopThrough:add(cache-type=default)</command>
-									<command>/subsystem=security/security-domain=AppRealmLoopThrough/authentication=classic:add(login-modules=[{"code"=>"Client", "flag" =>
-										"required", "module-options" => [("multi-threaded" => "true")]}])</command>
-									<command>/subsystem=security/security-domain=xcs-sample-security-domain:add</command>
-									<command>/subsystem=security/security-domain=xcs-sample-security-domain/authentication=classic:add(login-modules=[{"code"=>"Database", "flag"
-										=> "required", "module-options" => [("dsJndiName" => "java:jboss/datasources/xcs"),("principalsQuery" => "SELECT password FROM User WHERE
-										login=?"),("rolesQuery" => "SELECT role, 'Roles' FROM User WHERE login=?"),("hashAlgorithm" => "MD5"),("hashEncoding" =>
-										"hex"),("ignorePasswordCase" => "true")]}])</command>
-								</commands>
-							</before-deployment>
-							<after-deployment>
-								<commands>
-									<command>:reload</command>
-								</commands>
-							</after-deployment>
-							<add-user>
-								<users>
-									<user>
-										<username>wildfly-admin</username>
-										<password>xcsadmin</password>
-										<applicationUser>false</applicationUser>
-									</user>
-								</users>
-							</add-user>
-						</configuration>
-						<executions>
 							<execution>
-								<id>start-wildfly</id>
+								<id>deploy-wildfly</id>
 								<phase>install</phase>
 								<goals>
-									<goal>start</goal>
 									<goal>deploy-only</goal>
 								</goals>
 							</execution>
diff --git a/tests/pom.xml b/tests/pom.xml
index d605111626b1f26f3795647ee46acf87296dd383..174203e4cc68813335c4743c5fac85d31e7aa5a9 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -1,5 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+>
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>es.uvigo.esei.xcs</groupId>
@@ -34,4 +35,25 @@
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- Disables both plugins to avoid WildFly download for testing-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>