diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bcef21..28ae0d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,15 +14,16 @@ variables:
 build:
   stage: build
   tags:
-    - vm
+    - shell
   script:
   - mkdir -p build
   - cd build
   - qmake ../colnod-connector.pro
   - make -j4
-  artifacts:
+  cache:
+    key: ${CI_BUILD_REF_NAME}
     paths:
-    - build/
+        - build/
 
 # ########
 # Test
@@ -30,7 +31,7 @@ build:
 test:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - cd build
   - make check
@@ -40,7 +41,7 @@ test:
 valgrind:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - cd build
   - valgrind make check
@@ -49,7 +50,7 @@ valgrind:
 cppcheck:
   stage: test
   tags:
-    - vm
+    - shell
   #allow_failure: true # Probably needed to allow failure
   script:
   - server-sdk/scripts/cppcheck.sh
@@ -58,14 +59,14 @@ cppcheck:
 lineendings:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/check.sh
 
 codecoverage:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/codecoverage.sh
   coverage: '/^\s+functions..:\s+(\d+\.\d+%).+$/'
@@ -73,6 +74,6 @@ codecoverage:
 doc:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/doc.sh clean # 'clean' better clean before generating documentation