diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39a4de52..2ba88ca3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,17 +40,15 @@ build beta:
   stage: build
   script:
     - yarn run build:beta
-  when: manual
   artifacts:
     expire_in: 1 month
     paths:
       - build/beta
 
-build production:
+build stable:
   stage: build
   script:
     - yarn run build:stable
-  when: manual
   artifacts:
     expire_in: 1 month
     paths:
@@ -73,3 +71,33 @@ deploy review:
     - branches
   tags:
     - deploy
+
+deploy stage beta:
+  stage: deploy
+  variables:
+    GIT_STRATEGY: none
+  when:
+    - manual
+  dependencies:
+    - build beta
+  script:
+    - echo "Deploy staging beta version"
+  only:
+    - beta
+  tags:
+    - deploy
+
+deploy stage stable:
+  stage: deploy
+  variables:
+    GIT_STRATEGY: none
+  when:
+    - manual
+  dependencies:
+    - build stable
+  script:
+    - echo "Deploy staging stable version"
+  only:
+    - stable
+  tags:
+    - deploy