diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cad7cf86766e96cdc4634481a5f27f7ea0db2148..8300d6461e1cad92d9f351caa12f7b1ed7977b98 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,17 @@ build_image:
   only:
     - master
 
+build_liveimage:
+  stage: build
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $IMAGE_TAG .
+    - docker tag $IMAGE_TAG $CI_REGISTRY_IMAGE:live
+    - docker push $IMAGE_TAG
+    - docker push $CI_REGISTRY_IMAGE:live
+  only:
+    - tags
+
 deploy_dev:
   stage: deploy
   environment:
@@ -40,5 +51,15 @@ deploy_dev:
     - scp -r ./solr/* $DEV_SSH_LOGIN:$DEV_SOLR_FILES_PATH
     - ssh $DEV_SSH_LOGIN "$DEV_START_SCRIPT"
 
+deploy_live:
+  stage: deploy
+  environment:
+    name: live
+  only:
+    - tags
+  script:
+    - scp -r ./solr/* $LIVE_SSH_LOGIN:$LIVE_SOLR_FILES_PATH
+    - ssh $LIVE_SSH_LOGIN "$LIVE_START_SCRIPT"
+
 services:
 - docker:dind