diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d1fa6ea36d45b5da5815a1f26dc337c39387187..b663547d5c39ab582e162299c7f63f0d4ad4809f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,8 @@
 stages:
     - test
     - production
-    - release
+    - build
+    - prepare
 
 test:
     image: rust:alpine
@@ -30,8 +31,8 @@         - dpl --provider=heroku --app=$HEROKU_APP --api-key=$HEROKU_API_KEY
     only:
         - master
 
-release_job:
-  stage: release
+prepare_job:
+  stage: prepare
   image: rust:alpine
   rules:
     - if: $CI_COMMIT_TAG
@@ -43,6 +44,17 @@   artifacts:
     paths:
       - target/release/hyper
       - target/release/actix
+
+release_job:
+  stage: release
+  image: registry.gitlab.com/gitlab-org/release-cli:latest
+  rules:
+    - if: $CI_COMMIT_TAG
+  script:
+    - echo "running release_job for $TAG"
+  needs:
+    - job: prepare_job
+      artifacts: true
   release:
     name: 'Release $CI_COMMIT_TAG'
     description: 'New macroblog version'