diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 431352e5daedc49f27b5dd2083bfb42383ce973c..23ce5faf91176bf07e5b2012cc50c4464eca63e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,6 +85,20 @@ build-tarballs:
       - fusiondirectory-$VERSION.tar.gz
     expire_in: 30d
 
+build-release:
+  stage: tarballs
+  only:
+    - tags
+  script:
+    - VERSION=$(grep '%' Changelog.md | head -n1 | cut -d ' ' -f3 | tr -d '"')
+    - mkdir ../fusiondirectory-$VERSION/
+    - mv ./* ../fusiondirectory-$VERSION/
+    - mv  ../fusiondirectory-$VERSION/ ./
+    - tar -cvzf fusiondirectory-$VERSION.tar.gz *
+  artifacts:
+    paths:
+      - ./*.tar.gz
+
 trigger-plugins:
   variables:
     GROUP: $GROUP