diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4aedb4b98c34435719ac603105f2185cbc291d88..aed0be58391444bb1368d134ad514cbc4bccecc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,18 +194,9 @@ build_and_test:xenial:
   stage: build_and_test
   image: labrobotica/wolf_deps_ros:16.04
   cache:
-    - key: wolf-xenial
-      paths:
-      - ci_deps/wolf/
-    - key: laserscanutils-xenial
-      paths:
-      - ci_deps/laser_scan_utils/
-    - key: csm-xenial
+    - key: wolf_and_deps-xenial
       paths:
-      - ci_deps/csm/
-    - key: falko-xenial
-      paths:
-      - ci_deps/falkolib/
+      - ci_deps
   except:
     - master
   before_script:
@@ -224,18 +215,9 @@ build_and_test:bionic:
   stage: build_and_test
   image: labrobotica/wolf_deps_ros:18.04
   cache:
-    - key: wolf-bionic
-      paths:
-      - ci_deps/wolf/
-    - key: laserscanutils-bionic
+    - key: wolf_and_deps-bionic
       paths:
-      - ci_deps/laser_scan_utils/
-    - key: csm-bionic
-      paths:
-      - ci_deps/csm/
-    - key: falko-bionic
-      paths:
-      - ci_deps/falkolib/
+      - ci_deps
   except:
     - master
   before_script:
@@ -254,18 +236,9 @@ build_and_test:focal:
   stage: build_and_test
   image: labrobotica/wolf_deps_ros:20.04
   cache:
-    - key: wolf-focal
-      paths:
-      - ci_deps/wolf/
-    - key: laserscanutils-focal
-      paths:
-      - ci_deps/laser_scan_utils/
-    - key: csm-focal
-      paths:
-      - ci_deps/csm/
-    - key: falko-focal
+    - key: wolf_and_deps-focal
       paths:
-      - ci_deps/falkolib/
+      - ci_deps
   except:
     - master
   before_script: