diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e06016a..9858f56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -244,7 +244,8 @@ deploy_stage:
         --namespace $NAMESPACE \
         -f $VALUES_FILE \
         --set image.tag=git.linux-amd64-$CI_COMMIT_SHA \
-        --wait \
+        --force \
+        --atomic \
         --timeout 5m
     - kubectl rollout status deployment/orchard-stage-server -n $NAMESPACE --timeout=5m
     - *verify_deployment
@@ -279,7 +280,8 @@ deploy_feature:
         --set ingress.tls[0].secretName=orchard-$CI_COMMIT_REF_SLUG-tls \
         --set minioIngress.host=minio-$CI_COMMIT_REF_SLUG.common.global.bsf.tools \
         --set minioIngress.tls.secretName=minio-$CI_COMMIT_REF_SLUG-tls \
-        --wait \
+        --force \
+        --atomic \
         --timeout 5m
     - kubectl rollout status deployment/orchard-$CI_COMMIT_REF_SLUG-server -n $NAMESPACE --timeout=5m
     - export BASE_URL="https://orchard-$CI_COMMIT_REF_SLUG.common.global.bsf.tools"