diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bcef21..99da401 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,13 +8,13 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 
-# ########
+##########
 # Build
 ##########
 build:
   stage: build
   tags:
-    - vm
+    - shell
   script:
   - mkdir -p build
   - cd build
@@ -24,23 +24,22 @@ build:
     paths:
     - build/
 
-# ########
+##########
 # Test
 ##########
 test:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - cd build
   - make check
 
-
 # memory leak check for unittest
 valgrind:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - cd build
   - valgrind make check
@@ -49,30 +48,34 @@ valgrind:
 cppcheck:
   stage: test
   tags:
-    - vm
+    - shell
   #allow_failure: true # Probably needed to allow failure
   script:
   - server-sdk/scripts/cppcheck.sh
+  dependencies: []
 
 # Common checks ( Line endings )
 lineendings:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/check.sh
+  dependencies: []
 
 codecoverage:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/codecoverage.sh
   coverage: '/^\s+functions..:\s+(\d+\.\d+%).+$/'
+  dependencies: []
 
 doc:
   stage: test
   tags:
-    - vm
+    - shell
   script:
   - server-sdk/scripts/doc.sh clean # 'clean' better clean before generating documentation
+  dependencies: []
diff --git a/server-sdk b/server-sdk
index 00596d5..ee50768 160000
--- a/server-sdk
+++ b/server-sdk
@@ -1 +1 @@
-Subproject commit 00596d53db90dcd2325e9c31b019a570b34d750c
+Subproject commit ee507683c6faf69730451b16fbe3ef2b508a15fa