diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d43b9e0a2931ab96728b6fb61db70053c8aa1865..62d04274365aedc9292ac9ab1203dd0789b46cf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,10 +68,15 @@ dsl:compile:
   image: $ECLIPSE_IMAGE
   script:
     - mvn $MAVEN_CLI_OPTS -f $LANGUAGES_POM -pl "!de.evoal.languages:de.evoal.languages.releng.site" compile
+  artifacts:
+    untracked: true
+    when: on_success
+    expire_in: "30 days"
 
 dsl:unit:
   stage: Domain Specific Languages
-  needs: ["dsl:compile"]
+  dependencies: 
+    - "dsl:compile"
   tags:
     - docker
   image: $ECLIPSE_IMAGE
@@ -80,7 +85,9 @@ dsl:unit:
 
 dsl:deploy:
   stage: Domain Specific Languages
-  needs: ["dsl:unit"]
+  dependencies: 
+    - "dsl:compile"
+    - "dsl:unit"
   tags:
     - docker
   image: $ECLIPSE_IMAGE
diff --git a/ci/create-release.sh b/ci/create-release.sh
index eb0badb3023e686f0c9978635e84fd62b8b4f411..646562be9a19e814574362dbbb22b047c939954e 100755
--- a/ci/create-release.sh
+++ b/ci/create-release.sh
@@ -15,13 +15,14 @@ for NAME in $RELEASE_PLUGINS; do
     cp -r src/core/de.evoal.$NAME/target/$NAME evoal/plugins/$NAME
 done
 
-rm evoal/modules/jboss-annotations-api*
+# remove multiple definitions of javax stuff
+rm evoal/modules/javax.inject*
 rm evoal/modules/javax.annotation-api-*
 rm evoal/modules/jsr305-*
+# remove multiple definietions of CDI stuff
+rm evoal/modules/jboss-annotations-api*
 rm evoal/modules/jboss-interceptors-api*
 rm evoal/modules/jboss-el-api*
-rm evoal/modules/jboss-annotations-api*
-rm evoal/modules/javax.inject*
 
 # Now, we do have to do a small hack to fix an Xtext/jigsaw issue (multiple modules have classes
 #  in the same package which is not supported by jigsaw). Therefore, we merge the modules and create