diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdc930086d7f8fe33e1685bfe85e0e57d4b9a3c0..fcb499cb13cc03a61a8acb649521f3d363269a12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,8 @@ variables:
 copy-files-to-swift:
   stage: upload
   script:
-    - 'curl -H "X-Auth-Token: ${OS_TOKEN}" -X DELETE ${OBJSTORE}ebrains-spack-builds.tar.gz'
+    - 'curl -H "X-Auth-Token: ${OS_TOKEN}" -X DELETE ${OBJSTORE}ebrains-spack-builds.tar.gz > curl_log.txt'
+    - if [ $(cat curl_log.txt | grep "Unauthorized" |wc -l) -gt 0 ]; then echo "You need to refresh OpenStack token"; exit 1;fi;
     - tar czf ${SWIFT_FILE} packages/ repo.yaml spack.yaml
     - 'curl -H "X-Auth-Token: ${OS_TOKEN}" -i ${OBJSTORE} -X PUT -T ${SWIFT_FILE}'
   tags:
@@ -22,6 +23,7 @@ copy-files-to-swift:
 
 deploy-build-environment:
   stage: deploy
+  needs: [copy-files-to-swift]
   before_script:
     - oc login "$OPENSHIFT_SERVER" --token="$OPENSHIFT_TOKEN"
   script: