diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b7184a6..989b72c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,12 +21,25 @@ test:
   except:
     - tags
 
-build:
+build-branch:
   stage: build
   script:
     - yarn install
-    - yarn build --no-progress --prod --aot
-    - 'echo "let window.appVersion = \"$CI_COMMIT_TAG\";" >> dist/web-remote/assets/version.js'
+    - yarn build --no-progress --configuration production --aot
+    - export APP_VERSION=`git describe --dirty --tags --long --match '*[0-9]*'`
+    - 'echo "window.appVersion = \"$APP_VERSION\";" > dist/web-remote/assets/version.js'
+  artifacts:
+    paths:
+      - dist/
+  only:
+    - branches
+
+build-tag:
+  stage: build
+  script:
+    - yarn install
+    - yarn build --no-progress --configuration production --aot
+    - 'echo "window.appVersion = \"$CI_COMMIT_TAG\";" > dist/web-remote/assets/version.js'
   artifacts:
     paths:
       - dist/