diff --git a/build/ci/.deploy-k8s.yml b/build/ci/.deploy-k8s.yml
index 301828a6fe42728bbe81526e189109a389e8e891..e98649253fce5a944dffbd3090a775a19eccf7cb 100644
--- a/build/ci/.deploy-k8s.yml
+++ b/build/ci/.deploy-k8s.yml
@@ -52,10 +52,11 @@ deploy:latest:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 
-k8s:destroy:
+destroy:k8s:
   image: bitnami/kubectl:latest
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: always
   before_script:
     - echo "override global before script"
   stage: .post
diff --git a/build/ci/.terraform-ci.yml b/build/ci/.terraform-ci.yml
index b46b2e421c1f46d37be83b91a254cc3919ad69ff..a3760e8eb9b9715dea8a1e8b3a3a69f669e26194 100644
--- a/build/ci/.terraform-ci.yml
+++ b/build/ci/.terraform-ci.yml
@@ -64,7 +64,7 @@ apply:
     - plan
   <<: *tf
 
-tf:destroy:
+destroy:tf:
   stage: .post
   script:
     - gitlab-terraform destroy
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index 5cc97d25b851ded5daeef2621011207e5f055f10..3ae62e0cd1f57173a2d9c46974805bae80682613 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -9,10 +9,13 @@ integration-test:
     GOSDN_TEST_API_ENDPOINT: http://gosdn-$CI_COMMIT_SHA.apps.ocp.fbi.h-da.de/api
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
+      when: delayed
+      start_in: 2 minutes
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH
       allow_failure: true
+      when: delayed
+      start_in: 2 minutes
   script:
-    - sleep 2m
     - go test -race ./test/integration -v -coverprofile=coverage.out
 
 .test: &test