diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 741f1d1b3fb9e90849a11054fb76ef2b155edef5..b1a073b610d6378dba84ac9fda381073aa73249e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ stages:
   - test
   - build
   - deploy-build
-  - update-alpha-instances
+  - update-instances
   - publish
 
 variables:
@@ -113,7 +113,7 @@ test:
     - merge_requests
 
 build-dev:
-  stage: update-alpha-instances
+  stage: build
   before_script:
     - apk add git
     - apk add bash
@@ -125,7 +125,6 @@ build-dev:
   artifacts:
     paths:
       - build/
-  when: manual
 
 build-prod:
   stage: build
@@ -143,7 +142,7 @@ build-prod:
       - build/
 
 deploy-dev:
-  stage: update-alpha-instances
+  stage: deploy-build
   before_script:
     - apk add git
     - apk add bash
@@ -158,11 +157,12 @@ deploy-dev:
     - yarn deploy-dev
   only:
     - dev
+  when: manual
   needs:
     - build-dev
 
 deploy-test:
-  stage: update-alpha-instances
+  stage: deploy-build
   before_script:
     - apk add git
     - apk add bash
@@ -180,10 +180,9 @@ deploy-test:
     - merge_requests
   needs:
     - build-dev
-  when: manual
 
 deploy:
-  stage: update-alpha-instances
+  stage: deploy-build
   before_script:
     - apk add git
     - apk add bash
@@ -202,7 +201,7 @@ deploy:
     - build-dev
 
 update-dev:
-  stage: update-alpha-instances
+  stage: update-instances
   tags:
     - deploy-alpha
   script:
@@ -217,7 +216,7 @@ update-dev:
     - deploy-dev
 
 update-demo:
-  stage: update-alpha-instances
+  stage: update-instances
   tags:
     - deploy-alpha
   script:
@@ -232,7 +231,7 @@ update-demo:
     - deploy-test
 
 update-all:
-  stage: update-alpha-instances
+  stage: update-instances
   tags:
     - deploy-alpha
   script: