diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f234782467e073c08f8ecb88b3b444a2bed2dcf..65dcdbad174827b64143fcdfccee060c0627f0de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,6 +101,8 @@ yamllint:
   stage: integrate
   rules:
     - if: $CI_MERGE_REQUEST_IID
+      when: manual
+      allow_failure: true
   script:
     - cd ${CI_PROJECT_DIR}
     - ./deploy_gitlab_ci.py
@@ -188,6 +190,7 @@ merge-yocto:
 # --------------------------------------------------------------------------------------
 check:
   stage: check
+  needs: [integrate-yocto, integrate-ci-test]
   rules:
     - if: $CI_MERGE_REQUEST_IID
   tags: