diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30c98de..6b7437c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,20 @@
 variables:
   DOCKER_IMAGE: harbor.kvazaric.ru/kube-forge/kube-forge
+
   KANIKO_IMAGE: harbor.kvazaric.ru/postgres-tasks/kaniko_executor:debug
   KANIKO_CONTEXT: ${CI_PROJECT_DIR}
+  RELEASE_CLI_IMAGE: harbor.kvazaric.ru/kube-forge/release-cli:v0.18.0
+
+  PREPARE_RELEASE:
+    options:
+      - "No"
+      - "Yes"
+    value: "No"
+    description: Create release from this build?
 
 stages:
   - build
+  - release
 
 build-docker:
   variables:
@@ -40,3 +50,22 @@ build-docker:
         - ansible.cfg
       if: $CI_COMMIT_REF_NAME =~ /^(master)$/
       when: always
+
+make-release:
+  stage: release
+  image: ${RELEASE_CLI_IMAGE}
+  rules:
+    - if: $PREPARE_RELEASE == "Yes"
+  script:
+    - VERSION=$(cat ${CI_PROJECT_DIR}/build/version.txt)
+    - echo "Preparing release for version ${VERSION}-${CI_COMMIT_SHORT_SHA}"
+  release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties
+    name: kube-forge:${VERSION}-${CI_COMMIT_SHORT_SHA}
+    tag_name: "${VERSION}-${CI_COMMIT_SHORT_SHA}"
+    description: "${VERSION}-${CI_COMMIT_SHORT_SHA}"
+    assets:
+      links:
+        - name: "Docker image"
+          url: "harbor.kvazaric.ru/kube-forge/kube-forge:${VERSION}-${CI_COMMIT_SHORT_SHA}"
+          link_type: "image"
+  when: on_success