diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 663aae8965fe1044237d824c1e9098da8fd214b7..9dfc10f63fc638f73e7074fb6fb98ce5731e8c4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,14 +8,28 @@ image:
   name: gcr.io/kaniko-project/executor:debug
   entrypoint: [""]
 
-docker-build:
+release-build:
+  stage: release
+  image: gitlab.cl.uni-heidelberg.de:5050/tmueller/clspigot-docker:latest
+  rules:
+    - if: $CI_COMMIT_TAG                  # Run this job when a tag is created manually
+  before_script:
+    - mkdir -p /kaniko/.docker
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+  script:
+    - "/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG --destination $CI_REGISTRY_IMAGE:latest --build-arg vcsrev=$CI_COMMIT_SHORT_SHA"
+  release:
+    name: 'Release $CI_COMMIT_TAG'
+    description: 'Created using the release-cli'  
+    tag_name: '$CI_COMMIT_TAG'                                       # elsewhere in the pipeline.
+    ref: '$CI_COMMIT_TAG'
+
+beta-build:
   stage: build
   before_script:
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
   script:
-    - "/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH --build-arg vcsrev=$CI_COMMIT_SHORT_SHA"
-  rules:
-    - if: $CI_COMMIT_TAG
+    - "/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH  --build-arg vcsrev=$CI_COMMIT_SHORT_SHA"
   only:
-    - master
\ No newline at end of file
+    - beta
\ No newline at end of file