diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db516f1..8dcb6e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 stages:
-  - plan
-  - apply
+  - lint
+  - build
   - destroy
 
 include:
@@ -9,7 +9,7 @@ include:
     file: 'terraform.yml'
     
 plan:
-  stage: plan
+  stage: lint
   variables:
     WORKDIR: $CI_PROJECT_DIR/terraform
     ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
@@ -17,7 +17,23 @@ plan:
   extends: .terraform_plan
   only:
     changes:
-      - terraform/*   
+      - terraform/*  
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"      
+
+apply:
+  stage: build
+  variables:
+    WORKDIR: $CI_PROJECT_DIR/terraform
+    ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars
+  allow_failure: false
+  extends: .terraform_apply
+  only:
+    changes:
+      - terraform/*       
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+
 
 #apply:
 #  stage: apply