diff --git a/README.md b/README.md
index 4b6b6786730594718ff24dd31e6e04b50fe5b85d..384dc195c5876aed718ccff37cad2f1440609847 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ git --version
 Once Git is installed in your system, clone the project:
 
 ```bash
-git clone http://sing-group.org/dt/gitlab/dgss-1718/xcs-sample.git
+git clone http://sing-group.org/dt/gitlab/dgss-1819/xcs-sample.git
 ```
 
 ### 1.4. MySQL 5.5+
@@ -144,9 +144,9 @@ the security configuration needed by the application.
 
 In the following sections you can find an explanation of how you can configure
 the WildFly server by editing the `standalone.xml`. However, the
-`additional-material/wildfly` directory of the project includes a
-`standalone.xml` ready to be used for the 10.1.0 and 10.1.0 versions that you can
-just copy to your WildFly server (replacing the original
+`additional-material/wildfly` directory of the project already includes a
+`standalone.xml` ready to be used with the 10.1.0 version, that you can
+just copy directly into your WildFly server (replacing the original
   `standalone/configuration/standalone.xml` file).
 
 #### 1.6.1. Datasource configuration
diff --git a/pom.xml b/pom.xml
index 290048b359a3c7ebb4cccdab1beba83b2fb39d1b..c71af9bb99da38a09965c2c05c350d556248fb4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
 		<arquillian.wildfly.embedded.version>3.0.3.Final</arquillian.wildfly.embedded.version>
 		<arquillian.wildfly.embedded.container.version>2.1.0.Final</arquillian.wildfly.embedded.container.version>
 		<easymock.version>3.4</easymock.version>
-		<geckodriver.version>v0.19.0</geckodriver.version>
+		<geckodriver.version>v0.23.0</geckodriver.version>
 		<graphene.webdrive.version>2.3.1</graphene.webdrive.version>
 		<hamcrest.version>2.0.0.0</hamcrest.version>
 		<jacoco.version>0.7.9</jacoco.version>
@@ -438,14 +438,14 @@
 						<configuration>
 							<forkCount>1</forkCount>
 							<systemPropertyVariables>
-                <arquillian.launch>wildfly-embedded</arquillian.launch>
-                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                <jboss.socket.binding.port-offset>10000</jboss.socket.binding.port-offset>
-                <wildfly.version>${wildfly.version}</wildfly.version>
-                <wildfly.http.port>18080</wildfly.http.port>
-                <wildfly.management.port>19990</wildfly.management.port>
-                <wildfly.jbossHome>target/wildfly-${wildfly.version}</wildfly.jbossHome>
-                <wildfly.modulePath>target/wildfly-${wildfly.version}/modules</wildfly.modulePath>
+								<arquillian.launch>wildfly-embedded</arquillian.launch>
+								<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+								<jboss.socket.binding.port-offset>10000</jboss.socket.binding.port-offset>
+								<wildfly.version>${wildfly.version}</wildfly.version>
+								<wildfly.http.port>18080</wildfly.http.port>
+								<wildfly.management.port>19990</wildfly.management.port>
+								<wildfly.jbossHome>target/wildfly-${wildfly.version}</wildfly.jbossHome>
+								<wildfly.modulePath>target/wildfly-${wildfly.version}/modules</wildfly.modulePath>
 							</systemPropertyVariables>
 							<redirectTestOutputToFile>false</redirectTestOutputToFile>
 						</configuration>
@@ -545,14 +545,14 @@
 							<forkCount>1</forkCount>
 							<systemPropertyVariables>
 								<mysql.version>${mysql.connector.java.version}</mysql.version>
-                <arquillian.launch>wildfly-embedded</arquillian.launch>
-                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                <jboss.socket.binding.port-offset>10000</jboss.socket.binding.port-offset>
-                <wildfly.version>${wildfly.version}</wildfly.version>
-                <wildfly.http.port>18080</wildfly.http.port>
-                <wildfly.management.port>19990</wildfly.management.port>
-                <wildfly.jbossHome>target/wildfly-${wildfly.version}</wildfly.jbossHome>
-                <wildfly.modulePath>target/wildfly-${wildfly.version}/modules</wildfly.modulePath>
+								<arquillian.launch>wildfly-embedded</arquillian.launch>
+								<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+								<jboss.socket.binding.port-offset>10000</jboss.socket.binding.port-offset>
+								<wildfly.version>${wildfly.version}</wildfly.version>
+								<wildfly.http.port>18080</wildfly.http.port>
+								<wildfly.management.port>19990</wildfly.management.port>
+								<wildfly.jbossHome>target/wildfly-${wildfly.version}</wildfly.jbossHome>
+								<wildfly.modulePath>target/wildfly-${wildfly.version}/modules</wildfly.modulePath>
 							</systemPropertyVariables>
 							<redirectTestOutputToFile>false</redirectTestOutputToFile>
 						</configuration>