diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16896d6090ecd098ffe01067c2e3ca8e0e9a5f09..2b1be5928f40b991b712b06bc99d6b62b6291b01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,13 @@
 image: maven:latest
 
 stages:
-    - build
-    - run
-    - test
+  - build
+  - test
+  - run
 
+variables:
+  MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode"
+  MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
 
 cache:
   paths:
@@ -14,16 +17,15 @@ cache:
 build:
   stage: build
   script:
-    - mvn compile
-run:
-  stage: run
-  script:
-    - mvn package
-    - mvn exec:java -Dexec.mainClass="isima.f2.RamassagePoubleDepotApplication"
+    - mvn $MAVEN_CLI_OPTS compile
 
 test:
   stage: test
   script:
-    - mvn test
-  dependencies: 
-    - run
+    - mvn $MAVEN_CLI_OPTS test
+
+run:
+  stage: run
+  script:
+    - mvn $MAVEN_CLI_OPTS package
+    - mvn $MAVEN_CLI_OPTS exec:java -Dexec.mainClass="isima.F2.RamassagePoubleDepotApplicationTests"