diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f234782467e073c08f8ecb88b3b444a2bed2dcf..4cb439f45c3957cecf4614f7186208b161b9800d 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
@@ -138,6 +140,7 @@ trigger-yocto:
   stage: integrate
   rules:
     - if: $CI_MERGE_REQUEST_IID
+      allow_failure: true
   needs: [integrate-yocto]
   trigger:
     include:
@@ -163,6 +166,8 @@ trigger-ci-test:
   stage: merge
   rules:
     - if: $CI_COMMIT_BRANCH == "master"
+      when: manual
+      allow_failure: true
   script:
     - cd ${CI_PROJECT_DIR}
     - ./merge_gitlab_ci.py
@@ -188,7 +193,10 @@ merge-yocto:
 # --------------------------------------------------------------------------------------
 check:
   stage: check
+  needs: [integrate-yocto, integrate-ci-test]
   rules:
+    # Probably this job gets removed
+    - when: never
     - if: $CI_MERGE_REQUEST_IID
   tags:
     - infrastructure