diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 399b0013f89a237251dc2279b30d5255e1da7c28..7de7788f4faa48fc567ccbca75673b22877e20dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ stages:
   - make install
 
 ############ UBUNTU 16.04 TESTS ############
-wolf_build_and_test_none:xenial:
+build_and_test_none:xenial:
   stage: none
   image: labrobotica/wolf_deps:16.04
   cache:
@@ -125,7 +125,7 @@ wolf_build_and_test_none:xenial:
   script:
     - *build_and_test_definition
 
-wolf_build_and_test_csm:xenial:
+build_and_test_csm:xenial:
   stage: csm
   image: labrobotica/wolf_deps:16.04
   cache:
@@ -150,7 +150,7 @@ wolf_build_and_test_csm:xenial:
   script:
     - *build_and_test_definition
 
-wolf_build_and_test_falko:xenial:
+build_and_test_falko:xenial:
   stage: falko
   image: labrobotica/wolf_deps:16.04
   cache:
@@ -175,7 +175,7 @@ wolf_build_and_test_falko:xenial:
   script:
     - *build_and_test_definition
     
-wolf_build_and_test_csm_falko:xenial:
+build_and_test_csm_falko:xenial:
   stage: csm_falko
   image: labrobotica/wolf_deps:16.04
   cache:
@@ -205,7 +205,7 @@ wolf_build_and_test_csm_falko:xenial:
     - *build_and_test_definition
 
 ############ UBUNTU 18.04 TESTS ############
-wolf_build_and_test_none:bionic:
+build_and_test_none:bionic:
   stage: none
   image: labrobotica/wolf_deps:18.04
   cache:
@@ -225,7 +225,7 @@ wolf_build_and_test_none:bionic:
   script:
     - *build_and_test_definition
 
-wolf_build_and_test_csm:bionic:
+build_and_test_csm:bionic:
   stage: csm
   image: labrobotica/wolf_deps:18.04
   cache:
@@ -250,7 +250,7 @@ wolf_build_and_test_csm:bionic:
   script:
     - *build_and_test_definition
 
-wolf_build_and_test_falko:bionic:
+build_and_test_falko:bionic:
   stage: falko
   image: labrobotica/wolf_deps:18.04
   cache:
@@ -275,7 +275,7 @@ wolf_build_and_test_falko:bionic:
   script:
     - *build_and_test_definition
     
-wolf_build_and_test_csm_falko:bionic:
+build_and_test_csm_falko:bionic:
   stage: csm_falko
   image: labrobotica/wolf_deps:18.04
   cache: