diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c7b2a5c5eb9a5a43d2253b905e66efe5a1b61f4..c07a74ca0adc09fba7637af5fde0e7f1241f7c70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
-  - setup
+  - install
   - test
 
 include:
   - local: .gitlab/server.gitlab-ci.yml
+  - local: .gitlab/client.gitlab-ci.yml
diff --git a/.gitlab/client.gitlab-ci.yml b/.gitlab/client.gitlab-ci.yml
index 2d5697d62324505dd7580d55e136cab7a9d6b4f7..81e0f1e1dca63e66201bd6313cc7a1a907194312 100644
--- a/.gitlab/client.gitlab-ci.yml
+++ b/.gitlab/client.gitlab-ci.yml
@@ -1,10 +1,5 @@
 image: node:10
 
-stages:
-  - install
-  - build
-  - quality
-
 install:
   stage: install
   script:
@@ -18,20 +13,8 @@ install:
       - client/.npm/
       - client/node_modules/
 
-build:
-  stage: build
-  script:
-    - cd client
-    - CI=false npm run build
-  artifacts:
-    paths:
-      - client/build
-    expire_in: 60 mins
-  dependencies:
-    - install
-
 linting:
-  stage: quality
+  stage: test
   script:
     - cd client
     - npm run lint
@@ -39,7 +22,7 @@ linting:
     - install
 
 test:unit:
-  stage: quality
+  stage: test
   script:
     - cd client
     - npm run test:coverage