diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78c92e78d993d9d536e5de63f3b8c2ff4977ff9e..77f5948e6ea3deedd73006bd56f8e7ab634e6c71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ stages:
   - codestyle
   - manpages
   - transifex
-  - build-tarballs
+  - tarballs
 
 ## Stage lint
 
@@ -123,10 +123,20 @@ update-transifex:
     - tx push -f -s -t --skip --no-interactive
 
 build-tarballs:
-  stage: build-tarballs
+  stage: tarballs
   script:
     - tar -cvzf fusiondirectory-core.tar.gz *
   artifacts:
     paths:
     - fusiondirectory-core.tar.gz
     expire_in: 1h
+
+build-release:
+  stage: tarballs
+  only:
+    - tags
+  script: 
+    - tar -cvzf fusiondirectory-core-$(grep '*' Changelog | head -n1 | cut -d ' ' -f3).tar.gz *
+  artifacts:
+    paths:
+      - fusiondirectory-core-$(grep '*' Changelog | head -n1 | cut -d ' ' -f3).tar.gz