diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4492ac2fdfeb0eb797c13e7d1bcade999f73731..403a43b766b8d30139b133ecad837c5ab7691e94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,7 +94,7 @@ build_i686_static_linux26:
     - repo init -q --no-clone-bundle -u https://amichelo:$KBS_SECRET_GITREAD@baltig.infn.it/chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
     - repo sync -n chaos_dashboard.git -j1 --fail-fast
     - repo sync
-    - mv CACHE chaosframework/config
+    - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi
     - export DISTRIB_NAME=chaos-distrib-$REVNAME-$CI_JOB_NAME
     - export PATH=/usr/local/chaos/i686-nptl-linux-gnu/bin/:$PATH
     
@@ -138,7 +138,7 @@ build_i686_dynamic_linux26:
     - export DISTRIB_NAME=chaos-distrib-$REVNAME-$CI_JOB_NAME
     - repo sync -n chaos_dashboard.git -j1 --fail-fast    
     - repo sync
-    - mv CACHE chaosframework/config    
+    - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi    
     - export PATH=/usr/local/chaos/i686-nptl-linux-gnu/bin/:$PATH
     - if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi    
     - cd chaosframework
@@ -179,7 +179,7 @@ build_armhf_dynamic:
     - export DISTRIB_NAME=chaos-distrib-$REVNAME-$CI_JOB_NAME
     - repo sync -n chaos_dashboard.git -j1 --fail-fast    
     - repo sync
-    - mv CACHE chaosframework/config  
+    - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi
     - if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi
     - cd chaosframework
     - GITHASH=`git log -n 1 --pretty="%h"`
@@ -218,7 +218,7 @@ build_armhf_static:
     - export DISTRIB_NAME=chaos-distrib-$REVNAME-$CI_JOB_NAME
     - repo sync -n chaos_dashboard.git -j1 --fail-fast    
     - repo sync
-    - mv CACHE chaosframework/config
+    - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi
     - if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi    
     - cd chaosframework
     - GITHASH=`git log -n 1 --pretty="%h"`
@@ -286,7 +286,7 @@ ubuntu1804_x86_64:
     - repo init -q --no-clone-bundle -u https://amichelo:$KBS_SECRET_GITREAD@baltig.infn.it/chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
     - repo sync -n chaos_dashboard.git -j1 --fail-fast    
     - repo sync
-    - mv CACHE chaosframework/config
+    - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi
     - if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi    
     - cd chaosframework
     - GITHASH=`git log -n 1 --pretty="%h"`
@@ -381,7 +381,7 @@ centos7_x86_64:
     - repo init -q --no-clone-bundle -u https://amichelo:$KBS_SECRET_GITREAD@baltig.infn.it/chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
     - repo sync -n chaos_dashboard.git -j1 --fail-fast    
     - repo sync
-    - mv CACHE chaosframework/config    
+    - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi
     - if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi
     - cd chaosframework
     - GITHASH=`git log -n 1 --pretty="%h"`
@@ -483,7 +483,7 @@ build_arm_linux26:
     - export DISTRIB_NAME=chaos-distrib-$REVNAME-$CI_JOB_NAME
     - repo sync -n chaos_dashboard.git -j1 --fail-fast    
     - repo sync
-    - mv CACHE chaosframework/config   
+    - if [ -e CACHE ]; then mv CACHE chaosframework/config;fi   
     - if [ "$TEST_BRANCH" != "$CI_COMMIT_REF_NAME" ]; then ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH;fi    
     - export PATH=/usr/local/chaos/gcc-arm-infn-linux26/bin/:$PATH
     - cd chaosframework