diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 209ecc3f2609a00377001f65c50977b85443bcc5..3a123016117746f0466d2d42533897abf4de7be1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,12 +5,6 @@ include:
   - project: shore/ci-templates
     file: templates/terraform.yml
 
-stages:
-  - test
-  - build
-  - plan
-  - apply
-
 Generate payload:
   stage: build
   image: registry.shore.co.il/ci-images:python3
@@ -30,13 +24,13 @@ Generate payload:
 
 Terraform plan:
   extends: .tf_plan
-  stage: plan
+  stage: test
   dependencies:
     - Generate payload
 
 Terraform apply:
   extends: .tf_apply
-  stage: apply
+  stage: deploy
   dependencies: &tf_apply_dependecies
     - Generate payload
     - Terraform plan