diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 244af13..90cd91e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,15 @@ stages:
 - build
 - test
 
+# To clone also submodules
+variables:
+  PRO_FILE: ../server-sdk.pro
+  SCRIPT_PATH: scripts
+
+cache:
+  paths:
+  - build/
+
 ##########
 # Build
 ##########
@@ -11,14 +20,11 @@ build: # name of task
   tags: # Tags are used to choose correct gitlab-runner
     - shell # spaceti-runner server has running runners and one has tag 'hw'
   script: # run in bash 
-  - if [ -d build ];then rm -rf build; fi
   - mkdir -p build 
   - cd build
-  - qmake ../server-sdk.pro
+  - qmake $PRO_FILE
   - make -j4
-  artifacts:
-    paths:
-    - build/
+
 
 ##########
 # Test
@@ -28,7 +34,9 @@ test:
   tags:
     - shell
   script:
+  - mkdir -p build
   - cd build
+  - qmake $PRO_FILE
   - make check
 
 # memory leak check for unittest
@@ -37,7 +45,9 @@ valgrind:
   tags:
     - shell
   script:
+  - mkdir -p build
   - cd build
+  - qmake $PRO_FILE
   - valgrind make check
 
 # Quality of code
@@ -47,7 +57,7 @@ cppcheck:
     - shell
   #allow_failure: true # Probably needed to allow failure
   script:
-  - scripts/cppcheck.sh
+  - $SCRIPT_PATH/cppcheck.sh
   dependencies: []
 
 # Common checks ( Line endings )
@@ -56,7 +66,7 @@ lineendings:
   tags:
     - shell
   script:
-  - scripts/check.sh
+  - server-sdk/scripts/check.sh
   dependencies: []
 
 codecoverage:
@@ -64,7 +74,7 @@ codecoverage:
   tags:
     - shell
   script:
-  - scripts/codecoverage.sh
+  - server-sdk/scripts/codecoverage.sh
   coverage: '/^\s+functions..:\s+(\d+\.\d+%).+$/'
   dependencies: []
 
@@ -73,5 +83,5 @@ doc:
   tags:
     - shell
   script:
-  - scripts/doc.sh clean # 'clean' better clean before generating documentation
+  - server-sdk/scripts/doc.sh clean # 'clean' better clean before generating documentation
   dependencies: []