diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e10cb79572dd460714c30f8a78365a9323675b7..9d760e04700a9d27369b9855d21bdae1550a43f9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ stages:
   - test-php
   - test-manpages
   - transifex
-  - build-tarballs
+  - tarballs
 
 # Generate perlcritic rapport
 create_perlcritic_rapport:
@@ -110,10 +110,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