diff --git a/.gitlab/client.gitlab-ci.yml b/.gitlab/client.gitlab-ci.yml
index 56ecd7604ecd458fe9e6d1f689bc435c032e174d..13e048d78f37d436f8852ed6330677037f71d0ce 100644
--- a/.gitlab/client.gitlab-ci.yml
+++ b/.gitlab/client.gitlab-ci.yml
@@ -1,4 +1,4 @@
-client-setup:
+client:setup:
   image: node:10
   stage: setup
   script:
@@ -17,21 +17,20 @@ client-setup:
       - client/.npm/
       - client/node_modules/
 
-client-linting:
+client:linting:
   image: node:10
   stage: test
+  needs: ["client:setup"]
   script:
     - cd client
     - npm run lint
-  dependencies:
-    - client-setup
 
 client-test:
   image: node:10
   stage: test
+  needs: ["client:setup"]
   script:
     - cd client
     - npm run test:coverage
-  dependencies:
-    - client-setup
+
   coverage: /All files\s*\|\s*([\d\.]+)/
diff --git a/.gitlab/server.gitlab-ci.yml b/.gitlab/server.gitlab-ci.yml
index 33959d12e435315e365fee976708a85eae0ca5ba..e2913efbe4a840ec373a0bac452e2785141a900b 100644
--- a/.gitlab/server.gitlab-ci.yml
+++ b/.gitlab/server.gitlab-ci.yml
@@ -1,4 +1,4 @@
-server-setup:
+server:setup:
   image: python
   stage: setup
   artifacts:
@@ -18,11 +18,10 @@ server-setup:
     - source env/bin/activate
     - pip install -r requirements.txt
 
-server-test:
+server:test:
   image: python
   stage: test
-  dependencies:
-    - server-setup
+  needs: ["server:setup"]
   script:
     - cd server
     - source env/bin/activate