diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc3e11863879f96286869bba8d00768530ca6b0e..fe52f2617a72e6d6a8de9ba9776dc53d9c0c6bc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 stages:
-  - server-test
+  - build
+  - test
   - client-install
   - client-test
 
diff --git a/.gitlab/server.gitlab-ci.yml b/.gitlab/server.gitlab-ci.yml
index 33d3934c3ce1fa51ff12cccbb0384d70e28f91f8..8a6394e459c9c95c51af82285e9f7972b4c2e854 100644
--- a/.gitlab/server.gitlab-ci.yml
+++ b/.gitlab/server.gitlab-ci.yml
@@ -1,11 +1,11 @@
-
-
-test-server:
+server-setup:
   image: python
-  cache:
+  steage: setup
+  artifacts:
     paths:
-      - server/env/
-  stage: server-test
+      - server/env
+    expire_in: 15 min
+    untracked: true
   script:
     - python --version
     - pip install virtualenv
@@ -13,4 +13,11 @@ test-server:
     - python -m venv env
     - source env/bin/activate
     - pip install -r requirements.txt
+
+server-test:
+  image: python
+  stage: test
+  dependencies:
+    - server-setup
+  script:
     - pytest --cov app tests/