diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e6ee0c40f15de25b4fe404a12d235888f3d1b0c..ea1ddbd215c906c6224af2823e465cfbd61082ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,9 +24,10 @@ install_dependencies:
       - .yarn/
   script:
     - yarn install --immutable --check-cache
-  only:
-    changes:
-      - yarn.lock
+  # only:
+  #   changes:
+  #     - yarn.lock
+  interruptible: true
 
 test:
   stage: 'test'
@@ -39,6 +40,7 @@ test:
   image: 'europe-north1-docker.pkg.dev/holi-shared/docker-hub-remote/node:18.20.4'
   script:
     - yarn test
+  interruptible: true
 
 build:
   stage: 'build'
@@ -54,6 +56,7 @@ build:
   artifacts:
     paths:
       - dist/
+  interruptible: true
 
 .deploy:
   stage: 'deploy'
@@ -75,6 +78,7 @@ build:
     - apk add zip
     - zip -r receiveEvent.zip dist package.json yarn.lock .yarn/ .yarnrc*
     - terraform/environments/scripts/create-or-update-env.sh "$ENVIRONMENT_ID" "$CI_COMMIT_SHA"
+  interruptible: false
 
 staging_deploy:
   extends: .deploy
@@ -82,6 +86,7 @@ staging_deploy:
     ENVIRONMENT_ID: 'staging'
   only:
     - main
+  resource_group: staging
 
 production_deploy:
   extends: .deploy
@@ -89,3 +94,4 @@ production_deploy:
     ENVIRONMENT_ID: 'production'
   only:
     - production
+  resource_group: production