diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a17a708df99dbd24686d01e4573f443c1116d9a..40101fc3cdbbee48bf214edd27cf4f3143409528 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,10 +69,10 @@ stages:
   -   git checkout devel
   -   git pull
   -   git checkout $WOLF_CORE_BRANCH
+  -   git pull
   - else
-  -   git clone ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf.git
+  -   git clone -b $WOLF_CORE_BRANCH ssh://git@gitlab.iri.upc.edu:2202/mobile_robotics/wolf_projects/wolf_lib/wolf.git
   -   cd wolf
-  -   git checkout $WOLF_CORE_BRANCH
   - fi
   - mkdir -pv build
   - cd build
@@ -109,9 +109,9 @@ stages:
 ############ LICENSE HEADERS ############
 license_headers:
   stage: license
-  image: labrobotica/wolf_vision_deps:16.04
+  image: labrobotica/wolf_vision_deps:20.04
   cache:
-    - key: wolf-xenial
+    - key: wolf-focal
       paths:
       - ci_deps/wolf/
   except:
@@ -122,27 +122,6 @@ license_headers:
   script:
     - *license_header_definition
 
-############ UBUNTU 16.04 TESTS ############
-build_and_test:xenial:
-  image: labrobotica/wolf_vision_deps:16.04
-  stage: build_and_test
-  cache:
-    - key: wolf-xenial
-      paths:
-      - ci_deps/wolf/
-    - key: visionutils-xenial
-      paths:
-      - ci_deps/vision_utils/
-  except:
-    - master
-  before_script:
-    - *preliminaries_definition
-    - *install_wolf_definition
-    - *install_visionutils_definition
-    - ldconfig # update links (shared libraries)
-  script:
-    - *build_and_test_definition
-
 ############ UBUNTU 18.04 TESTS ############
 build_and_test:bionic:
   image: labrobotica/wolf_vision_deps:18.04