diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6c1d1f..4bcef21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ variables:
 build:
   stage: build
   tags:
-    - shell
+    - vm
   script:
   - mkdir -p build
   - cd build
@@ -30,7 +30,7 @@ build:
 test:
   stage: test
   tags:
-    - shell
+    - vm
   script:
   - cd build
   - make check
@@ -40,7 +40,7 @@ test:
 valgrind:
   stage: test
   tags:
-    - shell
+    - vm
   script:
   - cd build
   - valgrind make check
@@ -49,7 +49,7 @@ valgrind:
 cppcheck:
   stage: test
   tags:
-    - shell
+    - vm
   #allow_failure: true # Probably needed to allow failure
   script:
   - server-sdk/scripts/cppcheck.sh
@@ -58,14 +58,14 @@ cppcheck:
 lineendings:
   stage: test
   tags:
-    - shell
+    - vm
   script:
   - server-sdk/scripts/check.sh
 
 codecoverage:
   stage: test
   tags:
-    - shell
+    - vm
   script:
   - server-sdk/scripts/codecoverage.sh
   coverage: '/^\s+functions..:\s+(\d+\.\d+%).+$/'
@@ -73,6 +73,6 @@ codecoverage:
 doc:
   stage: test
   tags:
-    - shell
+    - vm
   script:
   - server-sdk/scripts/doc.sh clean # 'clean' better clean before generating documentation